commit 7a9b149212f3716c598afe973b6261fd58453b7a Merge: 3d62e3f e26bcf3 Author: Linus Torvalds Date: Thu May 20 21:26:12 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits) USB: remove unused usb_buffer_alloc and usb_buffer_free macros usb: musb: update gfp/slab.h includes USB: ftdi_sio: fix legacy SIO-device header USB: kl5usb105: reimplement using generic framework USB: kl5usb105: minor clean ups USB: kl5usb105: fix memory leak USB: io_ti: use kfifo to implement write buffering USB: io_ti: remove unsused private counter USB: ti_usb: use kfifo to implement write buffering USB: ir-usb: fix incorrect write-buffer length USB: aircable: fix incorrect write-buffer length USB: safe_serial: straighten out read processing USB: safe_serial: reimplement read using generic framework USB: safe_serial: reimplement write using generic framework usb-storage: always print quirks USB: usb-storage: trivial debug improvements USB: oti6858: use port write fifo USB: oti6858: use kfifo to implement write buffering USB: cypress_m8: use kfifo to implement write buffering USB: cypress_m8: remove unused drain define ... Fix up conflicts (due to usb_buffer_alloc/free renaming) in drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c drivers/media/video/gspca/gspca.c sound/usb/usbaudio.c commit 3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e Author: Stephen Rothwell Date: Fri Apr 30 14:44:54 2010 +1000 sound: fixup for usb_buffer_alloc/free rename This is needed before the USB merge. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit f8965467f366fd18f01feafb5db10512d7b4422c Merge: a26272e 2ec8c6b Author: Linus Torvalds Date: Thu May 20 21:04:44 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits) qlcnic: adding co maintainer ixgbe: add support for active DA cables ixgbe: dcb, do not tag tc_prio_control frames ixgbe: fix ixgbe_tx_is_paused logic ixgbe: always enable vlan strip/insert when DCB is enabled ixgbe: remove some redundant code in setting FCoE FIP filter ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp ixgbe: fix header len when unsplit packet overflows to data buffer ipv6: Never schedule DAD timer on dead address ipv6: Use POSTDAD state ipv6: Use state_lock to protect ifa state ipv6: Replace inet6_ifaddr->dead with state cxgb4: notify upper drivers if the device is already up when they load cxgb4: keep interrupts available when the ports are brought down cxgb4: fix initial addition of MAC address cnic: Return SPQ credit to bnx2x after ring setup and shutdown. cnic: Convert cnic_local_flags to atomic ops. can: Fix SJA1000 command register writes on SMP systems bridge: fix build for CONFIG_SYSFS disabled ARCNET: Limit com20020 PCI ID matches for SOHARD cards ... Fix up various conflicts with pcmcia tree drivers/net/ {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and wireless/orinoco/spectrum_cs.c} and feature removal (Documentation/feature-removal-schedule.txt). Also fix a non-content conflict due to pm_qos_requirement getting renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c commit a26272e5200765691e67d6780e52b32498fdb659 Merge: 7c6d87a 4047f8b Author: Linus Torvalds Date: Thu May 20 13:35:18 2010 -0700 Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 * 'docs-next' of git://git.lwn.net/linux-2.6: Add a document describing the padata interface commit 7c6d87ac843bfbc5a7669736882a0e88c217a820 Merge: a0fe3cc ec66841 Author: Linus Torvalds Date: Thu May 20 13:34:17 2010 -0700 Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6 * 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits) viafb: move some include files to include/linux viafb: Eliminate some global.h references viafb: get rid of i2c debug cruft viafb: fold via_io.h into via-core.h viafb: Fix initialization error paths viafb: Do not remove gpiochip under spinlock viafb: make procfs entries optional viafb: fix proc entry removal viafb: improve misc register handling viafb: replace inb/outb viafb: move some modesetting functions to a seperate file viafb: unify modesetting functions viafb: Reserve framebuffer memory for the upcoming camera driver viafb: Add a simple VX855 DMA engine driver viafb: Add a simple interrupt management infrastructure via: Rationalize vt1636 detection viafb: Introduce viafb_find_i2c_adapter() via: Do not attempt I/O on inactive I2C adapters viafb: Turn GPIO and i2c into proper platform devices viafb: Convert GPIO and i2c to the new indexed port ops ... commit e26bcf37234c67624f62d9fc95f922b8dbda1363 Author: Greg Kroah-Hartman Date: Thu Apr 29 15:46:07 2010 -0700 USB: remove unused usb_buffer_alloc and usb_buffer_free macros Now that all callers are converted over, remove the compatibility functions and all is good. Cc: Daniel Mack Signed-off-by: Greg Kroah-Hartman commit c4d80b7d5220a65cc4e26173d99d4750895f3e64 Author: Tejun Heo Date: Thu May 20 01:44:20 2010 +1000 usb: musb: 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 Cc: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit c1aa075acb696c374613fded0380c7ad8a96ebf5 Author: Johan Hovold Date: Wed May 19 00:01:41 2010 +0200 USB: ftdi_sio: fix legacy SIO-device header Length field of header was incorrectly set to available payload space rather than the actual payload size. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 60b3013cdaf3fa8a17243ca46b19db3cbe08d943 Author: Johan Hovold Date: Wed May 19 00:01:40 2010 +0200 USB: kl5usb105: reimplement using generic framework Kill custom read and write implementations (static per-port, singleton(!) urb pool). Also remove changelog header (can be retrieved through git). Read processing and write-buffer handling tested using a cp210x device in a loopback setup. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit ff8c195ff56d5d4226d4c1586e89b7b2e96c120a Author: Johan Hovold Date: Wed May 19 00:01:39 2010 +0200 USB: kl5usb105: minor clean ups Whitespace changes and some removed comments. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 313b0d80c1717ffe8f64b455a4d323996748b91a Author: Johan Hovold Date: Wed May 19 00:01:38 2010 +0200 USB: kl5usb105: fix memory leak Private data was not freed on error path in startup. Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit d733cec1ab0ab3b34e4acfc413cb31157eea67c3 Author: Johan Hovold Date: Wed May 19 00:01:37 2010 +0200 USB: io_ti: use kfifo to implement write buffering Kill custom fifo implementation. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit a3a30f10f56987a1df0dea857a706273145ed6fd Author: Johan Hovold Date: Wed May 19 00:01:36 2010 +0200 USB: io_ti: remove unsused private counter Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 074ef65aacdf4eb5a0af191e85ded8c995047e9d Author: Johan Hovold Date: Wed May 19 00:01:35 2010 +0200 USB: ti_usb: use kfifo to implement write buffering Kill custom fifo implementation. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit e421fe97adf96a2b1f9d89140ec3e184f0cb7d7c Author: Johan Hovold Date: Wed May 19 00:01:34 2010 +0200 USB: ir-usb: fix incorrect write-buffer length Returned length should include header length. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f26c2889a4d937371e2ec9b5690ac407f0496634 Author: Johan Hovold Date: Wed May 19 00:01:33 2010 +0200 USB: aircable: fix incorrect write-buffer length Returned length should include header length. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 6d1bf48e240bde4e9c7313ccdd2fe32f37f67ad4 Author: Johan Hovold Date: Wed May 19 00:01:32 2010 +0200 USB: safe_serial: straighten out read processing Clean up read processing logic. Tested using a cp210x device in a loopback setup. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 12e2e52cc578714d5824a27dd1a131a5418d636b Author: Johan Hovold Date: Wed May 19 00:01:31 2010 +0200 USB: safe_serial: reimplement read using generic framework Use process_read_urb to implement read processing. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 241c80ea72be4828c63f5dd44b142e54d0a12f5d Author: Johan Hovold Date: Wed May 19 00:01:30 2010 +0200 USB: safe_serial: reimplement write using generic framework Kill custom single-urb write implementation. Note that this driver still depended on the write callback from the old generic framework. Tested against original read processing using a cp210x device in a loopback setup. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 39f2f080b39ceb7ccbc0da4bc13fea5698f7fa3a Author: Felipe Contreras Date: Sun May 16 23:31:07 2010 +0300 usb-storage: always print quirks Right now quirks are printed only when the are manually overriden with the module parameters. It's not so useful to remind the user that his parameters are correctly applied; what is useful is to print out the quirks the user is not aware are being applied. So let's do the smart thing and print the quirks when they are present. Signed-off-by: Felipe Contreras Cc: Alan Stern Cc: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit cbd3af54642ec1146bac0479538d495fc474318e Author: Felipe Contreras Date: Sun May 16 23:31:06 2010 +0300 USB: usb-storage: trivial debug improvements Use pr_foo and dev_foo instead of printk. Maybe US_DEBUG* should be replaced too. Signed-off-by: Felipe Contreras Cc: Matthew Dharm Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 28f27dcbd255b44a30bf75bb438fdb3415fda4c7 Author: Johan Hovold Date: Sun May 16 20:33:52 2010 +0200 USB: oti6858: use port write fifo Kill private write fifo and use port fifo instead (protected under port lock). Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit e3c1803f8b33fb97005202fa3645501ebb946d93 Author: Johan Hovold Date: Sun May 16 20:33:51 2010 +0200 USB: oti6858: use kfifo to implement write buffering Kill custom fifo implementation. Use private write fifo to minimise changes to lock handling. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 117fb8d086cfc6e51c729fe5533bb83cb55c150a Author: Johan Hovold Date: Sun May 16 20:33:50 2010 +0200 USB: cypress_m8: use kfifo to implement write buffering Kill custom fifo implementation. Note that cypress_m8 has no port write fifo as it has no bulk-out endpoint. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit c4f4736fc4518b92d7071016c4e28fe4f4e13e82 Author: Johan Hovold Date: Sun May 16 20:33:49 2010 +0200 USB: cypress_m8: remove unused drain define Driver uses tty-port drain these days. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 7288d7550056c17d26c09a21f1a5c3764f2f882a Author: Johan Hovold Date: Sun May 16 20:33:48 2010 +0200 USB: usb_debug: set bulk out size at probe Use bulk_out_size in usb_serial_driver to set urb buffer size. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 4b8e12336fede9e30b6140e840431161d46cf677 Author: Julia Lawall Date: Sat May 15 23:15:44 2010 +0200 USB: gadget: Use kmemdup Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit eefd9029fde4d90d59804eeb54880ab8db5c1866 Author: Craig Shelley Date: Sat May 15 13:36:38 2010 +0100 USB: CP210x New Device IDs 11 New device IDs Signed-off-by: Craig Shelley Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9a1f298f8bc92f21b09bd7ef396c2fc6544ce9aa Author: Johan Hovold Date: Sun May 16 15:06:55 2010 +0200 USB: visor: increase bulk-out buffer size Increase the bulk-out buffer size to avoid any regression in throughput after replacing the old writing scheme which used dynamic buffers (e.g. up to 2k). 256b has been determined to be a good choice for several drivers including ftdi_sio which used to have a more or less identical write implementation. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 2afd8287c6e2ac6c1affb46d009cfd866dffed77 Author: Johan Hovold Date: Sat May 15 17:53:53 2010 +0200 USB: belkin_sa: implement line status handling Use process_read_urb to implement line status handling. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f2f8b7fe5a7542df8e3c906fcc9897b596bbf1fc Author: Johan Hovold Date: Sat May 15 17:53:52 2010 +0200 USB: belkin_sa: clean up open Use generic open to submit read urb. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 726ef428af41b1fbdf569772ab73de0844c4e0f2 Author: Johan Hovold Date: Sat May 15 17:53:51 2010 +0200 USB: belkin_sa: minor clean-ups Remove some whitepace and comments. Clean up close. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit a90131763dfd9a95f43071f0b67a737e6ca6a6c0 Author: Johan Hovold Date: Sat May 15 17:53:50 2010 +0200 USB: cp210x: use generic open to start reading from device Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 214916f2ec6701e1c9972f26c60b3dc37d3153c6 Author: Johan Hovold Date: Sat May 15 17:53:49 2010 +0200 USB: visor: reimplement using generic framework Kill custom read and write implementations (dynamically allocated write urbs). Note that I chose to remove the stat module parameter which was supposed to keep count of the amount of data sent and received, but which has been broken for three years (since b308e74d9c708ee2a9af14fbe235e0a41216f4ed "USB: visor driver adapted to new tty buffering" -- bytes_in was incorrectly updated and was thus always reported as 0). Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 199b113978015309dd02c69844c19a1be3f4dbcf Author: Johan Hovold Date: Sat May 15 17:53:48 2010 +0200 USB: visor: fix memory leak Fix memory leak for some devices (Sony Clie 3.5) due to port private data not being freed on release. Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit fa993ca8641ba650c762ea6701b0333118430d8c Author: Johan Hovold Date: Sat May 15 17:53:47 2010 +0200 USB: spcp8x5: reimplement using generic framework Kill custom fifo, read, and single-urb write implementations. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 6b6962f9c489ecfa43ae27eb798c46717e203322 Author: Johan Hovold Date: Sat May 15 17:53:46 2010 +0200 USB: ipaq: reimplement using generic framework Kill custom fifo, read and write implementations (single-urb and fifo, but still maintained list of 256*256b urb buffers per port). Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 695aaae684e249f9f0e7f1ed4caafa0687dbfa5b Author: Johan Hovold Date: Sat May 15 17:53:45 2010 +0200 USB: empeg: reimplement using generic framework Kill custom read and write implementations (static 16*4k write-urb pool shared among all ports in system). Also remove old changelog entries in header (code is now gone, and these entries can still be retrieved through git). Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 56a1df46c19150db0a9b0f0c14e0b1d42e7f32d4 Author: Johan Hovold Date: Sat May 15 17:53:44 2010 +0200 USB: serial: add special case for processing of empty read urbs Return immediately from generic process_read_urb if urb is empty. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit c0f631d1948658b27349545b2cbcb4b32f010c7a Author: Johan Hovold Date: Sat May 15 17:53:43 2010 +0200 USB: kobil: fix memory leak An urb transfer buffer is allocated at every open but was never freed. This driver is a bit of a mess... Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 86234d4975ce084d14711283a3bfc69305f97602 Author: Nils Radtke Date: Mon May 17 14:14:11 2010 +0200 USB: option.c: OLIVETTI OLICARD100 support This patch adds support for an olivetti olicard100 HЅDPA usb-stick. This device is a zeroCD one with ID 0b3c:c700 that needs switching via eject or usb-modeswitch with MessageContent="5553424312345678000000000000061b000000030000000000000000000000". After switching it has ID 0b3c:c000 and provides 5 serial ports ttyUSB[0-4]. Port 0 (modem) and 4 are interrupt ports. Signed-off-by: Nils Radtke Cc: stable Signed-off-by: Greg Kroah-Hartman commit c3443a6dbab1545265354d02a7edf95c84b0affd Author: Greg Kroah-Hartman Date: Mon May 17 11:00:29 2010 -0700 USB: xhci: fix compiler warning. Reported-by: Stephen Rothwell Cc: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit c024b7260c8f879a2ef3a3e6a853b579a46479f8 Author: Ming Lei Date: Mon May 17 22:20:50 2010 +0800 USB: remove match_device usb_find_device was the only one user of match_device, now it is removed, so remove match_device to fix the compile warning below reported by Stephen Rothwell: drivers/usb/core/usb.c:596: warning: 'match_device' defined but not used Reported-by: Stephen Rothwell Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit 0858a3a52f659dabf2860f350e5a6a61f069e851 Author: Greg Kroah-Hartman Date: Mon May 17 10:58:12 2010 -0700 USB: include/usb/*.h checkpatch cleanup Lots of minor formatting cleanups in includes/usb/ to make checkpatch happier. Signed-off-by: Greg Kroah-Hartman commit 812219ab8facf07b94e4b3fe81e9cd3fe4129777 Author: Greg Kroah-Hartman Date: Mon May 17 10:40:55 2010 -0700 USB: usb.h: checkpatch cleanups Minor formatting changes to clean up the file. Signed-off-by: Greg Kroah-Hartman commit aa84dfc4296b8dd296da9a4d9e19ec1e6f7ddb94 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: visor.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 5d78fcb0caf219e2e6c8e486d7e31fec1333ac06 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: pl2303.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit e4582b6a4c8e5549f2e8ffe176f08c8b1fd6beff Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: kobil_sct.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 932d22c95504979d0ad927ed9a4cd02dd6af7071 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: kl5kusb105.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit a320471147fe61ed9260295958f07cc23ec360c8 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: io_edgeport: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 3bb36aa266f11f762e345cc85499a15d8df7ec51 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: ftdi_sio: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 995834eb37c22ee9fd85324165ff71e9d6da5ae4 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: cypress_m8.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 1689e993b335e1a22d74f7ddf1b51725ccfc3ade Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: belkin_sa.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 42047699fae79190fd7ebd0b02fa4bde016adc04 Author: Greg Kroah-Hartman Date: Mon May 17 10:33:41 2010 -0700 USB: mct_u232.h: checkpatch cleanups Minor whitespace cleanups to make checkpatch happy. Signed-off-by: Greg Kroah-Hartman commit 7f1cccd3ec8789e52897bc34420ca81a5e2edeab Author: Anton Vorontsov Date: Fri May 14 18:33:18 2010 +0400 USB: FHCI: cq_get() should check kfifo_out()'s return value Since commit 7acd72eb85f1c7a15e8b5eb554994949241737f1 ("kfifo: rename kfifo_put... into kfifo_in... and kfifo_get... into kfifo_out..."), kfifo_out() is marked __must_check, and that causes gcc to produce lots of warnings like this: CC drivers/usb/host/fhci-mem.o In file included from drivers/usb/host/fhci-hcd.c:34: drivers/usb/host/fhci.h: In function 'cq_get': drivers/usb/host/fhci.h:520: warning: ignoring return value of 'kfifo_out', declared with attribute warn_unused_result ... This patch fixes the issue by properly checking the return value. Signed-off-by: Anton Vorontsov Cc: stable [.33 and .34] Signed-off-by: Greg Kroah-Hartman commit 12e7eca9630c0e00284e8a3995fc5eceaa0c199e Author: Johan Hovold Date: Thu May 13 22:25:09 2010 +0200 USB: cp210x: remove redundant disconnect() Remove cp210x_disconnect which is used to kill traffic although this is already handled by the generic framework. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 1ac93a30398774e084c12e25b3a74285ee4dba90 Author: Julia Lawall Date: Thu May 13 22:00:40 2010 +0200 USB: io_edgeport: Use kzalloc Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit b2c573790381720e8b0aca1f392b4063f84cfcb6 Author: Johan Hovold Date: Thu May 13 21:33:10 2010 +0200 USB: ipw: reimplement using generic framework Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 55c6d85cabb33461139e430f48b9dea794d46f67 Author: Johan Hovold Date: Thu May 13 21:33:09 2010 +0200 USB: ipw: remove dummy port_probe and port_remove Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 605204bfb0047523b3acda535163875a75268a6a Author: Johan Hovold Date: Thu May 13 21:33:08 2010 +0200 USB: ipw: clean up dtr-rts handling No need to raise dtr/rts in open as this is taken care of by tty layer. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f4a4cbb2047ec6b0175a08e5bcd78a697773390d Author: Johan Hovold Date: Thu May 13 21:02:03 2010 +0200 USB: ir-usb: reimplement using generic framework Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit df66e8a2afef506e303f931741193c7cf8fe0794 Author: Johan Hovold Date: Thu May 13 21:02:02 2010 +0200 USB: ir-usb: fix set_termios race Use dynamically allocated urb for baudrate changes rather than unconditionally submitting the port write urb which may already be in use. Compile-only tested. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 6f6ed696945c9c98fb6e0def32d29411d958a6fa Author: Johan Hovold Date: Thu May 13 21:02:01 2010 +0200 USB: ir-usb: allow custom bulk buffer size without reallocation Use usb_serial_driver bulk_in_size and bulk_out_size to make sure buffers of appropriate sizes are allocated in the first place rather than reallocating them at every open. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 2ff78c0c2b67120c8e503268da3f177cae2228a2 Author: Johan Hovold Date: Thu May 13 21:02:00 2010 +0200 USB: ir-usb: fix double free If the user specifies a custom bulk buffer size we get a double free at port release. Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 16032c4f5b291af541e9114a09ea20ff5a0dc474 Author: Alan Stern Date: Wed May 12 18:21:35 2010 -0400 USB: EHCI: fix controller wakeup flag settings during suspend This patch (as1380) fixes a bug in the wakeup settings for EHCI host controllers. When the controller is suspended, if it isn't enabled for remote wakeup then we have to turn off all the port wakeup flags. Disabling PCI PME# isn't good enough, because some systems (Intel) evidently use alternate wakeup signalling paths. In addition, the patch improves the handling of the Intel Moorestown hardware by performing various power-up and power-down delays just once instead of once for each port (i.e., the delays are moved outside of the port loops). This requires extra code, but the total delay time is reduced. There are also a few additional minor cleanups. Signed-off-by: Alan Stern Reported-by: Ondrej Zary CC: Alek Du CC: stable Signed-off-by: Greg Kroah-Hartman commit eab80de01cb398419ef3305f35abcb367c647c8b Author: Alek Du Date: Mon May 10 11:17:49 2010 +0800 USB: EHCI: clear PHCD before resuming This is a bug fix for PHCD (phy clock disable) low power feature: After PHCD is set, any write to PORTSC register is illegal, so when resume ports, clear PHCD bit first. Signed-off-by: Alek Du Cc: David Brownell Cc: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 17b2765ef8db8dc00a24a9afd4646bb3decffbd2 Author: Randy Dunlap Date: Thu May 13 09:41:12 2010 -0700 USB: fix functionfs for CONFIG_NET disabled Fix functionfs build to handle CONFIG_NET not enabled, to prevent these build errors: ERROR: "netif_carrier_on" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "netif_carrier_off" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_realloc_headroom" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_trim" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "netif_rx" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "alloc_etherdev_mq" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "ethtool_op_get_link" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "free_netdev" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "register_netdev" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_push" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_pull" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "dev_kfree_skb_any" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_queue_tail" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "__alloc_skb" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "eth_type_trans" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "eth_validate_addr" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_dequeue" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "unregister_netdev" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "__netif_schedule" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "skb_put" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "eth_mac_addr" [drivers/usb/gadget/g_ffs.ko] undefined! ERROR: "dev_get_stats" [drivers/usb/gadget/g_ffs.ko] undefined! Signed-off-by: Randy Dunlap Acked-by: Michał Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 419a8e81686b844c9682e8f1721e6795f3264ee6 Author: William Gulland Date: Wed May 12 10:20:34 2010 -0700 USB: xhci: Remove the arbitrary limit of 15 xHCI ports Our virtual xHCI device can have as many ports as we like - I've tested this patch with 31. Signed-off-by: William Gulland Cc: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 22b4b6113ec5d0ff2a9175bc611f3f3f61e4e172 Author: Ming Lei Date: Wed May 12 23:38:46 2010 +0800 USB: remove usb_find_device Now on one uses this function and it seems useless, so remove usb_find_device. [tom@tom linux-2.6-next]$ grep -r -n -I usb_find_device ./ drivers/media/dvb/dvb-usb/dvb-usb-init.c:160:static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device *udev,struct dvb_usb_device_properties *props, int *cold) drivers/media/dvb/dvb-usb/dvb-usb-init.c:230: if ((desc = dvb_usb_find_device(udev,props,&cold)) == NULL) { drivers/usb/core/usb.c:630: * usb_find_device - find a specific usb device in the system drivers/usb/core/usb.c:642:struct usb_device *usb_find_device(u16 vendor_id, u16 product_id) Signed-off-by: Ming Lei Signed-off-by: Greg Kroah-Hartman commit b9e000884e50bf6b25a92a3f3580e1d14fe01591 Author: Michal Nazarewicz Date: Wed May 12 12:51:13 2010 +0200 USB: gadget: f_mass_storage: fix in error recovery In to places in fsg_common_init() an unconditional call to kfree() on common was performed in error recovery which is not a valid behaviour since fsg_common structure is not always allocated by fsg_common_init(). To fix, the calls has been replaced with a goto to a proper error recovery which does the correct thing. Also, refactored fsg_common_release() function. Signed-off-by: Michal Nazarewicz Reviewed-by: Viral Mehta Signed-off-by: Greg Kroah-Hartman commit f537da685c35a81a75f6067751bddb902c8adb68 Author: Ming Lei Date: Wed May 12 23:38:12 2010 +0800 USB: add missing "{}" in map_urb_for_dma Obviously, {} is needed in the branch of "else if (hcd->driver->flags & HCD_LOCAL_MEM)" for handling of setup packet mapping. Signed-off-by: Ming Lei Acked-by: Alan Stern Cc: stable Signed-off-by: Greg Kroah-Hartman commit 572538dee7a4b25f3e77fdc11d20dbb753ecf367 Author: Anand Gadiyar Date: Thu May 6 20:09:48 2010 +0530 USB: ehci-omap: Fix resume failures after bus suspend An undocumented "feature" in the OMAP3 EHCI controller causes suspended ports to be taken out of suspend when the USBCMD.Run/Stop bit is cleared (this bit is normally cleared when ehci_bus_suspend is called). This "feature" breaks suspend-resume if the root-hub is allowed to suspend. (The controller thinks it is in resume, and the PHY thinks it is still in suspend). There is an undocumented register bit that can be used to disable this feature and restore normal behavior. Set this bit so suspend-resume can work normally. Tested on OMAP3 SDPs with the NXP ISP1504 and NXP ISP1703 PHYs. Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 89842ae6515c49405e20c0629a6442b6885ad49d Author: Alan Stern Date: Tue May 11 11:44:06 2010 -0400 USB: fix interface runtime-PM settings This patch (as1379) reworks the logic for handling USB interface runtime-PM settings -- hopefully it's right this time! The problem is that when a driver is unbound or binding fails, runtime PM for the interface always gets disabled. But pm_runtime_disable() nests, so it shouldn't be called unless the interface was previously enabled for runtime PM. Signed-off-by: Alan Stern Reported-by: Rob Duncan Tested-by: Rob Duncan Signed-off-by: Greg Kroah-Hartman commit 54b5acf3acb7a1f83ec281d111d3e2812cd7ad9d Author: Andiry Xu Date: Mon May 10 19:57:17 2010 -0700 USB: xHCI: Fix wrong usage of macro TRB_TYPE Macro TRB_TYPE is misused in some places. Fix the wrong usage. Signed-off-by: Andiry Xu Cc: stable Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 6c12db90f19727c76990e7f4801c67a148b30111 Author: John Youn Date: Mon May 10 15:33:00 2010 -0700 USB: xhci: Transfer ring link TRB activation change. Change transfer ring behavior to not follow/activate link TRBs until active TRBs are queued after it. This change affects the behavior when a TD ends just before a link TRB. Signed-off-by: John Youn Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit b0608690c2deafbca32b45196672bfd74006cf61 Author: Randy Dunlap Date: Mon May 10 10:51:36 2010 -0700 USB: gadget: f_fs.c needs to include pagemap.h Fix g_ffs build error, add a needed header file: drivers/usb/gadget/f_fs.c:1064:error: 'PAGE_CACHE_SIZE' undeclared (first use in this function) drivers/usb/gadget/f_fs.c:1065:error: 'PAGE_CACHE_SHIFT' undeclared (first use in this function) Signed-off-by: Randy Dunlap Acked-by: Michał Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 968b448b22f5a42689cc55648510834010d42379 Author: Anand Gadiyar Date: Mon May 10 21:56:12 2010 +0530 USB: ohci: Add Kconfig entries for ohci-omap3 On OMAP systems, we have two different OHCI controllers. The legacy one is present in OMAP1/2 chips, and the newer one comes bundled as a companion to the EHCI controller on OMAP3 and newer chips. We may have multi-omap configurations where OMAP2 and OMAP3 support may be enabled in the same kernel, and need a mechanism to keep both drivers around. This patch adds a Kconfig entry for each of these drivers. Signed-off-by: Anand Gadiyar Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 88ed0c97c9e9d48dddeca98856645f6ee5c56489 Author: Anand Gadiyar Date: Mon May 10 21:56:11 2010 +0530 USB: ohci: introduce omap3 ohci-hcd driver Add support for the OHCI controller present in OMAP3 and newer chips. The code is mostly based off the ehci-omap.c driver. Some of it is common to both drivers and will eventually need to be factored out to platform init files. In its current state, the driver cannot co-exist with the ehci-omap driver, and this will be fixed in later versions. The second driver to be loaded will overwrite settings made by the other. For now, this driver should allow the few users of OMAP3 OHCI to get going. Signed-off-by: Anand Gadiyar Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 95344fcc07964202737f85c16dbabbc40cae5e4d Author: Anand Gadiyar Date: Mon May 10 21:56:10 2010 +0530 USB: omap3: add platform init code for OHCI driver Add platform init code for the OMAP3 OHCI driver. Also, configure padconf settings for OMAP3 depending on which port mode is used. Signed-off-by: Anand Gadiyar Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit 73a0bd77d60163d8b4639834119a1ed65155c062 Author: Dinh Nguyen Date: Mon May 10 11:21:57 2010 -0500 USB: mxc: gadget: remove 60mhz clock requirement for freescale mx51 usb core renamed fsl_mx3_udc.c -> fsl_mxc_udc.c for mx51, usb core is clocked from sources that are not 60mhz. Signed-off-by: Dinh Nguyen Signed-off-by: Greg Kroah-Hartman commit 166ceb69075066cba196434482370f1e0318bc3e Author: Johan Hovold Date: Sat May 8 15:19:24 2010 +0200 USB: ftdi_sio: clean up line-status handling Reverse priority of errors reported to ldisc so that it matches that of other serial drivers (break takes precedence over parity, which takes precedence over framing errors). Also make sure overrun errors are handled as in other drivers, that is, an overrun error is always reported and is not associated with any received character (instead a NULL character with the TTY_OVERRUN flag set is inserted). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit d45cc8df7f59eb4db28408076ce979cd5e18f2b7 Author: Johan Hovold Date: Sat May 8 15:18:41 2010 +0200 USB: pl2303: use tty_insert_flip_string_fixed_flag Use tty_insert_flip_string_fixed_flag to report errors to line discipline. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 49b2597a86835a4eddcc02c7eafa2996aea58036 Author: Johan Hovold Date: Sat May 8 15:19:06 2010 +0200 USB: ftdi_sio: use tty_insert_flip_string_fixed_flag Use tty_insert_flip_string_fixed_flag to report errors to line discipline. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 0954e1c258c4018bfd370da41fbb5deb34582976 Author: Anton Vorontsov Date: Fri May 7 01:09:19 2010 +0400 USB: isp1760: Soften DW3 X/transaction error bit handling There were some reports[1] of isp1760 USB driver malfunctioning with high speed devices, noticed on Blackfin and PowerPC targets. These reports indicated that the original Philips 'pehcd'[2] driver worked fine. We've noticed the same issue with an ARM RealView platform. This happens under load (with only some mass storage devices, not all, just as in another report[3]): error bit is set in DW3 error bit is set in DW3 error bit is set in DW3 usb 1-1.2: device descriptor read/64, error -32 It appears that the 'pehcd' driver checks the X bit only if the transaction is halted (H bit), otherwise the error is so far insignificant. The ISP176x chips were modeled after EHCI, and EHCI spec says (thanks to Alan Stern for pointing out): "Transaction errors cause the status field to be updated to reflect the type of error, but the transaction continues to be retried until the Active bit is set to 0. When the error counter reaches 0, the Halt bit is set and the Active bit is cleared." So, just as the original Philips driver, isp1760 must report the error only if the transaction error and the halt bits are set. [1] http://markmail.org/message/lx4qrlbrs2uhcnly [2] svn co svn://sources.blackfin.uclinux.org/linux-kernel/trunk/drivers/usb/host -r 5494 See pehci.c:pehci_hcd_update_error_status(). [3] http://blackfin.uclinux.org/gf/tracker/5148 Signed-off-by: Anton Vorontsov Acked-by: Sebastian Andrzej Siewior Signed-off-by: Greg Kroah-Hartman commit 9f0a6cd3ce34de5f9d34b5bf07e1b973a5cd2aa2 Author: Andiry Xu Date: Fri May 7 18:09:27 2010 +0800 USB: usbcore: Do not disable USB3 protocol ports in hub_activate() When USB3 protocol port detects an USB3.0 device attach, the port will automatically transition to the Enabled state upon the completion of successful link training. Do not disable USB3 protocol ports in hub_activate(), or USB3.0 device will fail to be recognized if xHCI bus power management is implemented. Signed-off-by: Andiry Xu Signed-off-by: Greg Kroah-Hartman commit 82b71cfdf36d568c7a2e44efd705471c3c2caaa2 Author: Johan Hovold Date: Fri May 7 20:45:34 2010 +0200 USB: ark3116: reimplement read processing Use process_read_urb to implement read processing. Compile-only tested. Signed-off-by: Johan Hovold Acked-by: Bart Hartgers Signed-off-by: Greg Kroah-Hartman commit 70ced221cc9f041481f129e63cc5b1dedb0ff959 Author: Johan Hovold Date: Fri May 7 19:46:56 2010 +0200 USB: tty: fix incorrect use of tty_insert_flip_string_fixed_flag Fix regression introduced by commit a108bfcb372d8c4452701039308fb95747911c59 (USB: tty: Prune uses of tty_request_room in the USB layer) which broke three drivers (cypress_m8, digi_acceleport and spcp8x5) through incorrect use of tty_insert_flip_string_fixed_flag. Signed-off-by: Johan Hovold Cc: stable [.34] Signed-off-by: Greg Kroah-Hartman commit 1ab83238740ff1e1773d5c13ecac43c60cf4aec4 Author: Robert Lukassen Date: Fri May 7 09:19:53 2010 +0200 USB: gadget: Allow function access to device ID data during bind() This is a patch that makes sure that the device ID data (idVendor, idProduct and bcdDevice) are assigned to the descriptor in the cdev structure *before* the composite gadget starts binding. This allows the composite driver, and all the composite functions it uses, access to that data. In one of the composite functions we created, we needed to register an input device and wanted to use the idVendor, idProduct and bcdDevice codes to properly initialize the id field of the input device. We could not do that because the idVendor, idProduct and bcdDevice values were only set in the cdec structure *after* the composite->bind(cdev) call. Signed-off-by: Robert Lukassen Signed-off-by: Greg Kroah-Hartman commit 1d6ec813e2b2f82666230fc3c0fbf13032da945e Author: Randy Dunlap Date: Thu May 6 16:46:03 2010 -0700 USB: fix u132-hcd code/data warning Fix gcc warning on mixed declarations/code: drivers/usb/host/u132-hcd.c:1450: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 5e5cf6fc59db2322dfe3ac8e1002f066b06d868f Author: Sarah Sharp Date: Thu May 6 13:40:18 2010 -0700 USB: xhci: Set stream ID to 0 after cleaning up stalls. After using state stored in xhci_virt_ep to clean up a stalled endpoint, be sure to set the stalled stream ID back to 0. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 5bc9661cba04ff3704e704a06367d4fe96d8dd33 Author: Michal Nazarewicz Date: Wed May 5 12:53:18 2010 +0200 USB: testusb: testusb compatibility with FunctionFS gadget The FunctionFS gadget may provide the source/sink interface not as the first interface (with id == 0) but some different interface hence a code to find the interface number is required. (Note that you will still configure the gadget to report idProduct == 0xa4a4 (an "echo 0xa4a4 >/sys/module/g_ffs/parameters/usb_product" should suffice) or configure host to handle 0x0525:0xa4ac devices using the usbtest driver.) Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman commit 2201d6b1620a1d9feac78e9ff12b7246227c8b17 Author: David Brownell Date: Wed May 5 12:53:17 2010 +0200 USB: testusb: an USB testing application The testusb program just issues ioctls to perform the tests implemented by the kernel driver. It can generate a variety of transfer patterns; you should make sure to test both regular streaming and mixes of transfer sizes (including short transfers). For more information on how this can be used and on USB testing refer to . Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman commit 93f2aa4ddd25caac2b9a09538da54308dbda44e2 Author: Michal Nazarewicz Date: Wed May 5 12:53:16 2010 +0200 USB: ffs-test: FunctionFS testing program This adds an example user-space FunctionFS driver which implements a source/sink interface used for testing. Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman commit c6c560085172c16a0141ab12ae765c7d1be68279 Author: Michal Nazarewicz Date: Wed May 5 12:53:15 2010 +0200 USB: g_ffs: the FunctionFS gadget driver The Function Filesystem (FunctioFS) lets one create USB composite functions in user space in the same way as GadgetFS lets one create USB gadgets in user space. This allows creation of composite gadgets such that some of the functions are implemented in kernel space (for instance Ethernet, serial or mass storage) and other are implemented in user space. Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman commit ddf8abd2599491cbad959c700b90ba72a5dce8d0 Author: Michal Nazarewicz Date: Wed May 5 12:53:14 2010 +0200 USB: f_fs: the FunctionFS driver The FunctionFS is a USB composite function that can be used with the composite framework to create an USB gadget. >From kernel point of view it is just a composite function with some unique behaviour. It may be added to an USB configuration only after the user space driver has registered by writing descriptors and strings (the user space program has to provide the same information that kernel level composite functions provide when they are added to the configuration). >From user space point of view it is a file system which when mounted provide an "ep0" file. User space driver need to write descriptors and strings to that file. It does not need to worry about endpoints, interfaces or strings numbers but simply provide descriptors such as if the function was the only one (endpoints and strings numbers starting from one and interface numbers starting from core). The FunctionFS changes numbers of those as needed also handling situation when numbers differ in different configurations. When descriptors and strings are written "ep#" files appear (one for each declared endpoint) which handle communication on a single endpoint. Again, FunctionFS takes care of the real numbers and changing of the configuration (which means that "ep1" file may be really mapped to (say) endpoint 3 (and when configuration changes to (say) endpoint 2)). "ep0" is used for receiving events and handling setup requests. When all files are closed the function disables itself. Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman commit 28824b18ac4705e876a282a15ea0de8fc957551f Author: Michal Nazarewicz Date: Wed May 5 12:53:13 2010 +0200 USB: gadget: __init and __exit tags removed __init, __initdata and __exit tags have have been removed from various files to make it possible for gadgets that do not use the __init/__exit tags to use those. Files in question are related to: * the core composite framework, * the mass storage function (fixing a section mismatch) and * ethernet driver (ACM, ECM, RNDIS). Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Signed-off-by: Greg Kroah-Hartman commit 8120a8aadb2059e29982561658bc6675126f8105 Author: Michal Nazarewicz Date: Wed May 5 12:53:12 2010 +0200 fs/timerfd.c: make use of wait_event_interruptible_locked_irq() This patch modifies the fs/timerfd.c to use the newly created wait_event_interruptible_locked_irq() macro. This replaces an open code implementation with a single macro call. Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Cc: Alexander Viro Cc: Thomas Gleixner Cc: Roland Dreier Cc: Tejun Heo Cc: Christoph Lameter Cc: Davide Libenzi Signed-off-by: Greg Kroah-Hartman commit 22c43c81a51e05f61e90445ceb59d486c12fd921 Author: Michal Nazarewicz Date: Wed May 5 12:53:11 2010 +0200 wait_event_interruptible_locked() interface New wait_event_interruptible{,_exclusive}_locked{,_irq} macros added. They work just like versions without _locked* suffix but require the wait queue's lock to be held. Also __wake_up_locked() is now exported as to pair it with the above macros. The use case of this new facility is when one uses wait queue's lock to protect a data structure. This may be advantageous if the structure needs to be protected by a spinlock anyway. In particular, with additional spinlock the following code has to be used to wait for a condition: spin_lock(&data.lock); ... for (ret = 0; !ret && !(condition); ) { spin_unlock(&data.lock); ret = wait_event_interruptible(data.wqh, (condition)); spin_lock(&data.lock); } ... spin_unlock(&data.lock); This looks bizarre plus wait_event_interruptible() locks the wait queue's lock anyway so there is a unlock+lock sequence where it could be avoided. To avoid those problems and benefit from wait queue's lock, a code similar to the following should be used: /* Waiting */ spin_lock(&data.wqh.lock); ... ret = wait_event_interruptible_locked(data.wqh, (condition)); ... spin_unlock(&data.wqh.lock); /* Waiting exclusively */ spin_lock(&data.whq.lock); ... ret = wait_event_interruptible_exclusive_locked(data.whq, (condition)); ... spin_unlock(&data.whq.lock); /* Waking up */ spin_lock(&data.wqh.lock); ... wake_up_locked(&data.wqh); ... spin_unlock(&data.wqh.lock); When spin_lock_irq() is used matching versions of macros need to be used (*_locked_irq()). Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Cc: Marek Szyprowski Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Takashi Iwai Cc: David Howells Cc: Andreas Herrmann Cc: Thomas Gleixner Cc: Mike Galbraith Signed-off-by: Greg Kroah-Hartman commit 24337c133ff92ba8d7c42819db17f7f2b0de3129 Author: Randy Dunlap Date: Wed May 5 15:46:26 2010 -0700 USB: gadget webcam: depends on VIDEO_DEV g_webcam uses v4l[2] interfaces, so it should depend on VIDEO_DEV. ERROR: "v4l2_event_unsubscribe" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_queue" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_device_release" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_usercopy" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_dequeue" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_register_device" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_device_alloc" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_subscribe" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_unregister_device" [drivers/usb/gadget/g_webcam.ko] ndefined! ERROR: "v4l2_event_pending" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_fh_init" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_init" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "video_devdata" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_event_alloc" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_fh_add" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_fh_del" [drivers/usb/gadget/g_webcam.ko] undefined! ERROR: "v4l2_fh_exit" [drivers/usb/gadget/g_webcam.ko] undefined! Signed-off-by: Randy Dunlap Acked-by: Laurent Pinchart Signed-off-by: Greg Kroah-Hartman commit c23e5fc1f7dba228558b4a46e68f7af89515b13c Author: Johan Hovold Date: Wed May 5 23:58:13 2010 +0200 USB: serial: remove multi-urb write from generic driver Remove multi-urb write from the generic driver and simplify the prepare_write_buffer prototype: int (*prepare_write_buffer)(struct usb_serial_port *port, void *dest, size_t size); The default implementation simply fills dest with data from port write fifo but drivers can override it if they need to process the outgoing data (e.g. add headers). Turn ftdi_sio into a generic fifo-based driver, which lowers CPU usage significantly for small writes while retaining maximum throughput. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 27c7acf22047fbe4ec4cc36b7c2610dba227697c Author: Johan Hovold Date: Wed May 5 23:57:37 2010 +0200 USB: serial: reimplement generic fifo-based writes Reimplement fifo-based writes in the generic driver using a multiple pre-allocated urb scheme. In contrast to multi-urb writes, no allocations (of urbs or buffers) are made during run-time and there is less pressure on the host stack queues as currently only two urbs are used (implementation is generic and can handle more than two urbs as well, though). Initial tests using ftdi_sio show that the implementation achieves the same (maximum) throughput at high baudrates as multi-urb writes. The CPU usage is much lower than for multi-urb writes for small write requests and only slightly higher for large (e.g. 2k) requests (due to extra copy via fifo?). Also outperforms multi-urb writes for small write requests on an embedded arm-9 system, where multi-urb writes are CPU-bound at high baudrates (perf reveals that a lot of time is spent in the host stack enqueue function -- could perhaps be a bug as well). Keeping the original write_urb, buffer and flag for now as there are other drivers depending on them. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 4272568b3dd8dbad36014a107c0fbbef6400c917 Author: Johan Hovold Date: Wed May 5 23:45:24 2010 +0200 USB: aircable: rewrite using generic read and write implementations Kill circular buffers for tx and rx as well as read work thread, and switch to generic kfifo-based write implementation. This is an example of how prepare_write_buffer and process_read_urb can be used to handle protocols with packet headers. Please note the diffstat which shows that the same functionality is now provided using only a tenth of the code (including whitespace and comments, though). Tested-by: Naranjo, Manuel Francisco Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit e877048417454b0baca5d4a5aceed72a6602c3be Author: Johan Hovold Date: Wed May 5 23:45:01 2010 +0200 USB: ftdi_sio: clean up SIO write support The original SIO devices require a control byte for every packet written. Clean up the unnecessarily messy implementation of this. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit d3901a064cfedf892c00704aa4e51d119f04a65e Author: Johan Hovold Date: Wed May 5 23:44:17 2010 +0200 USB: ftdi_sio: switch to generic write implementation Switch to the generic, multi-urb, write implementation. Note that this will also make it fairly easy to use the generic fifo-based write implementation: simply unset the multi_urb_write flag and modify prepare_write_buffer (or unset if not using a legacy SIO device). This may be desirable for instance on an embedded system where optimal throughput at high baudrates may not be as important as other factors (e.g. no allocations during runtime and less pressure on host stack). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit e07afd3fb906647d37108206075834f8c670b7e3 Author: Tobias Klauser Date: Wed May 5 11:18:41 2010 +0200 USB: isp1760: Use resource_size Use the resource_size function instead of manually calculating the resource size. This reduces the chance of introducing off-by-one errors. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 0ba169aff9181389f30f225ad92e113eeb2290b9 Author: Alan Stern Date: Wed May 5 15:26:17 2010 -0400 USB: simplify usb_sg_init() This patch (as1377) simplifies the code in usb_sg_init(), without changing its functionality. It also removes a couple of unused fields from the usb_sg_request structure. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a9914127e834acf648a96c72b4e271dc0c1c7c74 Author: Laurent Pinchart Date: Sun May 2 20:57:42 2010 +0200 USB gadget: Webcam device This webcam gadget instantiates a UVC camera (360p and 720p resolutions in YUYV and MJPEG). Signed-off-by: Laurent Pinchart Signed-off-by: Greg Kroah-Hartman commit cdda479f15cd13fa50a913ca85129c0437cc7b91 Author: Laurent Pinchart Date: Sun May 2 20:57:41 2010 +0200 USB gadget: video class function driver This USB video class function driver implements a video capture device from the host's point of view. It creates a V4L2 output device on the gadget's side to transfer data from a userspace application over USB. The UVC-specific descriptors are passed by the gadget driver to the UVC function driver, making them completely configurable without any modification to the function's driver code. Signed-off-by: Laurent Pinchart Signed-off-by: Greg Kroah-Hartman commit 910f8d0cede74beff1eee93cf9cf2a28d7600e66 Author: Matthew Wilcox Date: Sat May 1 12:20:01 2010 -0600 USB: Change the scatterlist type in struct urb Change the type of the URB's 'sg' pointer from a usb_sg_request to a scatterlist. This allows drivers to submit scatter-gather lists without using the usb_sg_wait() interface. It has the added benefit of removing the typecasts that were added as part of patch as1368 (and slightly decreasing the number of pointer dereferences). Signed-off-by: Matthew Wilcox Reviewed-by: Alan Stern Tested-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1e429018b646bdf903554e92ead1cda96cc552dc Author: Matthew Wilcox Date: Fri Apr 30 13:11:30 2010 -0600 USB: Turn interface_to_usbdev into an inline function The stronger type-checking would have prevented a bug I had. Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit fe54b058de9d1df5fef9e2a559651f4b7c9f04b1 Author: Matthew Wilcox Date: Fri Apr 30 13:11:29 2010 -0600 USB: Add a usb_pipe_endpoint() convenience function Converting a pipe number to a struct usb_host_endpoint pointer is a little messy. Introduce a new convenience function to hide the mess. Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit b18a23495fd4492081a61373fc3ef9f5c59e094a Author: Matthew Wilcox Date: Fri Apr 30 13:11:28 2010 -0600 USB: Add definition for the Pipe Usage descriptor The Pipe Usage descriptor is needed for USB Attached SCSI Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 6641445c3e05460c5164ab15a17fc4ee481ca213 Author: Bill Pemberton Date: Thu Apr 29 10:04:56 2010 -0400 usb: u132-hcd.c: fix shadows sparse warning Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 993e33b032cfc072898bab78b8fa8b21bc666c7e Author: Bill Pemberton Date: Wed Apr 28 16:59:36 2010 -0400 usb: sisusb_con.c: fix shadows sparse warning Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 7d7917bcbd9bdc61e7daa46ce74f7032aa4bfb3d Author: Bill Pemberton Date: Wed Apr 28 16:59:35 2010 -0400 USB: oti6858: declare send_data() as static Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 277aa97254533c7e49a04244dfbdccbae70a7f0e Author: Bill Pemberton Date: Wed Apr 28 16:59:33 2010 -0400 USB: whci: declare functions as static qset_print() was not declared static although it is not used outside of debug.c Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit a78f4f1a16d87f3d33158d036af94e48e32f8aad Author: Hans de Goede Date: Thu Apr 29 12:59:04 2010 +0200 USB: unusual-dev: Add bad sense flag for Appotech ax203 based picture frames These Appotech controllers are found in Picture Frames, they provide a (buggy) emulation of a cdrom drive which contains the windows software Uploading of pictures happens over the corresponding /dev/sg device. Signed-off-by: Hans de Goede Cc: stable Signed-off-by: Greg Kroah-Hartman commit 88e3b59b5adce5b12e205af0e34d518ba0dcdc0c Author: Dinh Nguyen Date: Tue May 4 10:03:01 2010 -0500 USB: mxc: gadget: Fix bitfield for calculating maximum packet size The max packet length bit mask used for isochronous endpoints should be 0x7FF instead of 0x8FF. 0x8FF will actually clear higher-order bits in the max packet length field. This patch applies to 2.6.34-rc6. Signed-off-by: Dinh Nguyen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 97dc7c61f1a25e906c0eb65fac2573e1ce063d63 Author: Ajay Kumar Gupta Date: Tue May 4 13:15:23 2010 +0530 USB: ehci-omap: fix Si version related programming AM3517 is based on ES3.1 thus ES2.x related programming is invalid for it so updating ES2.x programming. Also fixed below checkpatch warning: WARNING: unnecessary whitespace before a quoted newline Signed-off-by: Ajay Kumar Gupta Signed-off-by: Greg Kroah-Hartman commit 289621c31bffb743e4007f6332b9004cdd080644 Author: Ajay Kumar Gupta Date: Tue May 4 19:53:09 2010 +0530 usb: ehci-omap: fix compilation warning Fixes below compilation warning: drivers/usb/host/ehci-hcd.c:425: warning: 'ehci_port_power' defined but not used Signed-off-by: Ajay Kumar Gupta Signed-off-by: Greg Kroah-Hartman commit f5cddcd0995366f15d2b6b0df556a2cd99fa806e Author: Dan Williams Date: Mon May 3 13:41:01 2010 -0700 USB: qcaux: add Samsung U520 device ID Another CDC-ACM + vendor specific interface layout. Signed-off-by: Dan Williams Cc: stable Signed-off-by: Greg Kroah-Hartman commit a71ee85e1d74e862d68cc9b2f2ab6a806d2550c9 Author: zhao1980ming Date: Mon May 3 00:06:37 2010 +0800 USB: option: add PID for ZTE product this patch adds ZTE modem devices Signed-off-by: Joey Cc: stable Signed-off-by: Greg Kroah-Hartman commit 8a007748fbadb8317d0af289f3bca5694354d63a Author: Sarah Sharp Date: Fri Apr 30 15:37:56 2010 -0700 USB: xhci: Avoid double free after streams are disabled. When a device is disconnected, xhci_free_virt_device() is called. Ramya found that if the device had streams enabled, and then the driver freed the streams with a call to usb_free_streams(), then about a minute after he had called this, his machine crashed with a Bad DMA error. It turns out that xhci_free_virt_device() would attempt to free the endpoint's stream_info data structure if it wasn't NULL, and the free streams function was not setting it to NULL after freeing it. Signed-off-by: Sarah Sharp Tested-by: Ramya Desai Signed-off-by: Greg Kroah-Hartman commit 85bcb5ee889e0ebb9154718939e049de265fcdfb Author: Alan Stern Date: Fri Apr 30 16:35:37 2010 -0400 USB: remove URB_NO_SETUP_DMA_MAP Now that URB_NO_SETUP_DMA_MAP is no longer in use, this patch (as1376) removes all references to it. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 842f16905dfc6743c1dd80c3d29b49ba3ab7f7c8 Author: Alan Stern Date: Fri Apr 30 12:44:46 2010 -0400 USB: remove the usb_host_ss_ep_comp structure This patch (as1375) eliminates the usb_host_ss_ep_comp structure used for storing a dynamically-allocated copy of the SuperSpeed endpoint companion descriptor. The SuperSpeed descriptor is placed directly in the usb_host_endpoint structure, alongside the standard endpoint descriptor. Signed-off-by: Alan Stern Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 3b02ca3218cf878e206545041aa811073e4f6c79 Author: Alan Stern Date: Fri Apr 30 12:42:23 2010 -0400 USB: export the new ch11.h file to userspce This patch (as1374) cleans up a few loose ends in the include/linux/usb/ch11.h header file and exports it to userspace. Signed-off-by: Alan Stern Cc: Eric Lescouet Signed-off-by: Greg Kroah-Hartman commit beb7b04a09a9da8b12417f7b74fbcceedb087fc3 Author: Alan Stern Date: Fri Apr 30 12:14:04 2010 -0400 USB: remove leftover references to udev->autosuspend_disabled This patch (as1373) fixes a couple of drivers outside the USB subtree. Devices are now disabled or enabled for autosuspend by calling a core function instead of setting a flag. Signed-off-by: Alan Stern Cc: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit da01c7a49bfc94dbfa66af5ca5e1063b10bc6a10 Author: Peter Korsgaard Date: Mon Apr 26 10:05:06 2010 +0200 USB: g_hid: unregister platform driver on probe/usb_composite_register errors Otherwise reloads will fail. Signed-off-by: Peter Korsgaard Signed-off-by: Greg Kroah-Hartman commit fe662b43521a8b8ad2dc79299922d0b0bb3fe728 Author: Alessio Igor Bogani Date: Sun Apr 25 12:52:02 2010 +0200 USB: mos7840: Cleanup useless header BKL isn't anymore present into this file thus it is no necessary still include smp_lock.h. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 1170656d94aff5e86e003394134b9c3ecbdaf10a Author: Alessio Igor Bogani Date: Sun Apr 25 12:37:10 2010 +0200 USB: sisusbvga: Remove the BKL from open BKL is not needed here because necessary locking is already provided by mutex sisusb->lock. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 31436a1a64b8eed834fba5d570038dd676e04842 Author: Fabien Chouteau Date: Mon Apr 26 12:34:54 2010 +0200 USB: Mass storage gadget: Handle eject request This patch adds handling of the "Start/Stop Unit" SCSI request to simulate media ejection. Signed-off-by: Fabien Chouteau Signed-off-by: Greg Kroah-Hartman commit f48cf80f93ba974eb3201ab2d0f2c4cef950f3fc Author: Fabien Chouteau Date: Fri Apr 23 14:21:26 2010 +0200 USB: Composite framework: Add suspended sysfs entry This patch adds a sysfs entry (/sys/devices/platform/_UDC_/gadget/suspended) to show the suspend state of an USB composite gadget. Signed-off-by: Fabien Chouteau Signed-off-by: Greg Kroah-Hartman commit 326b4810cc995209e31136af4202ed0414814ed5 Author: Randy Dunlap Date: Mon Apr 19 08:53:50 2010 -0700 USB: clean up some host controller sparse warnings Fix usb sparse warnings: drivers/usb/host/isp1362-hcd.c:2220:50: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:43:24: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:49:24: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:161:24: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:198:16: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:319:31: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:1231:33: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-pci.c:177:23: warning: non-ANSI function declaration of function 'xhci_register_pci' drivers/usb/host/xhci-pci.c:182:26: warning: non-ANSI function declaration of function 'xhci_unregister_pci' drivers/usb/host/xhci-ring.c:342:32: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-ring.c:525:34: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-ring.c:1009:32: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-ring.c:1031:32: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-ring.c:1041:16: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-ring.c:1096:30: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-ring.c:1100:27: warning: Using plain integer as NULL pointer drivers/usb/host/xhci-mem.c:224:27: warning: symbol 'xhci_alloc_container_ctx' was not declared. Should it be static? drivers/usb/host/xhci-mem.c:242:6: warning: symbol 'xhci_free_container_ctx' was not declared. Should it be static? Signed-off-by: Randy Dunlap Cc: Lothar Wassmann Signed-off By: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit e8f4af304e3d16e7e512865bd53f3db811d9bbc8 Author: Michal Nazarewicz Date: Sat Apr 17 17:12:58 2010 +0200 USB: core: config.c: usb_get_configuration() simplified usb_gat_configuratio() used two pointers to point to the same memory. Code simplified, by removing one of them. Signed-off-by: Michal Nazarewicz Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 65e0b499105ec8ff3bc4ab7680873dec20127f9d Author: Yauheni Kaliuta Date: Fri Apr 16 16:13:35 2010 +0300 USB: ncm: added ncm.h with auxiliary definitions Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit 01154aa714240a9be12a0ed69b047e53d258f5b1 Author: Yauheni Kaliuta Date: Fri Apr 16 16:13:34 2010 +0300 usb: cdc: ncm constants and structures added Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit 9ff68c7ad8910426495be36e2b568ac623adc226 Author: Randy Dunlap Date: Mon May 3 10:07:25 2010 -0700 USB: usbserial: fix mos7720 dependencies Fix mos7720 Kconfig dependencies. When an enabled bool selects a tristate, the tristate becomes =y, even if it should be limited to modular, so limit the bool kconfig option to configs that will build cleanly. Also change the if-block to a simple depends on. drivers/built-in.o: In function `mos7720_release': mos7720.c:(.text+0xad432): undefined reference to `parport_remove_port' drivers/built-in.o: In function `mos7715_parport_init': mos7720.c:(.text+0xae197): undefined reference to `parport_register_port' mos7720.c:(.text+0xae210): undefined reference to `parport_announce_port' drivers/built-in.o:(.data+0x201c8): undefined reference to `parport_ieee1284_read_nibble' drivers/built-in.o:(.data+0x201d0): undefined reference to `parport_ieee1284_read_byte' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 63b917678fe6d63e633462b5be5a309511bcf3ca Author: Mike Dunn Date: Thu Apr 15 17:02:09 2010 -0400 USB: usbserial: mos7720: cleanup, consolidation, replace send_mos_cmd with {read,write}_mos_reg No functionality added or bugs fixed, just improved code consistency and (hopefully) readability by replacing send_mos_cmd with the register read & write functions that were used for parallel port registers. Also shortens overall file length. Thoroughly tested, with emphasis on regression testing the serial port. Signed-off-by: Mike Dunn Signed-off-by: Greg Kroah-Hartman commit b69578df7e98659b7d94c905971a6d1025b431ad Author: Mike Dunn Date: Thu Apr 15 17:01:33 2010 -0400 USB: usbserial: mos7720: add support for parallel port on moschip 7715 Add support for the parallel port on the moschip MCS7715 device. The port registers itself with the parport subsystem as a low-level driver. A separate entry to the kernel configuration is added beneath that for the mos7720, to avoid the need to link with the parport subsystem code for users who don't have or don't want the parallel port. Only compatibility mode is currently supported (no ECP/EPP). Tested with both moschip devices (7720 and 7715) on UP and SMP hosts, including regression testing of serial port, concurrent operation of serial and parallel ports, and various connect / disconnect scenarios. Signed-off-by: Mike Dunn Signed-off-by: Greg Kroah-Hartman commit c220cc3e37f1596260870f99f751102f667384a5 Author: Greg Kroah-Hartman Date: Thu Apr 29 15:36:29 2010 -0700 USB: staging: fix up usb_buffer_alloc calls in the staging tree This renames the functions usb_buffer_alloc and usb_buffer_free to the correct ones for the drivers in the staging tree. Cc: Daniel Mack Signed-off-by: Greg Kroah-Hartman commit 997ea58eb92f9970b8af7aae48800d0ef43b9423 Author: Daniel Mack Date: Mon Apr 12 13:17:25 2010 +0200 USB: rename usb_buffer_alloc() and usb_buffer_free() users For more clearance what the functions actually do, usb_buffer_alloc() is renamed to usb_alloc_coherent() usb_buffer_free() is renamed to usb_free_coherent() They should only be used in code which really needs DMA coherency. All call sites have been changed accordingly, except for staging drivers. Signed-off-by: Daniel Mack Cc: Alan Stern Cc: Pedro Ribeiro Signed-off-by: Greg Kroah-Hartman commit 48679c6d772b1459a2945729e3a1256ac78fcabf Author: Eric Raymond Date: Thu Apr 15 01:35:50 2010 -0400 USB: Short new 'graph for usb-serial.txt Documentation update Signed-off-by: Greg Kroah-Hartman commit 44526f91b887a71ebd5d534903d55dc8752b8cd3 Author: Carlos Sánchez Acosta Date: Wed Apr 14 06:58:53 2010 -0500 USB: devices: fix Coding Styles Fixed coding styles in the config usb driver. Signed-off-by: Carlos Sánchez Acosta Signed-off-by: Alejandro Sánchez Acosta Signed-off-by: Greg Kroah-Hartman commit 4545f7eea31f3f8486b7b925d67abe2e4e47a75a Author: Javier Blanco de Torres (Neurowork) Date: Mon Apr 12 09:21:13 2010 +0200 USB: ueagle: fix Coding Styles Fixed coding styles in the ueagle usb driver. Signed-off-by: Javier Blanco de Torres Signed-off-by: Alejandro Sánchez Acosta Signed-off-by: Greg Kroah-Hartman commit 94a82487e6e57a102636a5326c930619f641038c Author: Viral Mehta Date: Tue Apr 6 11:51:00 2010 +0530 USB: omap: switch to subsys_initcall for isp1301 transceiver isp1301 transceiver driver init should be done before we do ohci omap init Signed-off-by: Viral Mehta Signed-off-by: Greg Kroah-Hartman commit 3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b Author: David Miller Date: Tue Apr 6 18:26:03 2010 -0700 USB: ehci: Elide I/O watchdog on NEC parts I've been running with this patch on my Niagara2 boxes for some time and have not seen any ill effects yet. Maybe we can stash this into the USB tree to get exposure for some time in -next and if anything crops up we can simply revert? Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 9ed3fd6c10a161626120862d39f0211657d7c876 Author: Phil Dibowitz Date: Sun Apr 4 14:21:01 2010 +0200 USB: storage: Remove unneeded SL11R unusual_devs entry It seems unlikely that this entry is needed anymore since the kernel has logic to handle devices that poorly respond to INQUIRY. Since we now have another entry with the same VID/PID but different flags, it's a good time to attempt to clean this up. The original submitter's email no longer works, so we'll keep an eye out for any regression reports. Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit eab1cafc3b524b714b0567ab98fc75ace09db98c Author: Sarah Sharp Date: Mon Apr 5 10:55:58 2010 -0700 USB: Support for allocating USB 3.0 streams. Bulk endpoint streams were added in the USB 3.0 specification. Streams allow a device driver to overload a bulk endpoint so that multiple transfers can be queued at once. The device then decides which transfer it wants to work on first, and can queue part of a transfer before it switches to a new stream. All this switching is invisible to the device driver, which just gets a completion for the URB. Drivers that use streams must be able to handle URBs completing in a different order than they were submitted to the endpoint. This requires adding new API to set up xHCI data structures to support multiple queues ("stream rings") per endpoint. Drivers will allocate a number of stream IDs before enqueueing URBs to the bulk endpoints of the device, and free the stream IDs in their disconnect function. See Documentation/usb/bulk-streams.txt for details. The new mass storage device class, USB Attached SCSI Protocol (UASP), uses these streams API. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit e9df17eb1408cfafa3d1844bfc7f22c7237b31b8 Author: Sarah Sharp Date: Fri Apr 2 15:34:43 2010 -0700 USB: xhci: Correct assumptions about number of rings per endpoint. Much of the xHCI driver code assumes that endpoints only have one ring. Now an endpoint can have one ring per enabled stream ID, so correct that assumption. Use functions that translate the stream_id field in the URB or the DMA address of a TRB into the correct stream ring. Correct the polling loop to print out all enabled stream rings. Make the URB cancellation routine find the correct stream ring if the URB has stream_id set. Make sure the URB enqueueing routine does the same. Also correct the code that handles stalled/halted endpoints. Check that commands and registers that can take stream IDs handle them properly. That includes ringing an endpoint doorbell, resetting a stalled/halted endpoint, and setting a transfer ring dequeue pointer (since that command can set the dequeue pointer in a stream context or an endpoint context). Correct the transfer event handler to translate a TRB DMA address into the stream ring it was enqueued to. Make the code to allocate and prepare TD structures adds the TD to the right td_list for the stream ring. Make sure the code to give the first TRB in a TD to the hardware manipulates the correct stream ring. When an endpoint stalls, store the stream ID of the stream ring that stalled in the xhci_virt_ep structure. Use that instead of the stream ID in the URB, since an URB may be re-used after it is given back after a non-control endpoint stall. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 8df75f42f8e67e2851cdcf6da91640fb881defd1 Author: Sarah Sharp Date: Fri Apr 2 15:34:16 2010 -0700 USB: xhci: Add memory allocation for USB3 bulk streams. Add support for allocating streams for USB 3.0 bulk endpoints. See Documentation/usb/bulk-streams.txt for more information about how and why you would use streams. When an endpoint has streams enabled, instead of having one ring where all transfers are enqueued to the hardware, it has several rings. The ring dequeue pointer in the endpoint context is changed to point to a "Stream Context Array". This is basically an array of pointers to transfer rings, one for each stream ID that the driver wants to use. The Stream Context Array size must be a power of two, and host controllers can place a limit on the size of the array (4 to 2^16 entries). These two facts make calculating the size of the Stream Context Array and the number of entries actually used by the driver a bit tricky. Besides the Stream Context Array and rings for all the stream IDs, we need one more data structure. The xHCI hardware will not tell us which stream ID a transfer event was for, but it will give us the slot ID, endpoint index, and physical address for the TRB that caused the event. For every endpoint on a device, add a radix tree to map physical TRB addresses to virtual segments within a stream ring. Keep track of whether an endpoint is transitioning to using streams, and don't enqueue any URBs while that's taking place. Refuse to transition an endpoint to streams if there are already URBs enqueued for that endpoint. We need to make sure that freeing streams does not fail, since a driver's disconnect() function may attempt to do this, and it cannot fail. Pre-allocate the command structure used to issue the Configure Endpoint command, and reserve space on the command ring for each stream endpoint. This may be a bit overkill, but it is permissible for the driver to allocate all streams in one call and free them in multiple calls. (It is not advised, however, since it is a waste of resources and time.) Even with the memory and ring room pre-allocated, freeing streams can still fail because the xHC rejects the configure endpoint command. It is valid (by the xHCI 0.96 spec) to return a "Bandwidth Error" or a "Resource Error" for a configure endpoint command. We should never see a Bandwidth Error, since bulk endpoints do not effect the reserved bandwidth. The host controller can still return a Resource Error, but it's improbable since the xHC would be going from a more resource-intensive configuration (streams) to a less resource-intensive configuration (no streams). If the xHC returns a Resource Error, the endpoint will be stuck with streams and will be unusable for drivers. It's an unavoidable consequence of broken host controller hardware. Includes bug fixes from the original patch, contributed by John Youn and Andy Green Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 94af1220985c71cd80d6c161b7a42c51ef08b923 Author: Sarah Sharp Date: Fri Apr 2 15:34:10 2010 -0700 USB: Add stream ID field to struct urb. Bulk endpoint streams were added in the USB 3.0 specification. Streams allow a device driver to overload a bulk endpoint so that multiple transfers can be queued at once. Add a new field, stream_id, to struct urb so that USB 3.0 drivers can specify which stream they want the URB to be queued to. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 22ad1e7f86e1fb96488d71512e2797153a6ad839 Author: Sarah Sharp Date: Fri Apr 2 15:33:56 2010 -0700 USB: Add parsing of SuperSpeed endpoint companion descriptor. Allow the xHCI drivers (and any new USB 3.0 drivers) to parse the SuperSpeed endpoint companion descriptor to find the maximum number of bulk endpoint streams the endpoint supports. This is used to calculate the maximum total number of streams the driver can allocate. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit e07896e62abbf7a741a5cd5b25ba7637bdf91ad0 Author: Anssi Hannula Date: Thu Apr 1 12:31:10 2010 -0400 USB: qcserial: Add support for Qualcomm Gobi 2000 devices Add ids for Qualcomm Gobi 2000 QDL and Modem modes. Gobi 2000 has a single altsetting in QDL mode, so adapt code to handle that. Firmware upload protocol is also slightly different, with an additional firmware file. However, qcserial doesn't handle firmware uploading. Tested on Lenovo Thinkpad T510. Signed-off-by: Anssi Hannula Signed-off-by: Matthew Garrett Signed-off-by: Greg Kroah-Hartman commit 3d7e59ad88fdb6bc50ae9b7e822d4bb5f68b68f9 Author: Matthew Garrett Date: Thu Apr 1 12:31:09 2010 -0400 USB: qcserial: Use generic USB wwan code Make qcserial use the generic USB wwan code. This should result in a performance improvement. Signed-off-by: Matthew Garrett Signed-off-by: Greg Kroah-Hartman commit 8b4c6a3ab596961b784659c71dc24b341f938a1a Author: Matthew Garrett Date: Thu Apr 1 12:31:08 2010 -0400 USB: option: Use generic USB wwan code As this code was simply factored out of option, this is a simple conversion. Signed-off-by: Matthew Garrett Signed-off-by: Greg Kroah-Hartman commit 0d4561947b8ddd5d944bdbbdc1ea1d6fd9a06041 Author: Matthew Garrett Date: Thu Apr 1 12:31:07 2010 -0400 usb serial: Add generic USB wwan support The generic USB serial code is ill-suited for high-speed USB wwan devices, resulting in the option driver. However, other non-option devices may also gain similar benefits from not using the generic code. Factorise out the non-option specific code from the option driver and make it available to other users. Signed-off-by: Matthew Garrett Signed-off-by: Greg Kroah-Hartman commit a90309860b0935805d49e75499fb8dc59fea8e94 Author: Alan Stern Date: Fri Apr 2 13:22:16 2010 -0400 USB: deprecate the power/level sysfs attribute This patch (as1367) deprecates USB's power/level sysfs attribute in favor of the power/control attribute provided by the runtime PM core. The two attributes do the same thing. It would be nice to replace power/level with a symlink to power/control, but at the moment sysfs doesn't offer any way to do so. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9e18c821659d836bd63f88df3c19729327728496 Author: Alan Stern Date: Fri Apr 2 13:22:09 2010 -0400 USB: use PM core routines to enable/disable autosuspend This patch (as1366) replaces the private routines usb_enable_autosuspend() and usb_disable_autosuspend() with calls to the standard pm_runtime_allow() and pm_runtime_forbid() functions in the runtime PM framework. They do the same thing. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7aba8d014341341590ecb64050b7a026642a62eb Author: Alan Stern Date: Fri Apr 2 13:21:33 2010 -0400 USB: don't enable remote wakeup by default This patch (as1364) avoids enabling remote wakeup by default on all non-root-hub USB devices. Individual drivers or userspace will have to enable it wherever it is needed, such as for keyboards or network interfaces. Note: This affects only system sleep, not autosuspend. External hubs will continue to relay wakeup requests received from downstream through their upstream port, even when remote wakeup is not enabled for the hub itself. Disabling remote wakeup on a hub merely prevents it from generating wakeup requests in response to connect, disconnect, and overcurrent events. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7560d32ec70508a71f537a88e40f7717f15389ac Author: Alan Stern Date: Fri Apr 2 13:18:50 2010 -0400 USB: improve runtime remote wakeup settings This patch (as1362) adjusts the way the USB autosuspend routines handle remote-wakeup settings. They aren't supposed to use device_may_wakeup(); that test is intended only for system sleep, not runtime power management. Instead the code checks to see if any interface drivers need remote wakeup; if they do then it is enabled, provided the device is capable of it. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ff9c895f07d36193c75533bda8193bde8ca99d02 Author: Alan Stern Date: Fri Apr 2 13:27:28 2010 -0400 USB: fix usbmon and DMA mapping for scatter-gather URBs This patch (as1368) fixes a rather obscure bug in usbmon: When tracing URBs sent by the scatter-gather library, it accesses the data buffers while they are still mapped for DMA. The solution is to move the mapping and unmapping out of the s-g library and into the usual place in hcd.c. This requires the addition of new URB flag bits to describe the kind of mapping needed, since we have to call dma_map_sg() if the HCD supports native scatter-gather operation and dma_map_page() if it doesn't. The nice thing about having the new flags is that they simplify the testing for unmapping. The patch removes the only caller of usb_buffer_[un]map_sg(), so those functions are #if'ed out. A later patch will remove them entirely. As a result of this change, urb->sg will be set in situations where it wasn't set previously. Hence the xhci and whci drivers are adjusted to test urb->num_sgs instead, which retains its original meaning and is nonzero only when the HCD has to handle a scatterlist. Finally, even when a submission error occurs we don't want to hand URBs to usbmon before they are unmapped. The submission path is rearranged so that map_urb_for_dma() is called only for non-root-hub URBs and unmap_urb_for_dma() is called immediately after a submission error. This simplifies the error handling. Signed-off-by: Alan Stern CC: Signed-off-by: Greg Kroah-Hartman commit 0ff8d1b3c858ea7c8daa54f7577971a76d04d283 Author: Matt Reimer Date: Thu Apr 1 13:44:04 2010 -0700 USB: pxa27x_udc: use four bits to store endpoint addresses Endpoint addresses on pxa27x can be programmed as 1-15, but since only three bits were being used to store the endpoint number it was possible to overflow. Signed-off-by: Matt Reimer Signed-off-by: Greg Kroah-Hartman commit 92a6e6b3280776b1341cd61b1d137ec34ab3f30b Author: Heikki Krogerus Date: Wed Mar 31 10:18:05 2010 +0300 usb: otg: twl4030: use the global ULPI register definitions Rely on the global ULPI register definitions Signed-off-by: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman commit fc567f06def35427ba830649eb6acbb72ac2790c Author: Heikki Krogerus Date: Mon May 3 09:13:02 2010 +0300 USB: otg: ulpi: use the global ULPI register definitions Rely on the global ULPI register definitions Signed-off-by: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman commit 3a229eb13984a2950ee47fb827c8ed1d654b9d68 Author: Heikki Krogerus Date: Mon May 3 09:13:01 2010 +0300 usb: otg: add global ULPI register definitions Definitions for registers defined by ULPI specification v1.1. Signed-off-by: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman commit 0fb2c2a1692b8f77be25d38f8802b0142cb6e6bc Author: Michal Nazarewicz Date: Mon Mar 29 14:01:32 2010 +0200 USB: gadget: f_mass_storage: per function Mass Storage Function (MSF) used the same descriptors for each usb_function instance (meaning usb_function::descriptors of different functions pointed to the same static area (the same was true for usb_function::hs_descriptors)). This would leads to problems if MSF were used in several USB configurations with different interface and/or endpoint numbers. Descriptors for all configurations would have interface/endpoint numbers overwritten by the values valid for the last configuration. This patch adds code that copies the descriptors each time MSF is added to USB configuration (that is for each usb_function). Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park commit dd0543ecc638947d67bdd3a8a41b95ed3c7b885e Author: Robert Lukassen Date: Tue Mar 30 14:14:01 2010 +0200 usb: gadget: Allow larger configuration descriptors The composite framework allows gadgets with more than one function. This can lead to situations where the configuration descriptor is larger than the maximum of 512 bytes currently allowed by the composite framework. This patch proposes to double that limit to 1024. Signed-off-by: Robert Lukassen Signed-off-by: Greg Kroah-Hartman commit ffb865b1e4608cf76867f132b9e8df359fdffc91 Author: Heikki Krogerus Date: Thu Mar 25 13:25:28 2010 +0200 usb: musb: add ulpi access operations This adds helper functions for ULPI access, and implements otg_io_access_ops for musb. Signed-off-by: Heikki Krogerus Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 58815fa3bffdee8dbac5af6931eea991d7a71a19 Author: Ajay Kumar Gupta Date: Thu Mar 25 13:25:27 2010 +0200 usb: musb: Add extvbus in musb_board_data EXTVBUS programming is required by OMAP3EVM REV >=E to supply 500mA power so adding a flag which can be used by musb driver to program EXTVBUS. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit d7086ddb4d3c2f8007ed5e0bb1f30a06c1bb3480 Author: Felipe Balbi Date: Thu Mar 25 13:25:26 2010 +0200 usb: musb: Makefile: remove unexistent config option Remove the unexistent CONFIG_USB_INVENTRA_MUSB_HAS_AHB_ID option from our Makefile. Problem reported by Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 82e2af47fe7a494fafb3f6ed39a7856c1307411b Author: Anand Gadiyar Date: Thu Mar 25 13:25:25 2010 +0200 usb: musb: omap2430.c: remove unnecessary includes We don't need mach-types and hardware.h Signed-off-by: Anand Gadiyar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 00ce8eca856bc1e0b943427d2cf76122ae3b1255 Author: Anand Gadiyar Date: Thu Mar 25 13:25:24 2010 +0200 usb: musb: omap2430: remove unused define get_cpu_rev() is unused in this driver. It is probably legacy code. So remove it. Signed-off-by: Anand Gadiyar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit d55d221a93c62a769f2bcf9cd5853425addb5c9f Author: Sergei Shtylyov Date: Thu Mar 25 13:25:23 2010 +0200 MUSB: Blackfin: remove musb_platform_{suspend|resume}() These functions do nothing and also are both unnecessarily 'extern'; actually, musb_platform_resume() in not even called... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 5b3078b2d789f4bd49006a3633dc106e56c47e28 Author: Sergei Shtylyov Date: Thu Mar 25 13:25:22 2010 +0200 MUSB: OMAP: make musb_platform_suspend() 'static' This function is only called inside omap2430.c... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 69b2cd7200a32956581cab24b2a4ecf8353cd6f8 Author: Sergei Shtylyov Date: Thu Mar 25 13:25:21 2010 +0200 MUSB: Blackfin: remove bfin_vbus_power() This function does nothing... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit ca0d44525060cf852b87c35f64d786b8a2a75c3d Author: Sergei Shtylyov Date: Thu Mar 25 13:25:20 2010 +0200 MUSB: OMAP: remove omap_vbus_power() This function does nothing... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit ff927addd62d33ab95cd83208e7db3ff37fdac18 Author: Cliff Cai Date: Thu Mar 25 13:25:19 2010 +0200 USB: musb: support host/gadget role switching on Blackfin parts Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit b0f9da7e02776a8c5ad61b9e24feebf7b12a7243 Author: Felipe Balbi Date: Thu Mar 25 13:25:18 2010 +0200 usb: musb: debugfs: musb_exit_debugfs() can be called on probe when we fail to probe(), we can call musb_exit_debugfs(). Allow that by removing section annotations. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit e618834ef9608750a36d03d4aa9a9f931aa788d6 Author: James Maki Date: Sun Mar 21 12:53:59 2010 -0500 USB: option.c: option_indat_callback: Resubmit some unsuccessful URBs All unsuccessful (non-zero status) URBs were being dropped. After N_IN_URBs are dropped you will no longer be able to receive data. This patch resubmits unsuccessful URBs unless the status indicates that it should be terminated. The statuses that indicate the URB should be terminated was gathered from other similar drivers. Signed-off-by: James Maki Signed-off-by: Greg Kroah-Hartman commit 71adf118946957839a13aa4d1094183e05c6c094 Author: Fabien Chouteau Date: Thu Apr 8 09:31:15 2010 +0200 USB: gadget: add HID gadget driver g_hid is a USB gadget driver implementing the Human Interface Device class specification. The driver handles basic HID protocol handling in the kernel, and allows userspace to read/write HID reports trough /dev/hidgX character devices. Signed-off-by: Fabien Chouteau Signed-off-by: Peter Korsgaard Signed-off-by: Greg Kroah-Hartman commit e49bbce133a049f6f325db6b0cee49f406d03a6e Author: Johan Hovold Date: Wed Mar 17 23:06:09 2010 +0100 USB: ftdi_sio: fix some coding style issues Remove unnecessary comments stating function names at (some) opening/closing braces. Fix some whitespace issues. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit eaa3bcb06aed1ac1d6d9e3edd3b5f72ea57a6ac0 Author: Johan Hovold Date: Wed Mar 17 23:06:08 2010 +0100 USB: serial: generalise write buffer preparation Generalise write buffer preparation. This allows for drivers to manipulate (e.g. add headers) to bulk out data before it is sent. This adds a new function pointer to usb_serial_driver: int (*prepare_write_buffer)(struct usb_serial_port *port, void **dest, size_t size, const void *src, size_t count); The function is generic and can be used with either kfifo-based or multi-urb writes: If *dest is NULL the implementation should allocate dest. If src is NULL the implementation should use the port write fifo. If not set, a generic implementation is used which simply uses memcpy or kfifo_out. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 25d514ca227e1ac81d0906a4ccf2aa171f50a600 Author: Johan Hovold Date: Wed Mar 17 23:06:07 2010 +0100 USB: serial: re-implement multi-urb writes in generic driver Use dynamic transfer buffer sizes since it is more efficient to let the host controller do the partitioning to fit endpoint size. This way we also do not use more than one urb per write request. Replace max_in_flight_urbs with multi_urb_write flag in struct usb_serial_driver to enable multi-urb writes. Use MAX_TX_URBS=40 and a max buffer size of PAGE_SIZE to prevent DoS attacks. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 40f92f0dcd9b215c48c53a226328e8e36615e367 Author: Johan Hovold Date: Wed Mar 17 23:06:06 2010 +0100 USB: serial: allow custom multi-urb write bulk callbacks Allow drivers to implement their own multi-urb write bulk callbacks as we do for single urb writes. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 80fa92c1335a3c7f85a3e0d3dbffd79984fdccc0 Author: Johan Hovold Date: Wed Mar 17 23:06:05 2010 +0100 USB: usb_debug: use the generic kfifo-based write implementation Use the generic kfifo-based write implementation rather than allowing up to 4000 8 byte urbs in the host stack queues. Cc: Jason Wessel Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 8b0127b2082601e40295045414a8318f2c8ee5a0 Author: Johan Hovold Date: Wed Mar 17 23:06:04 2010 +0100 USB: pl2303: use generic close Use usb_serial_generic_close to kill the read and write urbs and to reset the write fifo. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 684c6e30d389f67ef727c8f5a7b23a09b4cb02e4 Author: Johan Hovold Date: Wed Mar 17 23:06:03 2010 +0100 USB: pl2303: switch to generic write implementation Replace custom fifo-based write implementation with the generic kfifo-based one. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 50a5f70cee11636908711abd339f5c5933375a7d Author: Johan Hovold Date: Wed Mar 17 23:06:02 2010 +0100 USB: serial: clean up generic write start busy test Submit write urb if it is not already in use and we have buffered data. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 1a1405e22563151de79fdc83aa5e5815d10f0291 Author: Johan Hovold Date: Wed Mar 17 23:06:01 2010 +0100 USB: serial: clean up some error and debug messages in generic driver Clean up error messages on usb_submit_urb failure. Remove debug message on zero-length writes. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 1b551015a10d6cf04f2f8e11f0ca534b261d2c55 Author: Johan Hovold Date: Wed Mar 17 23:06:00 2010 +0100 USB: ftdi_sio: switch to generic read implementation Switch to generic read implementation and use process_read_urb to do device specific processing (handle line status). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f1e949ac4ea1f4e37187949944899afeaff33e1e Author: Johan Hovold Date: Wed Mar 17 23:05:59 2010 +0100 USB: serial: export generic throttle and unthrottle Allow drivers to use the generic throttle and unthrottle implementation. This makes sense for drivers using the generic read functionality. Note that drivers need to set these explicitly in order to enable them (i.e., we do not set them at port probe if not defined). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f08e07ac8b87b1a4b8ff88a061195e99282dfbbd Author: Johan Hovold Date: Wed Mar 17 23:05:58 2010 +0100 USB: pl2303: switch to generic read implementation Use generic read implementation and use process_read_urb to do device specific processing (handle line status). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 231543206452f5c42bace54b5c13dfe5a0313812 Author: Johan Hovold Date: Wed Mar 17 23:05:57 2010 +0100 USB: serial: generalise generic read implementation Add process_read_urb to usb_serial_driver so that a driver can rely on the generic read (and throttle) mechanism but still do device specific processing of incoming data (such as adding tty_flags before pushing to line discipline). The default generic implementation handles sysrq for consoles but otherwise simply pushes to tty. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 0f3d5bae2bdacce6c6c1d116809d6b3d50338df7 Author: Johan Hovold Date: Wed Mar 17 23:05:56 2010 +0100 USB: serial: clean up read processing in generic driver Always process and flush read urb, but only resubmit when not throttled. The new tty-layer supply plenty of slack so there is really no need to cache and delay processing of a single urb while throttled. Note that unthrottle now submits using GFP_KERNEL as we are not in atomic context (so there is no need to save irq state either). Note also that the process_read_urb function could be added to usb_serial_driver should any driver need to do any device specific processing. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 2db6c7698bbb37128959d3a207fc46e3f45bef3c Author: Johan Hovold Date: Wed Mar 17 23:05:55 2010 +0100 USB: cp210x: use generic submit_read_urb at open There is no need to initialise the read urb as this is done at port probe. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 056afc0f01701c4c779ac5b4f2dd9058063f337c Author: Johan Hovold Date: Wed Mar 17 23:05:54 2010 +0100 USB: serial: remove unnecessary re-initialisation of generic urbs The generic read and write bulk urbs are initialised when allocated in usb_serial_probe. The only field that needs to be updated after that is the transfer_buffer_length of the write urb. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 41bd72f9041def8e3334d3e3693862d078f5cb9a Author: Johan Hovold Date: Wed Mar 17 23:05:53 2010 +0100 USB: serial: refactor read urb submission in generic driver Use the already exported function for submitting the read urb associated with a usb_serial_port. Make sure it returns the result of usb_submit_urb and rename to the more descriptive usb_serial_generic_submit_read_urb. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit f26788da3b342099d2b02d99ba1cb7f154d6ef7b Author: Johan Hovold Date: Wed Mar 17 23:00:45 2010 +0100 USB: serial: refactor generic close Export usb_serial_generic_close so that drivers can easily kill the read and write urb and make sure that the write fifo is reset. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit ec3ee5086c1e1b883292eaf795b5c1b0c25bcffe Author: Johan Hovold Date: Wed Mar 17 23:00:44 2010 +0100 USB: serial: clear fifo on close Make sure fifo is emptied on close. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 50dbb8528757b1977efd5d270ed9d262cbbef87d Author: Johan Hovold Date: Wed Mar 17 23:00:43 2010 +0100 USB: serial: fix missing locking on fifo in write callback On errors the fifo was reset without any locking. This could race with write which do kfifo_put and perhaps also chars_in_buffer and write_room. Every other access to the fifo is protected using the port lock so better add it to the error path as well. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 30af7fb5a40f8724c130428473edffa73170e04c Author: Johan Hovold Date: Wed Mar 17 23:00:42 2010 +0100 USB: serial: fix generic chars_in_buffer Make sure chars_in_buffer accounts also for data in host stack queues. This fixes the problem with tty_wait_until_sent returning too soon at close which could cause the final write urb to be cancelled. Reported-by: Pete Zaitcev Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 7919c2fd9e07276403b9a4d9ae52305e0d70f923 Author: Johan Hovold Date: Wed Mar 17 23:00:41 2010 +0100 USB: pl2303: increase bulk-in buffer size to 256 byte The pl2303 requires a bulk-in buffer larger than endpoint size to keep up at high baudrates without loosing data. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 3efeaff6298290b36499532f0b4c87aa4bae8aef Author: Johan Hovold Date: Wed Mar 17 23:00:40 2010 +0100 USB: pl2303: increase the bulk-out buffer size to 256 byte Increase the bulk-out buffer size from 64 to 256 byte. This gives a significant increase in throughput already at 1Mbaud as well as lowered CPU usage. The buffer is big enough to keep up also at 3Mbaud (128b would not suffice). 64b 256b 921k: 640 KB/s 870 KB/s 3M: 640 KB/s 2520 KB/s Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit aea006b93a59864473866e4b1bdb51deea593798 Author: Johan Hovold Date: Wed Mar 17 23:00:39 2010 +0100 USB: cp210x: increase bulk-in buffer size to 256 byte The cp210x requires a bulk-in buffer larger than endpoint size to keep up at high baudrates without loosing data. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit d4e598f65de351eb66a90889d9ceaaca472fda40 Author: Johan Hovold Date: Wed Mar 17 23:00:38 2010 +0100 USB: cp210x: increase the bulk-out buffer size to 256 byte Increase the bulk-out buffer size from 64 to 256 byte. This gives a significant increase in throughput already at 1Mbaud (e.g. 710 instead of 640 KB/s) as well as lowered CPU usage. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit bbcb2b907415a90334521a31a8767cd77462c716 Author: Johan Hovold Date: Wed Mar 17 23:00:37 2010 +0100 USB: serial: allow drivers to define bulk buffer sizes Allow drivers to define custom bulk in/out buffer sizes in struct usb_serial_driver. If not set, fall back to the default buffer size which matches the endpoint size. Three drivers are currently freeing the pre-allocated buffers and allocating larger ones to achieve this at port probe (ftdi_sio) or even at port open (ipaq and iuu_phoenix), which needless to say is suboptimal. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 317149c655defedfaf432143b86a720cfc12a424 Author: Hans de Goede Date: Mon Mar 29 12:03:17 2010 +0200 USB: Add a new quirk: USB_QUIRK_HONOR_BNUMINTERFACES Add a new quirk USB_QUIRK_HONOR_BNUMINTERFACES, when this quirk is set and a device has more interface descriptors in a configuration then it claims to have in config->bNumInterfaces, ignore all additional interfaces. This is needed for devices which try to hide unused interfaces by only lowering config->bNumInterfaces, and which can't handle if you try to talk to the "hidden" interfaces. Signed-off-by: Hans de Goede Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7f0ae3a8eeb7f231dc99cee7c871ba64e07ebefe Author: Randy Dunlap Date: Thu Mar 25 11:29:16 2010 -0700 usb: fix serial build when SYSRQ is disabled Fix build error when CONFIG_MAGIC_SYSRQ is not enabled: drivers/usb/serial/generic.c:566: error: implicit declaration of function 'handle_sysrq' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 2a1e7d5d54c1c046c1fe47dffd119b45087c6de6 Author: Vijay Kumar Date: Wed Mar 10 21:17:56 2010 +0530 USB Serial Driver: ZIO Motherboard Add ZIO Motherboard USB serial interface driver. Signed-off-by: Vijay Kumar B. Signed-off-by: Greg Kroah-Hartman commit 92d2c5e4badc622999d3b17e6dfbf6babacb52f6 Author: Jason Wessel Date: Tue Mar 16 16:05:44 2010 -0500 usb-console: pass baud from console to the initial tty open The usb console code has had a long standing problem of not being able to pass the baud rate from the kernel argument console=ttyUSB0,BAUD down to the initial tty open, unless you were willing to settle for 9600 baud. The solution is to directly use tty_init_termios() in usb_console_setup() as this will preserve any changes to the initial termios setting on future opens. CC: Alan Cox CC: Alan Stern Signed-off-by: Jason Wessel Signed-off-by: Greg Kroah-Hartman commit aae86e8adb3bbf5256eebe76500cf7254365753c Author: Michal Nazarewicz Date: Mon Mar 15 21:38:31 2010 +0100 USB: f_mass_storage: dynamic buffers for better alignment "Static" buffers in fsg_buffhd structure (ie. fields which are arrays rather then pointers to dynamically allocated memory) are not aligned to any "big" power of two which may lead to poor DMA performance (copying "by hand" of head or tail) or no DMA at all even if otherwise hardware supports it. Therefore, this patch makes mass storage function use kmalloc()ed buffers which are (because of their size) page aligned (which should be enough for any hardware). Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Signed-off-by: Greg Kroah-Hartman commit ddb495d4d81dee4fdd96ae397d60ddefd65204c6 Author: Felipe Balbi Date: Fri Mar 12 10:29:13 2010 +0200 usb: musb: hsdma: use musb_read/writel ... and simplify the was we read/write from/to DMA COUNT register. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit ca4b2532fb0e2d62370d9825147ffa9b9d9e3880 Author: Felipe Balbi Date: Fri Mar 12 10:29:12 2010 +0200 usb: musb: gadget: support musb-specific test modes we can support the musb-specific test modes on the vendor specific range of test selector as stated on USB Specification Table 9-7 Test Mode Selectors. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 7f7f9e2a5af9e30c6a0c6743ac874f67e2ef4b72 Author: Felipe Balbi Date: Fri Mar 12 10:29:11 2010 +0200 usb: musb: add debugfs support for now only a simple register dump entry (which can be rather useful on debugging) and a way to start test modes. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 6ddc6dae4ab559b648bc348e3a48e113e92ab4a2 Author: Cliff Cai Date: Fri Mar 12 10:29:10 2010 +0200 USB: musb: allow the Blackfin vrsel gpio to be active low Rather than hardcoding the gpio levels for vrsel, allow the platform resources to handle this so boards can be active high or low. Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit fb9c58edf13fc30d160ce52018576a1d7d45d795 Author: Maulik Mankad Date: Fri Mar 12 10:29:09 2010 +0200 USB: MUSB: Add OMAP4 support in MUSB driver This patch adds CONFIG_ARCH_OMAP4 macro within MUSB driver. Signed-off-by: Maulik Mankad Cc: David Brownell Cc: Sergei Shtylyov Cc: Olof Johansson Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit c71b1b9c21fa8f73028ebe82b17f738d3bf327f5 Author: Maulik Mankad Date: Fri Mar 12 10:29:08 2010 +0200 USB: MUSB: Build MUSB driver for OMAP4 This patch updates the Makefile to build the MUSB driver for OMAP4. It also sets the Kconfig options for OMAP4. Signed-off-by: Maulik Mankad Cc: David Brownell Cc: Sergei Shtylyov Cc: Olof Johansson Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit de2e1b0c988c901989713869a8bea3b3d02bb9ce Author: Maulik Mankad Date: Fri Mar 12 10:29:07 2010 +0200 usb: musb: Set transceiver interface type Program the OTG_INTERFSEL register based on transcevier type passed from board file. Adapt signature of musb_platform_init() function for davinci, blackfin and tusb6010. Signed-off-by: Maulik Mankad Cc: David Brownell Cc: Sergei Shtylyov Cc: Olof Johansson Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit e6c213b2968cbee4cfb8f89f2d685b9ad07eefbd Author: Felipe Balbi Date: Fri Mar 12 10:29:06 2010 +0200 usb: musb: allow board to pass down fifo mode boards might want to optimize their fifo configuration to the particular needs of that specific board. Allow that by moving all related data structures to Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit bd5afa9eac6daa408412a31a6c69e87e8bd28c7e Author: Jason Wessel Date: Mon Mar 8 21:50:12 2010 -0600 usb-serial: Use tty_port version console instead of usb_serial_port Replace all instances of using the console variable in struct usb_serial_port with the struct tty_port version. CC: Alan Cox CC: Alan Stern CC: Oliver Neukum CC: Andrew Morton CC: linux-usb@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Jason Wessel Signed-off-by: Greg Kroah-Hartman commit 9757de384451a606af8c722213cb973192cbbd1b Author: Manuel Lauss Date: Mon Mar 8 20:43:32 2010 +0100 USB: ehci-au1xxx does not need EHCI IO watchdog I've been running variations of this patch for well over a year now; my usual zoo of test devices didn't trigger any ill effects even under heavy load. As a nice sideeffect idle-wakeups are reduced from 20/s to about 2/s (EHCI hub with mouse and kbd). Signed-off-by: Manuel Lauss Signed-off-by: Greg Kroah-Hartman commit 0ede76fcec5415ef82a423a95120286895822e2d Author: Alan Stern Date: Fri Mar 5 15:10:17 2010 -0500 USB: remove uses of URB_NO_SETUP_DMA_MAP This patch (as1350) removes all usages of coherent buffers for USB control-request setup-packet buffers. There's no good reason to reserve coherent memory for these things; control requests are hardly ever used in large quantity (the major exception is firmware transfers, and they aren't time-critical). Furthermore, only seven drivers used it. We might as well always use streaming DMA mappings for setup-packet buffers, and remove some extra complexity from usbcore. The DMA-mapping portion of hcd.c is currently in flux. A separate patch will be submitted to remove support for URB_NO_SETUP_DMA_MAP after everything else settles down. The removal should go smoothly, as by then nobody will be using it. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 749da5f82fe33ff68dd4aa1a5e35cd9aa6246dab Author: Alan Stern Date: Thu Mar 4 17:05:08 2010 -0500 USB: straighten out port feature vs. port status usage This patch (as1349b) clears up the confusion in many USB host controller drivers between port features and port statuses. In mosty cases it's true that the status bit is in the position given by the corresponding feature value, but that's not always true and it's not guaranteed in the USB spec. There's no functional change, just replacing expressions of the form (1 << USB_PORT_FEAT_x) with USB_PORT_STAT_x, which has the same value. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 288ead45fa6637e959015d055304f521cbbc0575 Author: Alan Stern Date: Thu Mar 4 11:32:30 2010 -0500 USB: remove bogus USB_PORT_FEAT_*_SPEED symbols This patch (as1348) removes the bogus USB_PORT_FEAT_{HIGHSPEED,SUPERSPEED} symbols from ch11.h. No such features are defined by the USB spec. (There is a PORT_LOWSPEED feature, but the spec doesn't mention it except to say that host software should never use it.) The speed indicators are port statuses, not port features. As a temporary workaround for the xhci-hcd driver, a fictional USB_PORT_STAT_SUPER_SPEED symbol is added. Signed-off-by: Alan Stern CC: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 45f30e0bdadd4660383250e85b543b0bea05413d Author: Huang Weiyi Date: Thu Mar 4 21:57:51 2010 +0800 USB: remove duplicated #include Remove duplicated #include('s) in drivers/usb/core/hcd.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 0df4d8ef77f7e1251763d429f5ddbf5373961714 Author: Ian Munsie Date: Wed Mar 3 11:00:37 2010 +1100 USB: Remove large struct from the stack in USB storage isd200 driver The compiler throws the following warning when compiling for a PowerPC 64 bit machine: drivers/usb/storage/isd200.c:580: warning: the frame size of 2208 bytes is larger than 2048 bytes There is a struct scsi_device which is placed on the stack and is largely responsible for such wastage. The struct is just a dummy struct filled with NULLs and set as the scsi_cmnd->device to make the usb_stor_Bulk_transport function happy. This patch makes the struct static, so that it is never placed onto the stack and silences the compiler warning. Signed-off-by: Ian Munsie Signed-off-by: Greg Kroah-Hartman commit fa4dc36482a5236c92c589cdbc0a42ff5c945b6b Author: Randy Dunlap Date: Tue Mar 2 14:52:33 2010 -0800 USB: cdc-acm: make bitfields unsigned Fix usb/class sparse warnings: drivers/usb/class/cdc-acm.h:128:34: error: dubious one-bit signed bitfield drivers/usb/class/cdc-acm.h:129:24: error: dubious one-bit signed bitfield Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 41f2c6e89cf4d412e4b20803f5feb2b9b1560476 Author: Alessio Igor Bogani Date: Mon Mar 1 14:10:56 2010 +0100 USB: sisusbvga: Remove the BKL from ioctl Seems to me that BKL is not needed here because necessary locking is already provided by mutex sisusb->lock. Also change the returned value to long. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit d20db4b4e938aa8e4e5735b5a1b202de5800400e Author: Eric Lescouet Date: Sat Apr 24 23:38:17 2010 +0200 USB: split hub.h into ch11.h and merge-in hcd.h Base on inputs from Alan Stern, split the hub.h header into: - new ch11.h header (most of it) containing constants and structures from chapter 11 of the USB 2.0 spec. - a small remaining part being merged into hcd.h. Signed-of-by: Eric Lescouet Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit d65d7e7ef3dc5e61e4dfaac54ec6d3e97f9a1108 Author: Eric Lescouet Date: Sat Apr 24 23:34:27 2010 +0200 USB: make hub.h public (drivers dependency) The usbcore headers: hcd.h and hub.h are shared between usbcore, HCDs and a couple of other drivers (e.g. USBIP modules). So, it makes sense to move them into a more public location and to cleanup dependency of those modules on kernel internal headers. This patch moves hub.h from drivers/usb/core into include/linux/usb/ Signed-of-by: Eric Lescouet Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 27729aadd31dafddaaf64c24f8ef6d0ff750f3aa Author: Eric Lescouet Date: Sat Apr 24 23:21:52 2010 +0200 USB: make hcd.h public (drivers dependency) The usbcore headers: hcd.h and hub.h are shared between usbcore, HCDs and a couple of other drivers (e.g. USBIP modules). So, it makes sense to move them into a more public location and to cleanup dependency of those modules on kernel internal headers. This patch moves hcd.h from drivers/usb/core into include/linux/usb/ Signed-of-by: Eric Lescouet Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 44ebd037c54f80db3121ac9f5fe6e677b76e11d5 Author: Sarah Sharp Date: Tue May 18 16:05:26 2010 -0700 USB: xhci: Fix check for room on the ring. The length of the scatter gather list a driver can enqueue is limited by the bus' sg_tablesize to 62 entries. Each entry will be described by at least one transfer request block (TRB). If the entry's buffer crosses a 64KB boundary, then that entry will have to be described by two or more TRBs. So even if the USB device driver respects sg_tablesize, the whole scatter list may take more than 62 TRBs to describe, and won't fit on the ring. Don't assume that an empty ring means there is enough room on the transfer ring. The old code would unconditionally queue this too-large transfer, and over write the beginning of the transfer. This would mean the cycle bit was unchanged in those overwritten transfers, causing the hardware to think it didn't own the TRBs, and the host would seem to hang. Now drivers may see submit_urb() fail with -ENOMEM if the transfers are too big to fit on the ring. Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit bc88d2eba5e19d10dd546e428314909d889b3b6a Author: Sarah Sharp Date: Tue May 18 16:05:21 2010 -0700 USB: xhci: Limit bus sg_tablesize to 62 TRBs. When a scatter-gather list is enqueued to the xHCI driver, it translates each entry into a transfer request block (TRB). Only 63 TRBs can be used per ring segment, and there must be one additional TRB reserved to make sure the hardware does not think the ring is empty (so the enqueue pointer doesn't equal the dequeue pointer). Limit the bus sg_tablesize to 62 TRBs. Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1624ae1c19e227096ba85bfc389d9b99cb6f7dde Author: Sarah Sharp Date: Thu May 6 13:40:08 2010 -0700 USB: xhci: Fix issue with set interface after stall. When the USB core installs a new interface, it unconditionally clears the halts on all the endpoints on the new interface. Usually the xHCI host needs to know when an endpoint is reset, so it can change its internal endpoint state. In this case, it doesn't care, because the endpoints were never halted in the first place. To avoid issuing a redundant Reset Endpoint command, the xHCI driver looks at xhci_virt_ep->stopped_td to determine if the endpoint was actually halted. However, the functions that handle the stall never set that variable to NULL after it dealt with the stall. So if an endpoint stalled and a Reset Endpoint command completed, and then the class driver tried to install a new alternate setting, the xHCI driver would access the old xhci_virt_ep->stopped_td pointer. A similar problem occurs if the endpoint has been stopped to cancel a transfer. Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit a0fe3cc5d36a5f5b4f60abfe1a4b1caf4a5cce5a Merge: 04afb40 a62f0d2 Author: Linus Torvalds Date: Thu May 20 10:33:06 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits) Input: psmouse - small formatting changes to better follow coding style Input: synaptics - set dimensions as reported by firmware Input: elantech - relax signature checks Input: elantech - enforce common prefix on messages Input: wistron_btns - switch to using kmemdup() Input: usbtouchscreen - switch to using kmemdup() Input: do not force selecting i8042 on Moorestown Input: Documentation/sysrq.txt - update KEY_SYSRQ info Input: 88pm860x_onkey - remove invalid irq number assignment Input: i8042 - add a PNP entry to the aux device list Input: i8042 - add some extra PNP keyboard types Input: wm9712 - fix wm97xx_set_gpio() logic Input: add keypad driver for keys interfaced to TCA6416 Input: remove obsolete {corgi,spitz,tosa}kbd.c Input: kbtab - do not advertise unsupported events Input: kbtab - simplify kbtab_disconnect() Input: kbtab - fix incorrect size parameter in usb_buffer_free Input: acecad - don't advertise mouse events Input: acecad - fix some formatting issues Input: acecad - simplify usb_acecad_disconnect() ... Trivial conflict in Documentation/feature-removal-schedule.txt commit 04afb40593f9a3007e5ea817d009529ef10fb685 Merge: 7f06a8b cce4f63 Author: Linus Torvalds Date: Thu May 20 09:45:38 2010 -0700 Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits) ACPI: fix early DSDT dmi check warnings on ia64 ACPICA: Update version to 20100428. ACPICA: Update/clarify some parameter names associated with acpi_handle ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep ACPICA: Prevent possible allocation overrun during object copy ACPICA: Split large file, evgpeblk ACPICA: Add GPE support for dynamically loaded ACPI tables ACPICA: Clarify/rename some root table descriptor fields ACPICA: Update version to 20100331. ACPICA: Minimize the differences between linux GPE code and ACPICA code base ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT ACPICA: Update DSDT copy/detection. ACPICA: Add subsystem option to force copy of DSDT to local memory ACPICA: Add detection of corrupted/replaced DSDT ACPICA: Add write support for DataTable operation regions ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy ACPICA: Update comments/headers, no functional change ACPICA: Update version to 20100304 ACPICA: Fix for possible fault in acpi_ex_release_mutex ACPICA: Standardize integer output for ACPICA warnings/errors ... commit 7f06a8b26aba1dc03b42272dc0089a800372c575 Merge: c3ad33c d71f4ce Author: Linus Torvalds Date: Thu May 20 09:41:44 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits) ALSA: hda: Storage class should be before const qualifier ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT ASoC: sdp4430 - add sdp4430 pcm ops to DAI. ASoC: TWL6040: Enable earphone path in codec ASoC: SDP4430: Add support for Earphone speaker ASoC: SDP4430: Add sdp4430 machine driver ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function ALSA: sound/pci/asihpi: Use kzalloc ALSA: hdmi - dont fail on extra nodes ALSA: intelhdmi - add id for the CougarPoint chipset ALSA: intelhdmi - user friendly codec name ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS ALSA: asihpi: incorrect range check ALSA: asihpi: testing the wrong variable ALSA: es1688: add pedantic range checks ARM: McBSP: Add support for omap4 in McBSP driver ARM: McBSP: Fix request for irq in OMAP4 OMAP: McBSP: Add 32-bit mode support ... commit c3ad33c9bcb6616999953af76f16318120fe3691 Merge: fb091be b5c80bc Author: Linus Torvalds Date: Thu May 20 09:41:17 2010 -0700 Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux: (21 commits) i2c-highlander: remover superflous variable i2c-ibm-iic: drop NO_IRQ i2c-cpm: drop NO_IRQ i2c-mpc: drop NO_IRQ MAINTAINERS: add i2c tree for embedded platforms i2c-pxa: only define 'blue_murder'-function if DEBUG is #defined i2c-pxa: remove unused macro i2c-nomadik: fix operator precedence warning i2c-nomadik: release region when removed OMAP3: I2C: Clean up Errata 1p153 handling OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt omap: i2c: add a timeout to the busy waiting omap: i2c: make errata 1.153 workaround a separate function i2c-omap: add mpu wake up latency constraint in i2c omap: i2c: Add i2c support on omap4 platform i2c-bfin-twi: return completion in interrupt for smbus quick transfers i2c-bfin-twi: remove redundant retry i2c-bfin-twi: fix lost interrupts at high speeds i2c-bfin-twi: add debug output for error status i2c-bfin-twi: integrate timeout timer with completion interface ... commit fb091be08d1acf184e8801dfdcace6e0cb19b1fe Merge: bd7fc2f e8d0416 Author: Linus Torvalds Date: Thu May 20 09:37:45 2010 -0700 Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits) V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers V4L/DVB: vivi and mem2mem_testdev need slab.h to build V4L/DVB: tm6000: bugfix image position V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET V4L/DVB: tm6000: README - add vbi V4L/DVB: Fix unlock logic at medusa_video_init V4L/DVB: fix dvb frontend lockup V4L/DVB: s2255drv: remove dead code V4L/DVB: s2255drv: return if vdev not found V4L/DVB: ov511: cleanup: remove unneeded null check V4L/DVB: media/mem2mem: dereferencing free memory V4L/DVB: media/IR: Add missing include file to rc-map.c V4L/DVB: dvb/stv6110x: cleanup error handling V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig V4L/DVB: ngene: start separating out DVB functions into separate file V4L/DVB: ngene: split out card specific code into a separate file V4L/DVB: ngene: split out i2c code into a separate file V4L/DVB: ngene: add initial support for digital side of Avermedia m780 V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input V4L-DVB: ngene: make sure that tuner headers are included ... commit bd7fc2f2d807fdb254f7efc542f8eec3f23e289e Merge: f39d01b 360ff78 Author: Linus Torvalds Date: Thu May 20 09:27:37 2010 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (49 commits) libata-sff: separate out BMDMA qc_issue libata-sff: prd is BMDMA specific libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific libata-sff: separate out BMDMA EH libata-sff: port_task is SFF specific libata-sff: ap->[last_]ctl are SFF specific libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo() libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init() libata-sff: clean up BMDMA initialization libata-sff: clean up inheritance in several drivers libata-sff: reorder SFF/BMDMA functions sata_inic162x: kill PORT_PRD_ADDR initialization libata: kill ATA_FLAG_DISABLED libata-sff: kill unused prototype and make ata_dev_select() static libata-sff: update bmdma host bus error handling sata_mv: remove unnecessary initialization sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF pata_sch: use ata_pci_sff_init_one() pata_sil680: Do our own exec_command posting libata: Remove excess delay in the tf_load path ... commit f39d01be4c59a61a08d0cb53f615e7016b85d339 Merge: 5429126 7db8243 Author: Linus Torvalds Date: Thu May 20 09:20:59 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ... commit 54291263519ac2c9bdda68b23b02fef3808deed4 Merge: 46ee964 acd200b Author: Linus Torvalds Date: Thu May 20 09:09:46 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits) pcmcia: disable PCMCIA ioctl also for ARM drivers/staging/comedi: dev_node removal (quatech_daqp_cs) drivers/staging/comedi: dev_node removal (ni_mio_cs) drivers/staging/comedi: dev_node removal (ni_labpc_cs) drivers/staging/comedi: dev_node removal (ni_daq_dio24) drivers/staging/comedi: dev_node removal (ni_daq_700) drivers/staging/comedi: dev_node removal (das08_cs) drivers/staging/comedi: dev_node removal (cb_das16_cs) pata_pcmcia: get rid of extra indirection pcmcia: remove suspend-related comment from yenta_socket.c pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held pcmcia: remove pcmcia_add_device_lock pcmcia: update gfp/slab.h includes pcmcia: remove unused mem_op.h pcmcia: do not autoadd root PCI bus resources pcmcia: clarify alloc_io_space, move it to resource handlers pcmcia: move all pcmcia_resource_ops providers into one module pcmcia: move high level CIS access code to separate file pcmcia: dev_node removal (core) pcmcia: dev_node removal (remaining drivers) ... commit 46ee9645094ad1eb5b4888882ecaa1fb87dcd2a3 Merge: fa5312d 25f3a5a Author: Linus Torvalds Date: Thu May 20 09:03:55 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM: PM QOS update fix Freezer / cgroup freezer: Update stale locking comments PM / platform_bus: Allow runtime PM by default i2c: Fix bus-level power management callbacks PM QOS update PM / Hibernate: Fix block_io.c printk warning PM / Hibernate: Group swap ops PM / Hibernate: Move the first_sector out of swsusp_write PM / Hibernate: Separate block_io PM / Hibernate: Snapshot cleanup FS / libfs: Implement simple_write_to_buffer PM / Hibernate: document open(/dev/snapshot) side effects PM / Runtime: Add sysfs debug files PM: Improve device power management document PM: Update device power management document PM: Allow runtime_suspend methods to call pm_schedule_suspend() PM: pm_wakeup - switch to using bool commit fa5312d9e87e7222c6c384c4e930dc149bc1178d Merge: 9c688c1 4d707b9 Author: Linus Torvalds Date: Thu May 20 09:03:02 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: change cancel_work_sync() to clear work->data workqueue: warn about flush_scheduled_work() commit 9c688c114c4665ac8c6da05b2f6b987f4adc6dae Merge: 9d35bc1 308eb7a Author: Linus Torvalds Date: Thu May 20 09:02:49 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: ia64: add sparse annotation to __ia64_per_cpu_var() percpu: implement kernel memory based chunk allocation percpu: move vmalloc based chunk management into percpu-vm.c percpu: misc preparations for nommu support percpu: reorganize chunk creation and destruction percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys() commit 9d35bc1ec696ebfc5662a0d00b4d36564ff3af53 Merge: 96b5b7f ffebedb Author: Linus Torvalds Date: Thu May 20 09:00:34 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Use kmemdup() instead of kmalloc()+memcpy() IB/iser: Fix error flow in iser_create_ib_conn_res() IB/iser: Enhance disconnection logic for multi-pathing IB/iser: Remove buggy back-pointer setting IB/iser: Add asynchronous event handler MAINTAINERS: Add cxgb4 and iw_cxgb4 entries RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays IPoIB: Allow disabling/enabling TSO on the fly through ethtool IB/mlx4: Add support for masked atomic operations IB/core: Add support for masked atomic operations RDMA/cma: Randomize local port allocation RDMA/nes: Make unnecessarily global functions static RDMA/nes: Make nesadapter->phy_lock usage consistent RDMA/cxgb4: Add driver for Chelsio T4 RNIC IB/mthca: Use the dma state API instead of pci equivalents RDMA/amso1100: Use the dma state API instead of pci equivalents RDMA/cxgb3: Don't free skbs on NET_XMIT_* indications from LLD RDMA/cxgb3: Use the dma state API instead of pci equivalents IB: Explicitly rule out llseek to avoid BKL in default_llseek() commit 96b5b7f4f2d59b37c1fc2fba1ae25999accd6dcd Merge: f72caf7 539c99f Author: Linus Torvalds Date: Thu May 20 08:55:50 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (61 commits) KEYS: Return more accurate error codes LSM: Add __init to fixup function. TOMOYO: Add pathname grouping support. ima: remove ACPI dependency TPM: ACPI/PNP dependency removal security/selinux/ss: Use kstrdup TOMOYO: Use stack memory for pending entry. Revert "ima: remove ACPI dependency" Revert "TPM: ACPI/PNP dependency removal" KEYS: Do preallocation for __key_link() TOMOYO: Use mutex_lock_interruptible. KEYS: Better handling of errors from construct_alloc_key() KEYS: keyring_serialise_link_sem is only needed for keyring->keyring links TOMOYO: Use GFP_NOFS rather than GFP_KERNEL. ima: remove ACPI dependency TPM: ACPI/PNP dependency removal selinux: generalize disabling of execmem for plt-in-heap archs LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE CRED: Holding a spinlock does not imply the holding of RCU read lock SMACK: Don't #include Ext2 headers ... commit d71f4cece4bd97d05592836202fc04ff2e7817e3 Merge: 19008bd ad8332c Author: Takashi Iwai Date: Thu May 20 12:00:43 2010 +0200 Merge branch 'topic/asoc' into for-linus Conflicts: sound/soc/codecs/ad1938.c commit 19008bdacb9f7841166ebafe0aef361ee582ffbf Merge: 9ce3db4 fbc2566 Author: Takashi Iwai Date: Thu May 20 11:59:52 2010 +0200 Merge branch 'topic/hda' into for-linus commit 9ce3db4e7949a394bad0de91883b5e786c17607a Merge: 20406f9 e213e9c Author: Takashi Iwai Date: Thu May 20 11:59:43 2010 +0200 Merge branch 'topic/usb' into for-linus commit 20406f9b67e6fde4fff4639225c7a0e5ea6eaa9b Merge: 5e8aa85 ebb812c Author: Takashi Iwai Date: Thu May 20 11:59:37 2010 +0200 Merge branch 'topic/jack' into for-linus commit 5e8aa85253513b9c1ade8bd71dc341218a752a65 Merge: 7bd9db8 550a8b6 Author: Takashi Iwai Date: Thu May 20 11:59:29 2010 +0200 Merge branch 'topic/misc' into for-linus commit 7bd9db83087aecef8279c0b8b9dfef4db4a8fc3c Merge: 3374cd1 55c63bd Author: Takashi Iwai Date: Thu May 20 11:59:09 2010 +0200 Merge branch 'topic/nomm' into for-linus commit 3374cd1abd478f767aaedf2c21d109596ff0fe72 Merge: e40152e 670ff6a Author: Takashi Iwai Date: Thu May 20 11:58:57 2010 +0200 Merge branch 'topic/core-cleanup' into for-linus commit fbc256692eac29e04cf87e45736d7ff149180a52 Author: Tobias Klauser Date: Thu May 20 10:40:55 2010 +0200 ALSA: hda: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Takashi Iwai commit ad8332c1302bcb4f80d593fd3eb477be9d7f5604 Author: Jarkko Nikula Date: Wed May 19 10:52:28 2010 +0300 ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies These pins are for decoupling capacitors for the internal charge pumps in TPA6130A2 and TPA6140A2 and not for connecting external supply. Thanks to Eduardo Valentin for pointing out the issue with TPA6130A2 and Ilkka Koskinen with TPA6140A2. Signed-off-by: Jarkko Nikula Acked-by: Peter Ujfalusi Reviewed-by: Ilkka Koskinen Signed-off-by: Liam Girdwood commit cce4f632db200aef147c59084437168174b23f11 Author: Lin Ming Date: Wed May 12 09:26:48 2010 +0800 ACPI: fix early DSDT dmi check warnings on ia64 WARNING: at drivers/firmware/dmi_scan.c:423 dmi_matches+0x70/0x160() dmi check: not initialized yet. This is caused by commit aa2110c (ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT). DMI is not initialized yet in acpi_early_init on ia64. The DSDT DMI check table is x86 specific, so make it empty on other archs. And this fixes the warnings on ia64. Reported-and-tested-by: Tony Luck Signed-off-by: Lin Ming Signed-off-by: Len Brown commit f72caf7e496465182eeda842ac66a5e75404ddf1 Merge: 6a6be47 e4e83ea Author: Linus Torvalds Date: Wed May 19 17:24:54 2010 -0700 Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux * 'for-2.6.35' of git://linux-nfs.org/~bfields/linux: (45 commits) Revert "nfsd4: distinguish expired from stale stateids" nfsd: safer initialization order in find_file() nfs4: minor callback code simplification, comment NFSD: don't report compiled-out versions as present nfsd4: implement reclaim_complete nfsd4: nfsd4_destroy_session must set callback client under the state lock nfsd4: keep a reference count on client while in use nfsd4: mark_client_expired nfsd4: introduce nfs4_client.cl_refcount nfsd4: refactor expire_client nfsd4: extend the client_lock to cover cl_lru nfsd4: use list_move in move_to_confirmed nfsd4: fold release_session into expire_client nfsd4: rename sessionid_lock to client_lock nfsd4: fix bare destroy_session null dereference nfsd4: use local variable in nfs4svc_encode_compoundres nfsd: further comment typos sunrpc: centralise most calls to svc_xprt_received nfsd4: fix unlikely race in session replay case nfsd4: fix filehandle comment ... commit 6a6be470c3071559970c5659354484d4f664050e Merge: 98c89cd 126e216 Author: Linus Torvalds Date: Wed May 19 17:24:05 2010 -0700 Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (78 commits) SUNRPC: Don't spam gssd with upcall requests when the kerberos key expired SUNRPC: Reorder the struct rpc_task fields SUNRPC: Remove the 'tk_magic' debugging field SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst NFS: Don't call iput() in nfs_access_cache_shrinker NFS: Clean up nfs_access_zap_cache() NFS: Don't run nfs_access_cache_shrinker() when the mask is GFP_NOFS SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter SUNRPC: Ensure memory shrinker doesn't waste time in rpcauth_prune_expired() SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS NFS: Read requests can use GFP_KERNEL. NFS: Clean up nfs_create_request() NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls NFSv4: Don't use GFP_KERNEL allocations in state recovery SUNRPC: Fix xs_setup_bc_tcp() SUNRPC: Replace jiffies-based metrics with ktime-based metrics ktime: introduce ktime_to_ms() SUNRPC: RPC metrics and RTT estimator should use same RTT value NFS: Calldata for nfs4_renew_done() NFS: Squelch compiler warning in nfs_add_server_stats() ... commit 98c89cdd3a292af3451e47a2a33132f5183861b0 Merge: 164d44f 99df95a Author: Linus Torvalds Date: Wed May 19 17:23:28 2010 -0700 Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: sunrpc: Include missing smp_lock.h procfs: Kill the bkl in ioctl procfs: Push down the bkl from ioctl procfs: Use generic_file_llseek in /proc/vmcore procfs: Use generic_file_llseek in /proc/kmsg procfs: Use generic_file_llseek in /proc/kcore procfs: Kill BKL in llseek on proc base commit 164d44fd92e79d5bce54d0d62df9f856f7b23925 Merge: 5bfec46 d7e81c2 Author: Linus Torvalds Date: Wed May 19 17:11:10 2010 -0700 Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clocksource: Add clocksource_register_hz/khz interface posix-cpu-timers: Optimize run_posix_cpu_timers() time: Remove xtime_cache mqueue: Convert message queue timeout to use hrtimers hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIME timers: Introduce the concept of timer slack for legacy timers ntp: Remove tickadj ntp: Make time_adjust static time: Add xtime, wall_to_monotonic to feature-removal-schedule timer: Try to survive timer callback preempt_count leak timer: Split out timer function call timer: Print function name for timer callbacks modifying preemption count time: Clean up warp_clock() cpu-timers: Avoid iterating over all threads in fastpath_timer_check() cpu-timers: Change SIGEV_NONE timer implementation cpu-timers: Return correct previous timer reload value cpu-timers: Cleanup arm_timer() cpu-timers: Simplify RLIMIT_CPU handling commit 5bfec46baa3a752393433b8d89d3b2c70820f61d Merge: 6fa0fdd fdb19a6 Author: Linus Torvalds Date: Wed May 19 17:10:57 2010 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: cs5535-clockevt: Free timer in IRQ setup error path commit 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1 Merge: 7d02093 fec84e3 Author: Linus Torvalds Date: Wed May 19 17:10:24 2010 -0700 Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk x86, hpet: Restrict read back to affected ATI chipsets commit 7d02093e29de9efc4a72d5e93baae9506969b789 Merge: 6e0b7b2 e9ddbc0 Author: Linus Torvalds Date: Wed May 19 17:10:06 2010 -0700 Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: avr32: Fix typo in read_persistent_clock() sparc: Convert sparc to use read/update_persistent_clock cris: Convert cris to use read/update_persistent_clock m68k: Convert m68k to use read/update_persistent_clock m32r: Convert m32r to use read/update_peristent_clock blackfin: Convert blackfin to use read/update_persistent_clock ia64: Convert ia64 to use read/update_persistent_clock avr32: Convert avr32 to use read/update_persistent_clock h8300: Convert h8300 to use read/update_persistent_clock frv: Convert frv to use read/update_persistent_clock mn10300: Convert mn10300 to use read/update_persistent_clock alpha: Convert alpha to use read/update_persistent_clock xtensa: Fix unnecessary setting of xtime time: Clean up direct xtime usage in xen commit 6e0b7b2c39b91b467270dd0bc383914f99e1fb28 Merge: e4e47eb 4308ad8 Author: Linus Torvalds Date: Wed May 19 17:09:40 2010 -0700 Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: genirq: Clear CPU mask in affinity_hint when none is provided genirq: Add CPU mask affinity hint genirq: Remove IRQF_DISABLED from core code genirq: Run irq handlers with interrupts disabled genirq: Introduce request_any_context_irq() genirq: Expose irq_desc->node in proc/irq Fixed up trivial conflicts in Documentation/feature-removal-schedule.txt commit b5c80bc5d70a1ce5b071ed06dd95292b9de46f95 Author: Wolfram Sang Date: Tue Feb 2 13:03:31 2010 +0100 i2c-highlander: remover superflous variable When cppcheck found this flaw [./i2c/busses/i2c-highlander.c:284]: (style) Warning - using char variable in bit operation it was noted that the 'read'-variable could be simply removed as read_write can only be 0 or 1 anyhow. So, we remove the flaw and simplify the code. Reported-by: d binderman Signed-off-by: Wolfram Sang Acked-by: Paul Mundt Acked-by: Jean Delvare Cc: Ben Dooks commit f0ec9e20bab214f4a26e6fdaaf5c2a6b2f2640d7 Author: Wolfram Sang Date: Sun Oct 4 13:08:16 2009 +0200 i2c-ibm-iic: drop NO_IRQ Drop NO_IRQ as 0 is the preferred way to describe 'no irq' (http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is only used on powerpc, where NO_IRQ is 0 anyhow. Signed-off-by: Wolfram Sang Acked-by: Grant Likely Acked-by: Sean MacLennan Cc: Ben Dooks commit b865a4e7ab3c6c8099fbe83ddf94c982d1d850ea Author: Wolfram Sang Date: Sun Oct 4 13:08:16 2009 +0200 i2c-cpm: drop NO_IRQ Drop NO_IRQ as 0 is the preferred way to describe 'no irq' (http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is only used on powerpc, where NO_IRQ is 0 anyhow. Signed-off-by: Wolfram Sang Acked-by: Grant Likely Acked-by: Jochen Friedrich Cc: Ben Dooks commit bf727e016f2a25d9f054317b2807e638706f1db6 Author: Wolfram Sang Date: Sun Oct 4 13:08:16 2009 +0200 i2c-mpc: drop NO_IRQ Drop NO_IRQ as 0 is the preferred way to describe 'no irq' (http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is only used on powerpc, where NO_IRQ is 0 anyhow. Signed-off-by: Wolfram Sang Acked-by: Grant Likely Cc: Ben Dooks commit 0e53300818b08591516e5e528b33d70b83158d04 Author: Uwe Kleine-König Date: Mon Jan 25 10:20:34 2010 +0100 MAINTAINERS: add i2c tree for embedded platforms Signed-off-by: Uwe Kleine-König Acked-by: Jean Delvare Signed-off-by: Wolfram Sang commit 0d813d9960444470c4bebb73c2bde6697543fee9 Author: Wolfram Sang Date: Tue Nov 3 12:53:41 2009 +0100 i2c-pxa: only define 'blue_murder'-function if DEBUG is #defined This talkative function is also called on timeouts. As timeouts can happen on regular writes to EEPROMs (no error case), this creates false positives. Giving lots of details is interesting only for developers anyhow, so just use the function if DEBUG is #defined. Signed-off-by: Wolfram Sang Signed-off-by: Uwe Kleine-König Cc: Russell King Acked-by: Eric Miao Cc: Roel Kluin Cc: Pavel Machek commit 29412e69007c17d6866a50d0b65fb0d808824370 Author: Uwe Kleine-König Date: Tue Nov 3 12:43:23 2009 +0100 i2c-pxa: remove unused macro Commit beea494 ([ARM] Remove EEPROM slave emulation from i2c-pxa driver.) removed all uses of eedbg, so the definition can go, too. Signed-off-by: Uwe Kleine-König Acked-by: Russell King Cc: Eric Miao Cc: Roel Kluin Acked-by: Pavel Machek Signed-off-by: Wolfram Sang commit 1df3ab1b9128855400d657a515b87894f29f31f3 Author: Rabin Vincent Date: Tue Apr 27 10:31:08 2010 +0530 i2c-nomadik: fix operator precedence warning Fix this warning: i2c-nomadik.c:707: warning: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Ben Dooks commit a1c27678c0e92ed4aa3ac489ef2f0d80651e18bb Author: Rabin Vincent Date: Tue Apr 27 10:31:07 2010 +0530 i2c-nomadik: release region when removed So that the module can be loaded again after an unload. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Ben Dooks commit 8a9d97d3a126fd33894e137f84ab47ec406df24f Author: manjugk manjugk Date: Tue May 11 11:35:23 2010 -0700 OMAP3: I2C: Clean up Errata 1p153 handling Clean up existing Errata 1p153 handling to use generic errata handling mechanism through dev flag. Signed-off-by: Manjunatha GK Cc: Nishanth Menon Cc: Alexander Shishkin Signed-off-by: Tony Lindgren Signed-off-by: Ben Dooks commit f3083d921d8964b66502a0456f62a9d29cd029ef Author: manjugk manjugk Date: Tue May 11 11:35:20 2010 -0700 OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt Under certain rare conditions, I2C_STAT[13].RDR bit may be set and the corresponding interrupt fire, even there is no data in the receive FIFO, or the I2C data transfer is still ongoing. These spurious RDR events must be ignored by the software. This patch handles and ignores RDR spurious interrupts. The below sequence is required in interrupt handler for handling this errata: 1. If RDR is set to 1, clear RDR 2. Read I2C status register and check for BusBusy bit. If BusBusy bit is set, skip remaining steps. 3. If BusBusy bit is not set, perform read operation on I2C status register. 4. If RDR is set, clear the same. Check RDR again and clear if it sets RDR bit again. 5. Perform I2C Data Read operation N number of times(where N is value read from the register BUFSTAT-RXSTAT bit fields). Note: This errata is not applicable for omap2420 and omap4. It is applicable for: 1. omap2430 2. omap34xx(including omap3630). Signed-off-by: Manjunatha GK Cc: Hema Kalliguddi Cc: Nishanth Menon Cc: Aaro Koskinen Signed-off-by: Tony Lindgren Signed-off-by: Ben Dooks commit e9f59b9c9bc5730152b6a94c47dd90b730a07e35 Author: Alexander Shishkin Date: Tue May 11 11:35:17 2010 -0700 omap: i2c: add a timeout to the busy waiting The errata 1.153 workaround is busy waiting on XUDF bit in interrupt context, which may lead to kernel hangs. The problem can be reproduced by running the bus with wrong (too high) speed. Signed-off-by: Alexander Shishkin Signed-off-by: Tony Lindgren Signed-off-by: Ben Dooks commit 2dd151ab2792cd27a2268a6e4f3248193beed504 Author: Alexander Shishkin Date: Tue May 11 11:35:14 2010 -0700 omap: i2c: make errata 1.153 workaround a separate function This is to avoid insanely long lines and levels of indentation. Signed-off-by: Alexander Shishkin Cc: Nishant Menon Signed-off-by: Tony Lindgren Signed-off-by: Ben Dooks commit 20c9d2c4ab8243a1c311248232954b2c1da3ba75 Author: Kalle Jokiniemi Date: Tue May 11 11:35:08 2010 -0700 i2c-omap: add mpu wake up latency constraint in i2c While waiting for completion of the i2c transfer, the MPU could hit OFF mode and cause several msecs of delay that made i2c transfers fail more often. The extra delays and subsequent re-trys cause i2c clocks to be active more often. This has also an negative effect on power consumption. Created a mechanism for passing and using the constraint setting function in driver code. The used mpu wake up latency constraints are now set individually per bus, and they are calculated based on clock rate and fifo size. Thanks to Jarkko Nikula, Moiz Sonasath, Paul Walmsley, and Nishanth Menon for tuning out the details of this patch. Updates by Kevin as requested by Tony: - Remove omap_set_i2c_constraint_func() in favor of conditionally adding the flag in omap_i2c_add_bus() in order to keep all the OMAP conditional checking in a single location. - Update set_mpu_wkup_lat prototypes to match OMAP PM layer so OMAP PM function can be used directly in pdata. Cc: Moiz Sonasath Cc: Jarkko Nikula Cc: Paul Walmsley Cc: Nishanth Menon Signed-off-by: Kalle Jokiniemi Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren Signed-off-by: Ben Dooks commit f38e66e0077659e5d2ca3858fdb26fc9b1765b9f Author: Santosh Shilimkar Date: Tue May 11 11:35:04 2010 -0700 omap: i2c: Add i2c support on omap4 platform This patch is rebased version of earlier post to add I2C driver support to OMAP4 platform. On OMAP4, all I2C register address offsets are changed from OMAP1/2/3 I2C. In order to not have #ifdef's at various places in code, as well as to support multi-OMAP build, an array is created to hold the register addresses with it's offset. This patch was submitted, reviewed and acked on mailing list already. For more details refer below link http://www.mail-archive.com/linux-i2c@vger.kernel.org/msg02281.html This updated verion has a depedancy on "Add support for 16-bit registers" posted on linux-omap. Below is the patch-works link for the same http://patchwork.kernel.org/patch/72295/ Signed-off-by: Syed Rafiuddin Signed-off-by: Santosh Shilimkar Acked-by: Kevin Hilman Reviewed-by: Paul Walmsley Cc: Cory Maccarrone Signed-off-by: Tony Lindgren Signed-off-by: Ben Dooks commit f0ac131a21ed13e8baaa9df6f0420f2c4b45e807 Author: Sonic Zhang Date: Mon Mar 22 03:23:20 2010 -0400 i2c-bfin-twi: return completion in interrupt for smbus quick transfers A smbus quick transfer has no data after the address byte. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit be2f80f0a3a333c0c00b2c8a7c2d74fcd66b75a2 Author: Sonic Zhang Date: Mon Mar 22 03:23:19 2010 -0400 i2c-bfin-twi: remove redundant retry Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit 5481d0753e7a78bff7550a8165b7924baa74e9cf Author: Sonic Zhang Date: Mon Mar 22 03:23:18 2010 -0400 i2c-bfin-twi: fix lost interrupts at high speeds i2c event of next read/write byte may trigger before current int state is cleared in the interrupt handler. So, this should be done at the beginning of interrupt handler to avoid losing new i2c events. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit 5cfafc18f38aa6701f581bee875fb0b19f3b3b4b Author: Michael Hennerich Date: Mon Mar 22 03:23:17 2010 -0400 i2c-bfin-twi: add debug output for error status Add some debug() code to decode the error register. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit dd7319a5289deb4e17beb8851d343e7930b32c3b Author: Sonic Zhang Date: Mon Mar 22 03:23:16 2010 -0400 i2c-bfin-twi: integrate timeout timer with completion interface There isn't much point in managing our own custom timeout timer when the completion interface already includes support for it. This makes the resulting code much simpler and robust. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit 1bc2962e530527de829bf4b1eb99f24dc25d1828 Author: Mark Brown Date: Fri Apr 2 14:15:09 2010 +0100 i2c-s3c2410: Remove unconditional 1ms delay on each transfer The S3C I2C controller indicates completion of I2C transfers before the bus has a stop condition on it. In order to ensure that we do not attempt to start a new transfer before the bus is idle the driver currently inserts a 1ms delay. This is vastly larger than is generally required and has a visible effect on performance under load, such as when bringing up audio CODECs or reading back status information with non-bulk I2C reads. Replace the sleep with a spin on the IIC status register for up to 1ms. This will busy wait but testing on my SMDK6410 system indicates that the overwhelming majority of transactions complete on the first spin, with maximum latencies of less than 10 spins so the absolute overhead of busy waiting should be at worst comprable to msleep(), and the overall system performance is dramatically improved. The main risk is poor interaction with multimaster systems where we may miss the bus going idle before the next transaction. Defend against this by falling back to the original 1ms delay after 20 spins. The overall effect in my testing is an approximately 20% improvement in kernel startup time. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit e4e47eb15b7884963efe7f98231009c5770a2c3d Merge: 711f77f 7b52161 Author: Linus Torvalds Date: Wed May 19 13:35:07 2010 -0700 Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm * 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: (72 commits) msm: 7x30 Kconfig and makefile changes msm: clock support for the MSM7x30 CPU. msm: physical offset for MSM7X30 msm: io: add io support for 7x30 msm: Add extern for 7x30 clock list. msm: dma: add 7x30 security domain abstraction msm: update basic board layout for MSM7x30 msm: add devices-msm7x30.c msm: add msm_iomap-7x30.h for MSM7x30 support msm: irqs: add irqs-7x30.h for MSM7x30 support msm: 8x50 Kconfig changes msm: physical offset for QSD8x50 msm: io: add io support for 8x50 msm: add extern for 8x50 clock list. msm: add devices-qsd8x50.c msm: update basic board layout for QSD8x50 msm: add msm_iomap-8x50.h for QSD8x50 support msm: irqs: add irqs-8x50.h for QSD8x50 support msm: timer: allow MSM_DGT_BASE to be overriden msm: add Qualcomm 7x30 interrupt controller driver. ... commit 711f77f53c5ff6aa61dbe8e5f518e50d6306e89d Merge: 024a6b9 273fca0 Author: Linus Torvalds Date: Wed May 19 13:34:20 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Define ARCH_SLAB_MINALIGN drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos sparc64: Fix stack dumping and tracing when function graph is enabled. sparc64: Show stack backtrace from show_regs() just like other platforms. commit 024a6b95181f2df6090975c8a293499d24bf8b28 Merge: 349e1fb 5e682ef Author: Linus Torvalds Date: Wed May 19 12:08:50 2010 -0700 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits) Revert "rtc: omap: let device wakeup capability be configured from chip init logic" DM365: Added more PINMUX configurations for AEMIF DM365: Make CLKOUTx available DM365: Added PINMUX definitions for GPIO30..32 Davinci: iotable based ioremap() interception Davinci: pinmux - use ioremap() Davinci: aintc/cpintc - use ioremap() Davinci: psc - use ioremap() Davinci: timer - use ioremap() Davinci: jtag_id - use ioremap() Davinci: da8xx: rtc - use ioremap Davinci: gpio - use ioremap() davinci: edma: fix coding style issue related to breaking lines davinci: edma: use BIT() wherever possible davinci: edma: fix coding style issue related to usage of braces davinci: edma: use a more intuitive name for edma_info Davinci: serial - conditional reset via pwremu Davinci: serial - use ioremap() Davinci: serial - remove unnecessary define Davinci: watchdog reset separation across socs ... Fix up trivial conflict in arch/arm/Kconfig due to removal of "select GENERIC_TIME" commit 349e1fba7e63b1067b5915337986060c13d9edd0 Merge: fa9dc26 504d36e Author: Linus Torvalds Date: Wed May 19 11:49:33 2010 -0700 Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux * 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux: (98 commits) Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support Input: s3c24xx_ts - Implement generic GPIO configuration callback ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen ARM: S3C64XX: Add touchscreen platform device definition ARM: SAMSUNG: Move mach/ts.h to plat/ts.h ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100 ARM: S5PC100: gpio.h cleanup ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100 ARM: S5PC100: Use common functions for gpiolib implementation drivers: serial: S5PC100 serial driver cleanup ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories ARM: SAMSUNG: move driver strength gpio configuration helper to common dir ARM: S5PV210: Add GPIOlib support ARM: SAMSUNGy: fix broken timer irq base ARM: SMDK6440: Add audio devices on board ARM: S5P6440: Add audio platform devices ... commit fa9dc265ace9774e62f0e31108e5f47911124bda Author: KOSAKI Motohiro Date: Wed May 19 09:37:41 2010 +0900 cpumask: fix compat getaffinity Commit a45185d2d "cpumask: convert kernel/compat.c" broke libnuma, which abuses sched_getaffinity to find out NR_CPUS in order to parse /sys/devices/system/node/node*/cpumap. On NUMA systems with less than 32 possibly CPUs, the current compat_sys_sched_getaffinity now returns '4' instead of the actual NR_CPUS/8, which makes libnuma bail out when parsing the cpumap. The libnuma call sched_getaffinity(0, bitmap, 4096) at first. It mean the libnuma expect the return value of sched_getaffinity() is either len argument or NR_CPUS. But it doesn't expect to return nr_cpu_ids. Strictly speaking, userland requirement are 1) Glibc assume the return value mean the lengh of initialized of mask argument. E.g. if sched_getaffinity(1024) return 128, glibc make zero fill rest 896 byte. 2) Libnuma assume the return value can be used to guess NR_CPUS in kernel. It assume len-arg Acked-by: Rusty Russell Acked-by: Arnd Bergmann Reported-by: Ken Werner Cc: stable@kernel.org Cc: Andi Kleen Signed-off-by: Linus Torvalds commit cf77e988ddfc7f047ac1ddc72cadb5eee7e09293 Merge: 1d3c6ff 2a2ae24 Author: Linus Torvalds Date: Wed May 19 11:41:52 2010 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Drop duplicated "config IOMMU_HELPER" [IA64] invoke oom-killer from page fault [IA64] use __ratelimit [IA64] Use set_cpus_allowed_ptr [IA64] Use set_cpus_allowed_ptr [IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi [IA64] removing redundant ifdef commit 1d3c6ff44ad4b5f113602e153026a338f0f9b3ff Merge: 7c7cbaf 717e7c2 Author: Linus Torvalds Date: Wed May 19 11:37:22 2010 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (224 commits) ARM: remove 'select GENERIC_TIME' ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO ARM: 6074/1: oprofile: convert from sysdev to platform device ARM: 6073/1: oprofile: remove old files and update KConfig ARM: 6072/1: oprofile: use perf-events framework as backend ARM: 6071/1: perf-events: allow modules to query the number of hardware counters ARM: 6070/1: perf-events: add support for xscale PMUs ARM: 6069/1: perf-events: use numeric ID to identify PMU ARM: 6064/1: pmu: register IRQs at runtime ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA ARM: 6134/1: Handle instruction cache maintenance fault properly ARM: nwfpe: allow debugging output to be configured at runtime ARM: rename mach_cpu_disable() to platform_cpu_disable() ARM: 6132/1: PL330: Add common core driver ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310 ARM: Move memory mapping into mmu.c ARM: Ensure meminfo is sorted prior to sanity_check_meminfo ARM: Remove useless linux/bootmem.h includes ARM: convert /proc/cpu/aligment to seq_file arm: use asm-generic/scatterlist.h ... commit 5e682ef825302f2378726e44257291eaeadbfd50 Author: Kevin Hilman Date: Wed May 19 11:37:20 2010 -0700 Revert "rtc: omap: let device wakeup capability be configured from chip init logic" This reverts commit 9c0a342c45b2d98209ac473ea7a429ddd5c1b473 because it was included without proper signoffs from RTC maintainers. commit 7c7cbaf5b82c418cd3b1dcf718f71d0e6057e639 Merge: ba0234e 4d0956b Author: Linus Torvalds Date: Wed May 19 11:36:03 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (127 commits) sh: update defconfigs. sh: Fix up the NUMA build for recent LMB changes. sh64: provide a stub per_cpu_trap_init() definition. sh: fix up CONFIG_KEXEC=n build. sh: fixup the docbook paths for clock framework shuffling. driver core: Early dev_name() depends on slab_is_available(). sh: simplify WARN usage in SH clock driver sh: Check return value of clk_get on ms7724 sh: Check return value of clk_get on ecovec24 sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c sh: move sh clock.c contents to drivers/sh/clk. sh: move sh asm/clock.h contents to linux/sh_clk.h V2 sh: remove unused clock lookup sh: switch boards to clkdev sh: switch sh4-202 to clkdev sh: switch shx3 to clkdev sh: switch sh7757 to clkdev sh: switch sh7763 to clkdev sh: switch sh7780 to clkdev sh: switch sh7786 to clkdev ... commit ba0234ec35127fe21d373db53cbaf9fe20620cb6 Merge: 537b60d 939e379 Author: Linus Torvalds Date: Wed May 19 11:35:30 2010 -0700 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (24 commits) [S390] drivers/s390/char: Use kmemdup [S390] drivers/s390/char: Use kstrdup [S390] debug: enable exception-trace debug facility [S390] s390_hypfs: Add new attributes [S390] qdio: remove API wrappers [S390] qdio: set correct bit in dsci [S390] qdio: dont convert timestamps to microseconds [S390] qdio: remove memset hack [S390] qdio: prevent starvation on PCI devices [S390] qdio: count number of qdio interrupts [S390] user space fault: report fault before calling do_exit [S390] topology: expose core identifier [S390] dasd: remove uid from devmap [S390] dasd: add dynamic pav toleration [S390] vdso: add missing vdso_install target [S390] vdso: remove redundant check for CONFIG_64BIT [S390] avoid default_llseek in s390 drivers [S390] vmcp: disallow modular build [S390] add breaking event address for user space [S390] virtualization aware cpu measurement ... commit a62f0d27b4196bad5e900d766b285feb7069cd16 Author: Dmitry Torokhov Date: Wed May 19 10:39:17 2010 -0700 Input: psmouse - small formatting changes to better follow coding style Signed-off-by: Dmitry Torokhov commit 360ff7833098e944e5003618b03894251e937802 Author: Tejun Heo Date: Mon May 10 21:41:42 2010 +0200 libata-sff: separate out BMDMA qc_issue Separate out ata_bmdma_qc_issue() from ata_sff_qc_issue() such that ata_sff_qc_issue() only deals with non-BMDMA SFF protocols (PIO and nodata) while ata_bmdma_qc_issue() deals with the BMDMA protocols and uses ata_sff_qc_issue() for non-DMA commands. All the users are updated accordingly. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f60d70113fa04e32aee2dedbf304a48469c9c45c Author: Tejun Heo Date: Mon May 10 21:41:41 2010 +0200 libata-sff: prd is BMDMA specific struct ata_prd and ap->prd are BMDMA specific. Add bmdma_ prefix to them and move them inside CONFIG_ATA_SFF. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f47451c45fe0032ef491aaf3e0623fa0154e156d Author: Tejun Heo Date: Mon May 10 21:41:40 2010 +0200 libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific Both qc_prep functions deal only with BMDMA PRD setup and PIO only SFF drivers don't need them. Rename to ata_bmdma_[dumb_]qc_prep() and relocate. All usages are renamed except for pdc_adma and sata_qstor. Those two drivers are not BMDMA drivers and don't need to call BMDMA qc_prep functions. Calls to ata_sff_qc_prep() in the two drivers are removed. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fe06e5f9b7c61dc567edace3f4909672067f7d7e Author: Tejun Heo Date: Mon May 10 21:41:39 2010 +0200 libata-sff: separate out BMDMA EH Some of error handling logic in ata_sff_error_handler() and all of ata_sff_post_internal_cmd() are for BMDMA. Create ata_bmdma_error_handler() and ata_bmdma_post_internal_cmd() and move BMDMA part into those. While at it, change DMA protocol check to ata_is_dma(), fix post_internal_cmd to call ap->ops->bmdma_stop instead of directly calling ata_bmdma_stop() and open code hardreset selection so that ata_std_error_handler() doesn't have to know about sff hardreset. As these two functions are BMDMA specific, there's no reason to check for bmdma_addr before calling bmdma methods if the protocol of the failed command is DMA. sata_mv and pata_mpc52xx now don't need to set .post_internal_cmd to ATA_OP_NULL and pata_icside and sata_qstor don't need to set it to their bmdma_stop routines. ata_sff_post_internal_cmd() becomes noop and is removed. This fixes p3 described in clean-up-BMDMA-initialization patch. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c429137a67b82788d24682153bb9c96501a9ef34 Author: Tejun Heo Date: Mon May 10 21:41:38 2010 +0200 libata-sff: port_task is SFF specific port_task is tightly bound to the standard SFF PIO HSM implementation. Using it for any other purpose would be error-prone and there's no such user and if some drivers need such feature, it would be much better off using its own. Move it inside CONFIG_ATA_SFF and rename it to sff_pio_task. The only function which is exposed to the core layer is ata_sff_flush_pio_task() which is renamed from ata_port_flush_task() and now also takes care of resetting hsm_task_state to HSM_ST_IDLE, which is possible as it's now specific to PIO HSM. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5fe7454aa9c6ef5fcf506b0f2dfc20f696891f1a Author: Tejun Heo Date: Mon May 10 21:41:37 2010 +0200 libata-sff: ap->[last_]ctl are SFF specific ap->[last_]ctl are specific to SFF controllers. Put them inside CONFIG_ATA_SFF and move initialization into ata_sff_port_init(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8244cd05979ef924787aa70fd80304f1773976a1 Author: Tejun Heo Date: Mon May 10 21:41:36 2010 +0200 libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo() ->drain_fifo() is SFF specific. Rename and relocate it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 270390e1ae1818b111543b8bfffa08095d73c1a5 Author: Tejun Heo Date: Mon May 10 21:41:35 2010 +0200 libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init() In preparation of proper SFF/BMDMA separation, introduce ata_sff_init/exit() and ata_sff_port_init(). These functions currently don't do anything. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c7087652e1890a3feef35b30ee1d4be68e1932cd Author: Tejun Heo Date: Mon May 10 21:41:34 2010 +0200 libata-sff: clean up BMDMA initialization When BMDMA initialization failed or BMDMA was not available for whatever reason, bmdma_addr was left at zero and used as an indication that BMDMA shouldn't be used. This leads to the following problems. p1. For BMDMA drivers which don't use traditional BMDMA register, ata_bmdma_mode_filter() incorrectly inhibits DMA modes. Those drivers either have to inherit from ata_sff_port_ops or clear ->mode_filter explicitly. p2. non-BMDMA drivers call into BMDMA PRD table allocation. It doesn't actually allocate PRD table if bmdma_addr is not initialized but is still confusing. p3. For BMDMA drivers which don't use traditional BMDMA register, some methods might not be invoked as expected (e.g. bmdma_stop from ata_sff_post_internal_cmd()). p4. SFF drivers w/ custom DMA interface implement noop BMDMA ops worrying libata core might call into one of them. These problems are caused by the muddy line between SFF and BMDMA and the assumption that all BMDMA controllers initialize bmdma_addr. This patch fixes p1 and p2 by removing the bmdma_addr assumption and moving prd allocation to BMDMA port start. Later patches will fix the remaining issues. This patch improves BMDMA initialization such that * When BMDMA register initialization fails, falls back to PIO instead of failing. ata_pci_bmdma_init() never fails now. * When ata_pci_bmdma_init() falls back to PIO, it clears ap->mwdma_mask and udma_mask instead of depending on ata_bmdma_mode_filter(). This makes ata_bmdma_mode_filter() unnecessary thus resolving p1. * ata_port_start() which actually is BMDMA specific is moved to ata_bmdma_port_start(). ata_port_start() and ata_sff_port_start() are killed. * ata_sff_port_start32() is moved and renamed to ata_bmdma_port_start32(). Drivers which no longer call into PRD table allocation are... pdc_adma, sata_inic162x, sata_qstor, sata_sx4, pata_cmd640 and all drivers which inherit from ata_sff_port_ops. pata_icside sets ->port_start to ATA_OP_NULL as it doesn't need PRD but is a BMDMA controller and doesn't have custom port_start like other such controllers. Note that with the previous patch which makes all and only BMDMA drivers inherit from ata_bmdma_port_ops, this change doesn't break drivers which need PRD table. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 8930ff254a3a80d4477c3391ade07d6dd2a036c7 Author: Tejun Heo Date: Mon May 10 21:41:33 2010 +0200 libata-sff: clean up inheritance in several drivers 1. pata_cmd640 is PIO only. Inherit from sff. 2. pata_macio is BMDMA. Inherit from bmdma and drop explicit bmdma_mode_filter() setting. 3. In sata_mv, unlike mv5, mv6 is BMDMA. Inherit from bmdma and don't clear ->post_internal_cmd(). 4. bf54x and icside are quasi-BMDMA controllers which don't use the standard BMDMA registers so they don't initialize bmdma_addr and inherit from sff to avoid the default mode_filter which disables DMA modes if bmdma_addr is not initialized. For 2 and 3, this patch makes the drivers explicitly specify ->mode_filter to ATA_OP_NULL while inheriting from ata_bmdma_port_ops. These will be removed by the next patch. This patch makes all and only BMDMA drivers inherit from ata_bmdma_port_ops to ease further SFF/BMDMA separation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 83ba9ea8a04b72dfee2515428c15e7414ba4fc61 Author: Dmitry Torokhov Date: Mon May 10 23:06:52 2010 -0700 Input: synaptics - set dimensions as reported by firmware Newer Synaptics firmware allows to query maximim dimensions reported by device, let's use this data. Tested-by: Takashi Iwai Signed-off-by: Dmitry Torokhov commit a083632eaf6231162b33e40561cfec6a9c156945 Author: Dmitry Torokhov Date: Wed May 19 10:11:13 2010 -0700 Input: elantech - relax signature checks Apparently there are Elantech touchpads that report non-zero in the 2nd byte of their signature. Adjust the detection routine so that if 2nd byte is zero and 3rd byte contains value that is not a valid report rate, we still assume that signature is valid. Tested-by: Eric Piel Signed-off-by: Dmitry Torokhov commit d4ae84a84bedcb79341887ff070e6528d1374663 Author: Dmitry Torokhov Date: Thu May 13 00:41:15 2010 -0700 Input: elantech - enforce common prefix on messages Signed-off-by: Dmitry Torokhov commit f8300ab8c3e0bea42c82bbdcdff7b791b795d58f Author: Julia Lawall Date: Wed May 19 10:11:14 2010 -0700 Input: wistron_btns - switch to using kmemdup() Use kmemdup when some other buffer is immediately copied into the allocated region. Signed-off-by: Julia Lawall Signed-off-by: Dmitry Torokhov commit 641d446f89314d19fe17fcb9f19659a09fabe418 Author: Julia Lawall Date: Wed May 19 10:11:14 2010 -0700 Input: usbtouchscreen - switch to using kmemdup() Use kmemdup when some other buffer is immediately copied into the allocated region. Signed-off-by: Julia Lawall Signed-off-by: Dmitry Torokhov commit 685afae02557a178185a4be36f58332976e79f63 Author: Jacob Pan Date: Wed May 19 10:11:14 2010 -0700 Input: do not force selecting i8042 on Moorestown Moorestown does not have i8042 based keyboard controller, so give an option to deselect i8042 for non-pc mid. Signed-off-by: Jacob Pan Signed-off-by: Dmitry Torokhov commit a2056ffd4ae9e578ff9abb5eb49137020af71fd4 Author: Paul Fox Date: Wed May 19 10:11:13 2010 -0700 Input: Documentation/sysrq.txt - update KEY_SYSRQ info While setting up sysrq operation on the XO laptop (which lacks a SysRq key), i realized that the documentation was quite out of date. Change documentation of SysRq to reflect current KEY_SYSRQ value. Signed-off-by: Paul Fox Signed-off-by: Randy Dunlap Signed-off-by: Dmitry Torokhov commit ee6e54e2ae56734a96fd7b66cf46b756d0f25ca3 Author: Haojian Zhuang Date: Wed May 19 10:11:13 2010 -0700 Input: 88pm860x_onkey - remove invalid irq number assignment Irq number of onkey is assigned twice. The second assignment is wrong. Signed-off-by: Haojian Zhuang Signed-off-by: Dmitry Torokhov commit dba06b839a502321ae40b7061d64308bc91d260f Author: Matthew Garrett Date: Wed May 19 10:11:13 2010 -0700 Input: i8042 - add a PNP entry to the aux device list Windows checks for an ALPS PS/2 device in PNP. Add it on the off-chance that there's a machine that expresses this without also providing a compatibility ID. Signed-off-by: Matthew Garrett Signed-off-by: Dmitry Torokhov commit 09fac079d9d21c219df211559528cbe8439af59d Author: Matthew Garrett Date: Wed May 19 10:11:13 2010 -0700 Input: i8042 - add some extra PNP keyboard types Some Japanese machines declare their keyboard with a different PNP ID. Add it to the list of probed device IDs. While we're at it, add all the other IDs that Windows binds to - we'll probably never see them in the real world, but it doesn't hurt. Signed-off-by: Matthew Garrett Signed-off-by: Dmitry Torokhov commit af8b01b03941e6b008d63b42c0433699c3d3d184 Author: Manuel Lauss Date: Wed May 19 10:11:13 2010 -0700 Input: wm9712 - fix wm97xx_set_gpio() logic WM97XX_GPIO_HIGH is not a bitmap and should to be treated as such. Signed-off-by: Dmitry Torokhov commit 8d0bc2b456103a34c11e01305cd1aed1cde579e5 Merge: 30ba3ea e40152e Author: Dmitry Torokhov Date: Wed May 19 10:12:41 2010 -0700 Merge commit 'v2.6.34' into next commit e8d0416796d43a950ec7b65629e53419b2e22453 Author: Mauro Carvalho Chehab Date: Tue May 18 04:27:27 2010 -0300 V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers Fix all device drivers to use the video_drvdata function instead of maintaining a local list of minor to private data mappings. Call video_set_drvdata to register the driver private pointer when not already done. Where applicable, the local list of mappings is completely removed when it becomes unused. [mchehab.redhat.com: patch broke into two. This one changes just tm6000] Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 6b46c3977cdb34a199bbca20ef67b1e13335c43d Author: Randy Dunlap Date: Fri May 7 15:22:26 2010 -0300 V4L/DVB: vivi and mem2mem_testdev need slab.h to build Fix vivi and mem2mem_testdev build errors: need to #include : drivers/media/video/vivi.c:1144: error: implicit declaration of function 'kfree' drivers/media/video/vivi.c:1156: error: implicit declaration of function 'kzalloc' drivers/media/video/vivi.c:1156: warning: assignment makes pointer from integer without a cast drivers/media/video/mem2mem_testdev.c:862: error: implicit declaration of function 'kzalloc' drivers/media/video/mem2mem_testdev.c:862: warning: assignment makes pointer from integer without a cast drivers/media/video/mem2mem_testdev.c:874: error: implicit declaration of function 'kfree' drivers/media/video/mem2mem_testdev.c:944: warning: assignment makes pointer from integer without a cast Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 3c7c5e9e8903f201bdbc85bdffba47a2d1352e4c Author: Stefan Ringel Date: Fri May 7 12:29:04 2010 -0300 V4L/DVB: tm6000: bugfix image position bugfix incorrect image and line position in videobuffer Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 083e472176999de97848e5659cc958516ef81ecb Author: Jarod Wilson Date: Tue May 4 16:17:05 2010 -0300 V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET On Tue, May 04, 2010 at 06:06:41PM +0200, Dan Carpenter wrote: > On Tue, May 04, 2010 at 10:03:18AM -0400, Jarod Wilson wrote: > > @@ -1205,7 +1204,7 @@ static u32 imon_panel_key_lookup(u64 hw_code) > > if (imon_panel_key_table[i].hw_code == (code | 0xffee)) > > break; > > > > - keycode = imon_panel_key_table[i % IMON_KEY_RELEASE_OFFSET].keycode; > > + keycode = imon_panel_key_table[i].keycode; > > > > return keycode; > > } > > There is still potentially a problem here because if we don't hit the > break statement, then we're one past the end of the array. D'oh. Okay, here's v2, should fix that buglet too. This hack was used when the imon driver was using internal key lookup routines, but became dead weight when the driver was converted to use ir-core's key lookup routines. These bits simply didn't get removed, drop 'em now. Pointed out by Dan Carpenter. v2: fix possible attempt to access beyond end of key table array, also pointed out by Dan. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 9986da291b533d4bda03f812ca01353852564900 Author: Stefan Ringel Date: Thu May 6 11:25:52 2010 -0300 V4L/DVB: tm6000: README - add vbi Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 64561a38838c66de1af059e7f4c14bbaa7dd3d54 Author: Mauro Carvalho Chehab Date: Wed May 5 12:30:01 2010 -0300 V4L/DVB: Fix unlock logic at medusa_video_init As reported by Dan Carpenter: > This was my patch: "cx25821: fix double unlock in medusa_video_init()" > > It accidentally got merged two times. The version from the staging tree > is not correct. Please can you revert it: > 7a02f549fcc30fe6be0c0024beae9a3db22e1af6 "Staging: cx25821: fix double > unlock in medusa_video_init()" After reviewing the logic at the function, instead of just adding a patch to revert the wrong one, the better is to apply a different logic: add a goto that will always unlock and return the error. This simplifies the code a little bit, and, instead of just return -EINVAL, it will return the error condition reported by the called functions. This patch is folded with another patch from Dan that added one missing goto. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit e36309f54a6196792fce74100356ebdeaecabd56 Author: matthieu castet Date: Wed May 5 15:59:20 2010 -0300 V4L/DVB: fix dvb frontend lockup If my dvb device is removed while in use, I got the following oops: [ 4920.484084] Call Trace: [ 4920.484102] [] ? default_wake_function+0x0/0x8 [ 4920.484147] [] ? dvb_unregister_frontend+0x95/0xcc [dvb_core] [ 4920.484157] [] ? autoremove_wake_function+0x0/0x2d [ 4920.484168] [] ? dvb_usb_adapter_frontend_exit+0x12/0x21 [dvb_usb] [ 4920.484176] [] ? dvb_usb_exit+0x26/0x88 [dvb_usb] [ 4920.484184] [] ? dvb_usb_device_exit+0x3a/0x4a [dvb_usb] [ 4920.484217] [] ? usb_unbind_interface+0x3f/0xb4 [usbcore] [ 4920.484227] [] ? __device_release_driver+0x74/0xb7 [ 4920.484233] [] ? device_release_driver+0x15/0x1e [ 4920.484243] [] ? bus_remove_device+0x6e/0x87 [ 4920.484249] [] ? device_del+0xfa/0x152 [ 4920.484264] [] ? usb_disable_device+0x59/0xb9 [usbcore] [ 4920.484279] [] ? usb_disconnect+0x70/0xdc [usbcore] [ 4920.484294] [] ? hub_thread+0x521/0xe1d [usbcore] [ 4920.484301] [] ? autoremove_wake_function+0x0/0x2d [ 4920.484316] [] ? hub_thread+0x0/0xe1d [usbcore] [ 4920.484321] [] ? kthread+0x61/0x66 [ 4920.484327] [] ? kthread+0x0/0x66 [ 4920.484336] [] ? kernel_thread_helper+0x7/0x10 If there are users (for example users == -2) : - dvb_unregister_frontend : - stop kernel thread with dvb_frontend_stop : - fepriv->exit = 1; - thread loop catch stop event and break while loop - fepriv->thread = NULL; and fepriv->exit = 0; - dvb_unregister_frontend wait on "fepriv->dvbdev->wait_queue" that fepriv->dvbdev->users==-1. The user finish : - dvb_frontend_release - set users to -1 - don't wait wait_queue because fepriv->exit != 1 => dvb_unregister_frontend never exit the wait queue. Signed-off-by: Matthieu CASTET Signed-off-by: Mauro Carvalho Chehab commit 8b661b508b3a4c8d9fc7a4b10507d3f1172947c3 Author: Dan Carpenter Date: Wed May 5 03:00:47 2010 -0300 V4L/DVB: s2255drv: remove dead code My concern initially was we dereference "dev" in the parameter list to s2255_dev_err() but it turns out that code path is never used. The s2255_stop_readpipe() is only called from one place and "dev" is never null. So this patch just removes the whole condition here. Signed-off-by: Dan Carpenter Cc: linux-dev@sensoray.com Signed-off-by: Mauro Carvalho Chehab commit aab9796f5580a988c46c130a727cdc398a05317b Author: Dan Carpenter Date: Wed May 5 03:01:30 2010 -0300 V4L/DVB: s2255drv: return if vdev not found The original code didn't handle the case where vdev was not found so I added a check for that. Signed-off-by: Dan Carpenter Cc: linux-dev@sensoray.com Signed-off-by: Mauro Carvalho Chehab commit b9245d80c375b93db79475ca231276e1fa5a7649 Author: Dan Carpenter Date: Wed May 5 02:59:48 2010 -0300 V4L/DVB: ov511: cleanup: remove unneeded null check We dereference "ov" unconditionally throughout the function so there is no way it can be NULL here. This code has been around for ages so if it were possible for "ov" to be NULL someone would have complained. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 16ee9bb100340f9f775ab334acb645f54642f312 Author: Dan Carpenter Date: Wed May 5 02:58:57 2010 -0300 V4L/DVB: media/mem2mem: dereferencing free memory We dereferenced "ctx" on the error path. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit a7b39036cfd1d3f868a6745e40bc99b2a8650bad Author: Peter Huewe Date: Wed May 5 12:20:21 2010 -0300 V4L/DVB: media/IR: Add missing include file to rc-map.c This patch adds a missing include linux/delay.h to prevent build failures[1-5] Signed-off-by: Peter Huewe Signed-off-by: Mauro Carvalho Chehab commit 83b6601c880d1b908b07952e9a5fdbe5f5c76c96 Author: Dan Carpenter Date: Wed May 5 02:58:18 2010 -0300 V4L/DVB: dvb/stv6110x: cleanup error handling The "stv6110x" is NULL so we can just return directly without calling kfree(). Also I changed the printk() to make checkpatch.pl happy. Signed-off-by: Dan Carpenter Reviewed-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 1a2f7178cbfeea7045b6cd226319d528f60891b8 Author: Devin Heitmueller Date: Sun Mar 21 17:09:44 2010 -0300 V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig Add the demod and tuner dependencies required for the Avermedia m780 to the Kconfig for the ngene driver. Thanks to Oliver Endriss for pointing this out. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1899e97c52b80c734ead7a98f54ed6fd6e1db96a Author: Devin Heitmueller Date: Sat Mar 13 23:10:13 2010 -0300 V4L/DVB: ngene: start separating out DVB functions into separate file Start moving the dvb specific code to ngene-dvb.c. Note that there is still stuff in ngene-core.c which could potentially be moved out, but it will require considerable reworking of the logic in order to continue to properly support DVB while also being able to support transport streams coming from analog MPEG encoders. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit cbddcba695563ba6c0cba35b647b6bf53ec54333 Author: Devin Heitmueller Date: Sat Mar 13 17:53:58 2010 -0300 V4L/DVB: ngene: split out card specific code into a separate file Split out the card profiles into a new file called ngene-cards.c. This is part of a larger refactoring of the driver in preparation for adding analog support. Note that this patch makes *no* functional change - all I did was cut/paste the code and add the function prototypes to ngene.h as needed. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit cb1c0f8e7099ef5ba20c046df3a3790b5683c573 Author: Devin Heitmueller Date: Sat Mar 13 17:10:24 2010 -0300 V4L/DVB: ngene: split out i2c code into a separate file Split out the i2c related code from the ngene-core.c into a new file called ngene-i2c.c. This is part of a larger refactoring of the driver in preparation for adding analog support. Note that this patch makes *no* functional change - all I did was cut/paste the code and add the function prototypes to ngene.h as needed. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 0abf26291d95b09eda44453a0c0655a54b8d90f7 Author: Devin Heitmueller Date: Sat Mar 13 16:43:18 2010 -0300 V4L/DVB: ngene: add initial support for digital side of Avermedia m780 Add ATSC/QAM support for the Avermedia m780. Note that this patch does not include any analog support for the board, as the ngene bridge driver does not yet have analog implemented Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit fdafc96c9162bdc58192a400bad5b850e185977d Author: Devin Heitmueller Date: Sat Mar 13 16:40:46 2010 -0300 V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input The current code assumes that channel zero is always a TS input, which would result in an oops if the "one_adapter" modprobe option is 1 (which it is by default) and the board in question has something else on channel zero (which is the case for the Avermedia m780, which has it's analog input wired to UVI1) The code now explicitly tracks the first adapter created and ensures that other channels cannot accidentially be associated with a NULL adapter. Also, eliminate what appears to be a typo where all of the channel parameters are getting associated with stream zero's properties, which will work if you happen to have a dual stream board with the exact same configuration, but if they differ then the second stream is going to end up with the first stream's configuration. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 668293a06e3866a3aaa60c523ba4f8f19bfddba1 Author: Mauro Carvalho Chehab Date: Fri May 7 08:48:41 2010 -0300 V4L-DVB: ngene: make sure that tuner headers are included Signed-off-by: Mauro Carvalho Chehab commit a18e659170b9c551749e1c8cb5a969ea8d73e378 Author: Dan Carpenter Date: Tue May 4 09:31:13 2010 -0300 V4L/DVB: media/az6027: handle -EIO failure If the az6027_usb_in_op() returns a negative errno ret is -EIO and in that case the value of b[0] may be undefined. The original code assigned 0 to ret, but since it's already 0 now we can skip that. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 32ec4576c3fb37316b1d11a04b220527822f3f0d Author: Dan Carpenter Date: Tue May 4 09:14:29 2010 -0300 V4L/DVB: media/az6027: doing dma on the stack I changed the dma buffers to use allocated memory instead of stack memory. The reason for this is documented in Documentation/DMA-API-HOWTO.txt under the section: "What memory is DMA'able?" That document was only added a couple weeks ago and there are still lots of modules which haven't been corrected yet. Btw. Smatch includes a pretty good test to find places which use stack memory as a dma buffer. That's how I found these. (http://smatch.sf.net). Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 9723dbb034e45775037c5dd098652e1628a1c9ef Author: Dan Carpenter Date: Tue May 4 08:36:34 2010 -0300 V4L/DVB: media/IR/imon: potential double unlock on error If there is an error here we should unlock in the caller (which is imon_init_intf1()). We can remove this stray unlock. Signed-off-by: Dan Carpenter Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 5f6e3c8e34bc02800b499e09828ac1061e004977 Author: Dan Carpenter Date: Tue May 4 08:38:26 2010 -0300 V4L/DVB: media/IR/imon: testing the wrong variable There is a typo here. We meant to test "ir" instead of "props". The "props" variable was tested earlier. Signed-off-by: Dan Carpenter Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit f03900d696079fa1e93c91af0e49c55b9b7dd105 Author: Dan Carpenter Date: Tue May 4 08:37:33 2010 -0300 V4L/DVB: media/IR/imon: precendence issue: ! vs == The original condition is always false because ! has higher precedence than == and neither 0 nor 1 is equal to IMON_DISPLAY_TYPE_VGA. Signed-off-by: Dan Carpenter Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 6fa7dac4b89af2839b69ea1f772fa73b03efdd6c Author: Mats Randgaard Date: Wed May 5 07:50:38 2010 -0300 V4L/DVB: tvp7002.c: fix some copy-paste errors in the comments Signed-off-by: Mats Randgaard Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 37eb446499fe447c4b827ff7ba87106ced3782dd Author: Mats Randgaard Date: Wed May 5 05:21:24 2010 -0300 V4L/DVB: tvp7002.c: Add support for enum_dv_presets Implement enum_dv_presets in tvp7002. Signed-off-by: Mats Randgaard Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6003b5c7e6dd60b18e48d8cef513228fadaabf7a Author: Mats Randgaard Date: Wed May 5 05:08:22 2010 -0300 V4L/DVB: v4l2-subdev.h: Add support for enum_dv_preset The op enum_dv_preset was missing in this header but is needed by subdev drivers with DV functionality. Signed-off-by: Mats Randgaard Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6ea23bd0bbeeaf67bd57f2195d8d97af96072ea3 Author: Brian Johnson Date: Wed May 5 13:22:45 2010 -0300 V4L/DVB: gspca - sn9c20x: Fix non working mt9v111 sensor Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit 33ddc16f1003fc13d57ebe5061b29e16e6f84848 Author: Brian Johnson Date: Sun Apr 18 21:42:40 2010 -0300 V4L/DVB: gspca - sn9c20x: HAS_BUTTON flag -> HAS_NO_BUTTON flag Reverse HAS_BUTTON logic since most webcams either have a button or if they don't don't bother to send any interrupts. However I have at least one model that appears to leave the button GPIO floating and can send a bogus interrupt. Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit 5d26ed9102404dec1b9ae3ea3ad3832fe6330f0f Author: Brian Johnson Date: Sat Apr 10 02:12:46 2010 -0300 V4L/DVB: gspca - sn9c20x: Add another MSI laptop to upsidedown device list Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit e077f86bacb1795f2d434c6b3e6655769b5ce17c Author: Brian Johnson Date: Mon Apr 5 20:52:52 2010 -0300 V4L/DVB: gspca - sn9c20x: Add another laptop to upsidedown device list Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit 3e56b0f09c5b6ac277322c8bbd04b65094197106 Author: Hans Verkuil Date: Sun May 2 11:11:40 2010 -0300 V4L/DVB: ivtv: fix VIDIOC_S_PRIORITY handling VIDIOC_S_PRIORITY is also part of the ioctls that need to check the access priority. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4d6c871ac338a8d804a1139dade2a463614d3e34 Author: Hans Verkuil Date: Sun May 2 09:29:27 2010 -0300 V4L/DVB: usbvision: add delay before detecting the saa711x The detection of the saa711x often failed. Adding a small delay before attempting to detect it fixed this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit aeb506aaaa08bc1910650666463843a73c34b139 Author: Hans Verkuil Date: Sun May 2 09:00:13 2010 -0300 V4L/DVB: usbvision: don't use usb_set_intfdata, let v4l2_device_register handle this v4l2_device_register already sets intfdata, no need to do this again. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f2b305cd6711b7b3ce30db93b50bc5d6312950c8 Author: Hans Verkuil Date: Sun May 2 08:01:04 2010 -0300 V4L/DVB: hdpvr: fix disconnect sequence Disconnecting the HDPVR caused a kernel oops if lockdep was enabled. In addition, if an app still had video0 open and attempted to call ioctl when the device was already disconnected the system would crash. Move the freeing and cleanup code to the release function: that is the right place for it since you know when you get there that nobody is using the device. Also removed usb_set_intfdata: v4l2_device_register sets this already to v4l2_dev. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a2bdc5e6c4fefea6b0d576a4f610e47456647577 Author: Hans Verkuil Date: Sun May 2 05:36:32 2010 -0300 V4L/DVB: radio-am800: let v4l2_device_(un)register handle usb_get/set_intfdata v4l2_device_register already sets the usb intfdata to v4l2_dev. So use that instead. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dd0daf2a6fb6bec436a3ef68bd585ea09a2a54b7 Author: Hans Verkuil Date: Sun May 2 05:11:32 2010 -0300 V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit No need to lock when unregistering the device: clear_bit is already an atomic operation. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0eed42e48a6292ebc96606c6a7105c69b37666d0 Author: Hans Verkuil Date: Sat May 1 18:06:50 2010 -0300 V4L/DVB: em28xx: g_tuner must set type field The 'type' field was undefined but should be set to ANALOG_TV. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cf19cd3d8a043b1c5784218709a85e358e0d78fb Author: Hans Verkuil Date: Sat May 1 08:23:07 2010 -0300 V4L/DVB: tvp7002: fix query_dv_preset If no signal or valid format is detected, then VIDIOC_QUERY_DV_PRESET must return 0 and set the preset to V4L2_DV_INVALID. This driver returned an error instead. Also simplified the kernel messages a bit: change v4l2_err to v4l2_dbg (not detecting a signal/valid format is not an error, so only print this info when debug == 1) and do not call v4l_fill_dv_preset_info: it's overkill to do this just for a debug message. Thanks to Mats Randgaard for bringing this to my attention. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ffb4877ba013f94322083f77cbb05b35c2a218aa Author: Hans Verkuil Date: Sat May 1 08:03:24 2010 -0300 V4L/DVB: v4l2-common: simplify prio utility functions v4l2_prio_init/open/close returned an int when in fact they would always return 0. Make these void functions. v4l2_prio_close and v4l2_prio_check pass an enum v4l2_priority as a pointer for no good reason. Replace with a normal enum v4l2_priority argument. These changes will simplify the work of moving priority handling into the v4l core. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 530d2d32068eaf3616e0ce9e58a5fde5701c3380 Author: Hans Verkuil Date: Sat May 1 08:00:18 2010 -0300 V4L/DVB: bttv: remove bogus prio check in g_frequency Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b4162f4a40a9518612436ff2233abdd6b5e28d2a Author: Hans Verkuil Date: Sat May 1 06:04:29 2010 -0300 V4L/DVB: Documentation: fix small error in the ENUMINPUT doc Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit aae6e33f8df8845603880468624ca29edf4bac64 Author: Hans Verkuil Date: Sat May 1 16:07:04 2010 -0300 V4L/DVB: cx18/cx25840/saa7115/tvp5150: remove vbi support from s_fmt Now that s_fmt is no longer used for VBI format setup in subdevs, remove the VBI support from s_fmt. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4a61ecbd344c2349ec3b7a8db0db128135285dd7 Author: Hans Verkuil Date: Sun Mar 14 12:39:27 2010 -0300 V4L/DVB: em28xx: switch to new vbi subdev ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 7e87ddb101caa747edf388220c758c99553566f5 Author: Hans Verkuil Date: Sun Mar 14 12:31:08 2010 -0300 V4L/DVB: cx231xx: switch to new vbi subdev ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 09419af39b510851ed14319a93b6d214b80025db Author: Hans Verkuil Date: Sun Mar 14 12:27:48 2010 -0300 V4L/DVB: pvrusb2: switch to new vbi subdev ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit add632cd2580ceb4de9f71ab58c658e9bdebd7f7 Author: Hans Verkuil Date: Sun Mar 14 12:24:15 2010 -0300 V4L/DVB: cx18: switch to new vbi subdev ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4ff0790b6d8b26a4160e46bbd7bf6f4f48e391f9 Author: Hans Verkuil Date: Sun Mar 14 12:18:18 2010 -0300 V4L/DVB: ivtv: switch to new vbi subdev ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d37dad497c77149e99cb3f4086cfc3b8d8150135 Author: Hans Verkuil Date: Sun Mar 14 10:59:16 2010 -0300 V4L/DVB: tvp5150: support new vbi ops to set/get VBI format Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1dbf85397a686488b4be412af1cc069ae63a5ecc Author: Hans Verkuil Date: Sun Mar 14 10:54:47 2010 -0300 V4L/DVB: saa7127: support new vbi ops to set/get VBI format Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1585927de689a3ca033b98ab5df709e0bf2c3ccc Author: Hans Verkuil Date: Sun Mar 14 10:49:48 2010 -0300 V4L/DVB: cx18: support new vbi ops to set/get VBI format Also removed the bogus zeroing of fmt.sliced when setting up raw VBI. This should have been removed in ivtv, but it was just copied-and-pasted into cx18. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5393db43f46e3228e4f84dd47050aeadaee23c0b Author: Hans Verkuil Date: Sun Mar 14 10:16:46 2010 -0300 V4L/DVB: cx25840: support new vbi ops to set/get VBI format Also removed the bogus zeroing of fmt.sliced when setting up raw VBI. Switching between raw and sliced VBI changed in 2.6.28 and this memset should have been removed at that time. It was never noticed because the bridge driver will fill in the fmt.vbi values anyway. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 63d8adccecd404badcdbbf892765995fd028b3d0 Author: Hans Verkuil Date: Sun Mar 14 10:10:14 2010 -0300 V4L/DVB: saa7115: support new vbi ops to set/get VBI format Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 54aefafbf312ee54a2d70fe3ef0ca89c079ead6e Author: Hans Verkuil Date: Sun Mar 14 10:02:50 2010 -0300 V4L/DVB: v4l: add new subdev vbi ops to handle raw and sliced vbi Currently raw and sliced vbi is setup using the video g/s_fmt ops. However, we want to split off the vbi formatting into separate ops so the first step is to create those new ops. The next step will be to convert subdev drivers and bridge drivers to use the new ops. And in the final step we can start converting the video g/s_fmt ops to the new (and more appropriate) mediabus format ops. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 32cd527f59f8aa8549067a2c5f989b736f7da79a Author: Hans Verkuil Date: Sun Mar 14 09:57:30 2010 -0300 V4L/DVB: v4l: move vbi-specific video ops to a new vbi ops struct Only a relatively small number of video receivers and transmitters actually support VBI. So start moving the vbi specific ops to an ops struct of their own. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b26d6e21788864039bfb24840a668f2cb0848930 Author: Jean-François Moine Date: Thu Apr 29 06:01:53 2010 -0300 V4L/DVB: gspca - main: Convert wMaxPacketSize from little endian 16 to cpu Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 57c6d2e999e37bd8e98820666278f2b670a9bbab Author: Laurent Pinchart Date: Fri Apr 30 10:48:51 2010 -0300 V4L/DVB: MAINTAINERS: Update uvcvideo web site address The web site has moved to a new location, update the MAINTAINERS file. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit cf7a50eeb6f462a0b7d1619fcb27a727a2981769 Author: Laurent Pinchart Date: Sun Apr 25 16:27:14 2010 -0300 V4L/DVB: uvcvideo: Prevent division by 0 when control step value is 0 The control step values reported by the device are used as a divisor unchecked, which can result in a division by zero. Check the step value and make it 1 when null. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit a90ef69c1f67319ddbba0170767c660c7fb5d4c9 Author: Laurent Pinchart Date: Sun Apr 25 16:23:24 2010 -0300 V4L/DVB: uvcvideo: Flag relative controls as write-only The UVC relative controls (exposure time, iris, focus, zoom, pan/tilt) are write-only (despite the UVC specification stating that the GET_CUR request is mandatory). Mark the controls as such, and report the related V4L2 controls V4L2_CTRL_FLAG_WRITE_ONLY. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 61421206833a4085d9bdf35b2b84cd9a67dfdfac Author: Laurent Pinchart Date: Mon Apr 12 10:41:22 2010 -0300 V4L/DVB: uvcvideo: Add support for V4L2_PIX_FMT_Y16 The Miricle 307K (17dc:0202) camera reports a 16-bit greyscale format, support it in the driver. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit acc8cc43865edbd4fe8602531c92fa748ad7778f Author: Randy Dunlap Date: Wed May 5 19:44:11 2010 -0300 V4L/DVB: [-next] media: fix vivi build error vivi uses find_font(), which is only available when FONTS is enabled, so make vivi depend on FONTS. ERROR: "find_font" [drivers/media/video/vivi.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 0faa2ed5bfd08d94a04c8d4b55823676175f451f Author: Dmitri Belimov Date: Tue Apr 6 01:00:05 2010 -0300 V4L/DVB: saa7134: Add support new Behold TV cards [dougsland@redhat.com: Fixed cards numbers reject due changes in saa7134.h] Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 1b0e48ad5530881d11d3caba62e59b82646c5e64 Author: Dmitri Belimov Date: Tue May 4 19:53:50 2010 -0300 V4L/DVB: Rework for support xc5000 Set correct GPIO number for BEHOLD_WANDER/VOYAGER Add xc5000 callback function Small rework tm6000_cards_setup function Small rework tm6000_config_tuner, build mode_mask by config information Rework for support xc5000 silicon tuner Add some information messages for more better understand an errors. [mchehab@redhat.com: Fix CodingStyle and merge conflicts] Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 9b558434136138edc79710385aaf613cb4b30459 Author: Pawel Osciak Date: Mon Mar 29 05:16:31 2010 -0300 V4L/DVB: videobuf: make poll() report proper flags for output video devices According to the V4L2 specification, poll() should set POLLOUT | POLLWRNORM flags for output devices after the frame has been displayed. Signed-off-by: Pawel Osciak Reviewed-by: Kyungmin Park Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fc7f8fd42c2b934ac348995e0c530c917fc277d5 Author: Arnout Vandecappelle Date: Wed Mar 17 19:53:04 2010 -0300 V4L/DVB: buf-dma-sg.c: don't assume nr_pages == sglen videobuf_pages_to_sg() and videobuf_vmalloc_to_sg() happen to create a scatterlist element for every page. However, this is not true for bus addresses, so other functions shouldn't rely on the length of the scatter list being equal to nr_pages. Signed-off-by: Mauro Carvalho Chehab commit c06b062bea411f616b0890d502044c7871d5332f Author: Mauro Carvalho Chehab Date: Wed May 5 17:16:35 2010 -0300 V4L/DVB: videobuf-vmalloc: remove __videobuf_sync() videobuf-core checks if .sync ops is defined before calling. So, we don't need a do-nothing function. Signed-off-by: Mauro Carvalho Chehab commit 97f8105dcd62a5c122f31ca5ae53c924c3e7d42b Author: Mauro Carvalho Chehab Date: Wed May 5 16:23:09 2010 -0300 V4L/DVB: videobuf-dma-sg: remove external function videobuf_dma_sync() While analyzing one of the videobuf patches, I noticed that videobuf_dma_sync is only used internally inside videobuf-dma-sg. So, let's remove this function, merging the code at __videobuf_dma_sync() Signed-off-by: Mauro Carvalho Chehab commit 21636363be97725432591071d26dc0dca088ecbb Author: Pawel Osciak Date: Wed Apr 28 04:05:23 2010 -0300 V4L/DVB: Add documentation for the new error flag Add documentation for V4L2_BUF_FLAG_ERROR. Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit b2dfd1a45f014e24f0eecc50a7edc954425c348a Author: Hans Verkuil Date: Wed Apr 28 04:05:22 2010 -0300 V4L/DVB: videobuf: Add support for V4L2_BUF_FLAG_ERROR For recoverable stream errors dqbuf() now returns 0 and the error flag is set instead of returning EIO. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit bc0f7f19ab9ba5c7ec648b400d1360b525fa1a3a Author: Pawel Osciak Date: Wed Apr 28 04:05:21 2010 -0300 V4L/DVB: Add a new ERROR flag for DQBUF after recoverable streaming errors This flag is intended to indicate streaming errors, which might have resulted in corrupted video data in the buffer, but the buffer can still be reused and streaming may continue. Setting this flag and returning 0 is different from returning EIO. The latter should now indicate more serious (unrecoverable) errors. This patch also solves a problem with the ioctl handling code in vl42-ioctl.c, which does not copy buffer identification data back to the userspace when EIO is returned, so there is no way for applications to discover on which buffer the operation failed in such cases. Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 7ded150f573d0ce26ac96fd4c214eee7984ad339 Author: Ricardo Maraschini Date: Tue Apr 20 14:22:31 2010 -0300 V4L/DVB: cx25821-video-upstream.c: Added severity to printk calls Signed-off-by: Ricardo Maraschini Signed-off-by: Mauro Carvalho Chehab commit bde4301d9a647a3b2efb1a9f429c1d3ede075fa4 Author: sai Date: Sat Mar 20 02:34:22 2010 -0300 V4L/DVB: staging:cx25821:fixes coding styles in cx25821-i2c.c This is a patch to the cx25821-i2c.c file that fixes warning and errors found by checkpatch.pl tool [mchehab@redhat.com: fix conflicts with changeset 2587a7ef7b8bc3c7db7c43659297b45b168922ab] Signed-off-by: sai Signed-off-by: Mauro Carvalho Chehab commit 770238bf56f833291f7df445ef0678d20ca995c9 Author: sai Date: Mon Mar 22 23:29:25 2010 -0300 V4L/DVB: staging:cx2581: fixes coding style issues in cx25821-cards.c This patch fixes all the coding style issues reported by checkpatch.pl tool Signed-off-by: sai Signed-off-by: Mauro Carvalho Chehab commit 629dcf23dffcf90f2104784d4ad9324ab3a1f2ef Author: sai gopal Date: Wed Apr 28 14:17:00 2010 -0300 V4L/DVB: cx25821: fix coding style issues in cx25821-alsa.c This is a patch to cx25821-alsa.c file that fixes of most of the warning & errors found by checkpatch.pl tool [mchehab@redhat.com: Fix conflicts with changeset 4e0c923a0d23f86c7331b32bc2aeb280e10e029e] Signed-off-by: sai gopal Signed-off-by: Mauro Carvalho Chehab commit 205161ed03b53c467dd669a340ea704ce0fb6f9e Author: Jiri Slaby Date: Tue Apr 27 18:11:20 2010 -0300 V4L/DVB: dvb-usb: gp8psk, fix potential null derefernce Stanse found that in gp8psk_load_bcm4500fw there is missing a check for return value of kmalloc. Add one and bail out appropriatelly. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 0de8e3533e08745616a30bdb3fa5106c85083e51 Author: Randy Dunlap Date: Mon Feb 8 20:30:33 2010 -0300 V4L/DVB: dib3000mc: reduce large stack usage This patch reduces static stack usage of one of the 2 top offenders as listed by 'make checkstack': Building with CONFIG_FRAME_WARN=2048 produces: drivers/media/dvb/frontends/dib3000mc.c:853: warning: the frame size of 2224 bytes is larger than 2048 bytes and in 'make checkstack', the stack usage goes from: 0x00000bbd dib3000mc_i2c_enumeration [dib3000mc]: 2232 to unlisted with this patch. I don't have the hardware that is needed to test this patch. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Acked-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 0b42760a75afb852be6718fb5e6b54988123b40e Author: Andrew Morton Date: Tue Apr 27 19:09:45 2010 -0300 V4L/DVB: dib7000p: reduce large stack usage fix Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 30d81bb086c84d54cde4dd4d0c75d9455224632b Author: Randy Dunlap Date: Mon Feb 8 20:30:44 2010 -0300 V4L/DVB: dib7000p: reduce large stack usage This patch reduces static stack usage of one of the 2 top offenders as listed by 'make checkstack': Building with CONFIG_FRAME_WARN=2048 produces: drivers/media/dvb/frontends/dib7000p.c:1367: warning: the frame size of 2320 bytes is larger than 2048 bytes and in 'make checkstack', the stack usage goes from: 0x00002409 dib7000p_i2c_enumeration [dib7000p]: 2328 to unlisted with this patch. Also change one caller of dib7000p_i2c_enumeration() to check its return value. I don't have the hardware that is needed to test this patch. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 84e2f037ce9672d0fb118e3e82cecfe6122ace3f Author: Michael Müller Date: Mon Apr 26 22:18:57 2010 -0300 V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver This patch introduces support for DVB-T for the following dibcom based card: Elgato EyeTV Diversity (USB-ID: 0fd9:0011) Support for the Elgato silver IR remote is added too (set parameter dvb_usb_dib0700_ir_proto=0) [w.sang@pengutronix.de: rebased to current linuxtv-master] Signed-off-by: Michael Müller Signed-off-by: Wolfram Sang Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit b7589ac4aea794920528c28fe36288908462ddec Author: Kirill Smelkov Date: Tue Apr 27 13:17:51 2010 -0300 V4L/DVB: bttv: Add another ids for IVC-200 I have 3 IVC-200 cards (with 4 video channels on each). 2 of the cards identify theirselves as 000[0-3]:a155 (ids already in cardlist) and another one identifies itself as 080[0-3]:a155, which ids were unknown so far. Note - it's IVC-200, not IVC-200G. Signed-off-by: Kirill Smelkov Signed-off-by: Mauro Carvalho Chehab commit 16bfdaa41be85512432212382f2600fcdf7c1c37 Author: Pierre Gronlier Date: Mon Apr 26 13:26:29 2010 -0300 V4L/DVB: Read MAC for TeVii S470 PCI-e DVB-S2 card This patch retrieve the correct mac address from the eeprom for TeVii S470 card. Signed-off-by: Pierre Gronlier Cc: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 5013318ca4fd22e30fd891f234b60daa3ca2f62d Author: Mauro Carvalho Chehab Date: Wed Apr 7 17:07:58 2010 -0300 V4L/DVB: em28xx: fix locks during dvb init sequence Serialize DVB initialization, to avoid it to happen while analog initialization is still happening. Signed-off-by: Mauro Carvalho Chehab commit d922b8ea33afad725920375b2d3bd65218cdb133 Author: Istvan Varga Date: Sat Mar 27 09:47:45 2010 -0300 V4L/DVB: cx88: fix setting input when using DVB In cx88-mpeg.c, there is code that sets core->input to CX88_VMUX_DVB. However, this may be incorrect, since core->input is actually an index to core->board.input[], which has not enough elements to be indexed by the value of CX88_VMUX_DVB. So, the modified code searches core->board.input[] for an input with a type of CX88_VMUX_DVB, and if it does not find one, the index is simply set to zero. The change may not have much effect, though, since it appears the only case when core->input is actually used is when the current input is being queried. Signed-off-by: Istvan Varga Signed-off-by: Mauro Carvalho Chehab commit db190fc13af8e2e5e9d717c16b07342ea8bf9174 Author: Jarod Wilson Date: Fri Apr 30 16:06:12 2010 -0300 V4L/DVB: IR/imon: add proper auto-repeat support Simplified from version 1, in that hacks heisted from ati_remote2.c aren't actually necessary, the real fix for too many repeats was from setting too long a timer release value (200ms) on repeats in mce mode -- this patch drops the release timeout to 33ms, matching the input subsystem default input_dev->rep[REP_PERIOD]. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 666a9ed8971657ea7dcf0bd9df17195db4dddf29 Author: Jarod Wilson Date: Wed Apr 28 14:37:29 2010 -0300 V4L/DVB: IR/imon: minor change_protocol fixups This is a follow-up to my prior patch implementing ir-core's change_protocol functionality in the imon driver, which eliminates a false warning when change_protocol is called without a specific protocol selected yet (i.e., still IR_TYPE_UNKNOWN). It also removes some extraneous blank lines getting spewn into dmesg. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 96c1f99621a73c58f97d7ca615b2fe936abda555 Author: David Härdeman Date: Sat Apr 24 18:14:16 2010 -0300 V4L/DVB: ir-core: remove ir-functions usage from cx231xx Convert drivers/media/video/cx231xx/cx231xx-input.c to not rely on ir-functions.c. (I do not have the hardware so I can only compile test this) Signed-off-by: David Härdeman Cc: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 5a143b12ebbd37154cb06699a757e9c5845c5e19 Author: David Härdeman Date: Sat Apr 24 18:14:00 2010 -0300 V4L/DVB: ir-core: remove IR_TYPE_PD Pulse-distance is not a protocol, it is a line coding (used by some protocols, like NEC). Looking at the uses of IR_TYPE_PD, the real protocol seems to be NEC in all cases (drivers/media/video/cx88/cx88-input.c is the only user). So, remove IR_TYPE_PD while it is still easy to do so. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 6718e8ad950f73fc895b98a413a63cb2add3b4d2 Author: Jarod Wilson Date: Fri Apr 23 02:27:11 2010 -0300 V4L/DVB: IR/imon: convert to ir-core protocol change handling Drop the imon driver's internal protocol definitions in favor of using those provided by ir-core. Should make ir-keytable Just Work for switching protocol on the fly on the imon devices that support both the native imon remotes and mce remotes. The imon-no-pad-stabilize pseudo-protocol was dropped as a protocol, and converted to a separate modprobe option (which it probably should have been in the first place). On the TODO list is to convert this to an as yet unwritten protocol-specific options framework. While the mce remotes obviously map to IR_TYPE_RC6, I've yet to look at what the actual ir signals from the native imon remotes are, so for the moment, imon native ir is mapped to IR_TYPE_OTHER. Nailing it down more accurately is also on the TODO list. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 0a4f8d0798c834472b9d8d50df32b62c733009fd Author: Laurent Pinchart Date: Sun May 2 14:32:43 2010 -0300 V4L/DVB: event: Export the v4l2_event_init and v4l2_event_dequeue functions Signed-off-by: Laurent Pinchart Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit f3cd385a9c95e1ea90e886448ab1e83ee2fc7e51 Author: Sakari Ailus Date: Mon May 3 12:42:46 2010 -0300 V4L/DVB: V4L: Events: Replace bad WARN_ON() with assert_spin_locked() spin_is_locked() always returns zero when spinlock debugging is disabled on a single CPU machine. Replace WARN_ON() with assert_spin_locked(). Thanks to Laurent Pinchart for spotting this! Signed-off-by: Sakari Ailus Acked-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 5a11b6fe5d5ff146d951bc237c0e3f0330711baa Author: Mauro Carvalho Chehab Date: Mon May 3 15:17:57 2010 -0300 Fix compilation breakage with tm6000 Randy Dunlap reported a breakage while compiling drivers/staging/tm6000, due to this change: commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c Author: Greg Kroah-Hartman Date: Thu Apr 29 15:46:07 2010 -0700 USB: remove unused usb_buffer_alloc and usb_buffer_free macros Now that all callers are converted over, remove the compatibility functions and all is good. As the function got renamed, the rename should also be applied at tm6000. Acked-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 6bc4631dbc535a906193fe8110556bf84e1786e3 Author: Mauro Carvalho Chehab Date: Mon May 3 04:38:15 2010 -0300 V4L/DVB: tm6000: update the todo list Signed-off-by: Mauro Carvalho Chehab commit 4223871357a2b64248b3c41c8d89fbf03c2531ea Author: Mauro Carvalho Chehab Date: Mon May 3 04:25:59 2010 -0300 V4L/DVB: Fix color format with tm6010 The values for the fourcc format were correct, but applied to the wrong register. With this change, video is now barely working again with tm6000. While here, let's remove, for now, the memset. This way, people can have some image when testing this device. Yet to be fixed: parts of the image frame are missed. As we don't clean the buffers anymore, this is "recovered" by repeating the values from a previous frame. The quality is bad, since the image pixels will contain data from some previous frames, generating weird delay artifacts. Signed-off-by: Mauro Carvalho Chehab commit 9d5164da8d8dd63bfb4e3070a5e27d79af0f1654 Author: Roel Van Nyen Date: Tue Apr 27 18:57:00 2010 -0300 V4L/DVB: tm6000: fix coding style issues of tm6000-cards.c fix coding style issues [mchehab@redhat.com: Fix conflicts with other patches] Signed-off-by: Roel Van Nyen Signed-off-by: Mauro Carvalho Chehab commit e18f58c6262f1504dbf6c95e8a5e3cd9f32b6c5c Author: Stefan Ringel Date: Fri Apr 23 12:43:42 2010 -0300 V4L/DVB: tm6000: renaming firmware renaming tm6000-xc3028.fw to xc3028-v24.fw Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 120756e10e86a193e64c3e8a6f73ae8ffdbd5bcf Author: Stefan Ringel Date: Thu Apr 29 09:24:47 2010 -0300 V4L/DVB: tm6000: bugfix analog init for tm6010 - change values in function tm6000_set_fourcc_format - disable digital source - add vbi and audio init Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 801dd3b32d2a09a883d0cf182eb6956945e5a429 Author: Mauro Carvalho Chehab Date: Sun May 2 17:14:33 2010 -0300 V4L/DVB: tm6000: Don't copy outside the buffer tm6000 tm6000_irq_callback :urb resubmit failed (error=-1) BUG: unable to handle kernel paging request at 000000000100f700 IP: [] tm6000_irq_callback+0x51e/0xac7 [tm6000] (gdb) list * tm6000_irq_callback+0x51e 0x2e79 is in tm6000_irq_callback (drivers/staging/tm6000/tm6000-video.c:363). 358 dev->isoc_ctl.tmp_buf_len--; 359 } 360 if (dev->isoc_ctl.tmp_buf_len) { 361 memcpy (&header,p, 362 dev->isoc_ctl.tmp_buf_l$ 363 memcpy (((u8 *)header)+ 364 dev->isoc_ctl.tmp_buf, 365 ptr, 366 4-dev->isoc_ctl.tmp_buf$ 367 ptr+=4-dev->isoc_ctl.tmp_buf_le$ Signed-off-by: Mauro Carvalho Chehab commit f4b727b3ae0cc244f803a8a0c532df06ad846a1b Author: Mauro Carvalho Chehab Date: Sun May 2 11:42:45 2010 -0300 V4L/DVB: tm6000: Fix a panic if buffer become NULL Changing a video standard takes a long time to happen on tm6000, since it needs to load another firmware, and the i2c implementation on this device is really slow. When the driver tries to change the video standard, a kernel panic is produced: BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 IP: [] tm6000_irq_callback+0x57f/0xac2 [tm6000] ... Kernel panic - not syncing: Fatal exception in interrupt By inspecting it with gdb: (gdb) list *tm6000_irq_callback+0x57f 0x348a is in tm6000_irq_callback (drivers/staging/tm6000/tm6000-video.c:202). 197 /* FIXME: move to tm6000-isoc */ 198 static int last_line = -2, start_line = -2, last_field = -2; 199 200 /* FIXME: this is the hardcoded window size 201 */ 202 unsigned int linewidth = (*buf)->vb.width << 1; 203 204 if (!dev->isoc_ctl.cmd) { 205 c = (header >> 24) & 0xff; 206 Clearly, it was the trial to access *buf, at line 202 that caused the Panic. As ioctl is serialized, While S_STD is handled,QBUF/DQBUF won't be called. So, the driver will run out of the buffers, and *buf will become NULL. As, on tm6000, the same URB can contain more than one video buffer, it is likely to hit a condition where no new buffer is available whily copying the streams. The fix is to leave the URB copy loop, if there's no more buffers are available. The same bug could also be produced by an application that is not fast enough to request new video buffers. The same bug were reported by Bee Hock Goh . Thanks-to: Bee Hock Goh for reporting the bug Signed-off-by: Mauro Carvalho Chehab commit 6ae635c4f36d7a0b931feb4bb6dad6e5f18187cf Author: Mauro Carvalho Chehab Date: Mon Apr 26 11:24:18 2010 -0300 V4L/DVB: tm6000: Properly set alternate when preparing to stream Although the code is getting the better alternates, it is not really using it. Get the interface/alternate numbers and use it where needed. This patch implements also one small fix at the last_line set, as proposed by Bee Hock Goh . Signed-off-by: Mauro Carvalho Chehab commit 1ebf2c7f78bbf3501c13c6b442dc8e52beb77be6 Author: Bee Hock Goh Date: Sun Apr 25 03:50:57 2010 -0300 V4L/DVB: tm6000: Add additional GPIO for UT821 during frmware loading Signed-off-by: Bee Hock Goh Signed-off-by: Mauro Carvalho Chehab commit 20dead8da8b383004e66eaf884cd9e07ceadbd68 Author: Dmitri Belimov Date: Tue Apr 27 22:32:43 2010 -0300 V4L/DVB: tm6000: fix i2c read Set correct limit for I2C packet. Use different method for the tm5600/tm6000 and tm6010 to read word. [mchehab@redhat.com: Fix CodingStyle] Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit a85675316f24835ce0c3286ee3cb33fa2f24bca7 Author: Jean-François Moine Date: Sun Apr 25 15:25:42 2010 -0300 V4L/DVB: gspca - zc3xx: Fix the gamma calculation from the contrast Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 07ae4918f75f26f4f4200de186a27178c7e58038 Author: Jean-François Moine Date: Sun Apr 25 15:05:31 2010 -0300 V4L/DVB: gspca - zc3xx.c: Remove the brightness control Brightness is done by the gamma tables and not by single bridge registers. It will be back as soon as an algorithm will be found. This change also fixes the autogain problem found by Jose Alberto Reguero (webcam 046d:08dd). Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a6a86f0d2cb472450f72774794db4a76a570766d Author: Jean-François Moine Date: Sun Apr 25 14:57:10 2010 -0300 V4L/DVB: gspca - zc3xx: Fix the light frequency values for pas202b and pb0330 The error was introduced by "gspca - zc3xx: Rename the USB sequences." in commit e945e2e44c798f84494260c02478d3c23965bb93. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 03ed2a11eac62c15be28f58b182003fc56ca4f82 Author: Jean-François Moine Date: Sun Apr 25 14:45:43 2010 -0300 V4L/DVB: gspca - sonixj: Add sensor soi768 The webcams 0c45:613e may contain the sensors ov7630 or soi768. A sensor probe is done at init time when the sensor is declared ov7630. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit e3302cad9bc111e158e03eff763dff36bce02fe6 Author: Jean-François Moine Date: Sun Apr 25 14:41:51 2010 -0300 V4L/DVB: gspca - sonixj: Reset the bridge after sensor probe Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0a85c74b5d48f6cb41770ec3951a582738446b33 Author: Jean-François Moine Date: Sun Apr 25 14:33:31 2010 -0300 V4L/DVB: gspca - sonixj: Adjust minor values of sensor ov7630. - set the color gains to null at init time - change value of register 0x9a Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit fff2f708f8838c9be0099d32ed1739e9aa42af6f Author: Jean-François Moine Date: Sun Apr 25 14:31:05 2010 -0300 V4L/DVB: gspca - sonixj: Set the colors at startup time Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit cfd23c8eca3587fcb20f308532293e92d1f248a8 Author: Jean-François Moine Date: Sun Apr 25 14:27:39 2010 -0300 V4L/DVB: gspca - sonixj: Adjust debug output. - fix bad function name - add debug info for i2c buffer write Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit bdd2b93c44bf70eac3c5ef7da62355e1e48ee1eb Author: Jean-François Moine Date: Sun Apr 25 14:23:39 2010 -0300 V4L/DVB: gspca - sonixj: Split the init sequence of sensor ov7630 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 96f2ec67b8d4761471409e1df0adfe4da5262f84 Author: Pawel Osciak Date: Wed Apr 21 06:44:27 2010 -0300 V4L/DVB: v4l: videobuf: qbuf now uses relevant v4l2_buffer fields for OUTPUT types According to the V4L2 specification, applications set bytesused, field and timestamp fields of struct v4l2_buffer when the buffer is intended for output and memory type is MMAP. This adds proper copying of those values to videobuf_buffer so drivers can use them. Signed-off-by: Pawel Osciak Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 72fcf2a8daac43f8e3bce62a1c1124859b323006 Author: Vaibhav Hiremath Date: Sun Apr 11 10:50:23 2010 -0300 V4L/DVB: omap_vout:V4L2 Display: Changed enum return type to int Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 5c7ab6348e7b3fcca2b8ee548306c774472971e2 Author: Vaibhav Hiremath Date: Sun Apr 11 10:41:49 2010 -0300 V4L/DVB: V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2 Features Supported - 1. Provides V4L2 user interface for the video pipelines of DSS 2. Basic streaming working on LCD, DVI and TV. 3. Works on latest DSS2 library from Tomi 4. Support for various pixel formats like YUV, UYVY, RGB32, RGB24, RGB565 5. Supports Alpha blending. 6. Supports Color keying both source and destination. 7. Supports rotation. 8. Supports cropping. 9. Supports Background color setting. 10. Allocated buffers to only needed size Signed-off-by: Vaibhav Hiremath Reviewed-by: Hans Verkuil Reviewed-by: Muralidharan Karicheri Signed-off-by: Murailidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 0e1de38db83606d802cf2b3e00cf95fc693b8ca2 Author: Hans Verkuil Date: Sat Mar 27 14:10:57 2010 -0300 V4L/DVB: v4l spec: document new events Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 37089368c1b1bea3c71217163e6d5d3b01ef1f19 Author: Hans Verkuil Date: Sat Mar 27 14:10:37 2010 -0300 V4L/DVB: v4l spec: document what odd and even fields are Document that odd == top and even == bottom. I can never remember this, so it is probably worth documenting. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 092501936fc128992456a086193746cf34642815 Author: Hans Verkuil Date: Sat Mar 27 14:10:13 2010 -0300 V4L/DVB: ivtv: support the new events API Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1bcaf4bd53872e70c4fceec6bbb76044325f337f Author: Hans Verkuil Date: Sat Mar 27 14:09:52 2010 -0300 V4L/DVB: v4l: add VSYNC and EOS events for use with ivtv Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dd96608369be9d3cfc604eaa3a53a2d38f1cb415 Author: Sakari Ailus Date: Sat Mar 27 10:58:24 2010 -0300 V4L/DVB: V4L: Events: Add documentation Add documentation on how to use V4L2 events, both for V4L2 drivers and for V4L2 applications. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit d3d7c963562adad92e968df23c425ae964fe9ce2 Author: Sakari Ailus Date: Sat Mar 27 11:02:10 2010 -0300 V4L/DVB: V4L: Events: Support event handling in do_ioctl Add support for event handling to do_ioctl. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit c3b5b0241f620a356c97d8f43343e721c718806d Author: Sakari Ailus Date: Mon Mar 1 05:14:18 2010 -0300 V4L/DVB: V4L: Events: Add backend Add event handling backend to V4L2. The backend handles event subscription and delivery to file handles. Event subscriptions are based on file handle. Events may be delivered to all subscribed file handles on a device independent of where they originate from. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit fda1021477b390506ebed0225eaa6d31a903e2b7 Author: Sakari Ailus Date: Wed Feb 24 19:19:05 2010 -0300 V4L/DVB: V4L: Events: Add new ioctls for events This patch adds a set of new ioctls to the V4L2 API. The ioctls conform to V4L2 Events RFC version 2.3: Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 6cd84b78edc6f35b01603f85d8769cbb6c568306 Author: Sakari Ailus Date: Sat Mar 20 18:28:48 2010 -0300 V4L/DVB: V4L: File handles: Add documentation Add documentation on using V4L2 file handles (v4l2_fh) in V4L2 drivers. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 1babcb460f2b87c20eb6860b9685a0dab636cc4b Author: Sakari Ailus Date: Tue Mar 23 09:25:26 2010 -0300 V4L/DVB: V4L: File handles This patch adds a list of v4l2_fh structures to every video_device. It allows using file handle related information in V4L2. The event interface is one example of such use. The use of v4l2_fh is not mandatory for drivers. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab commit 96d8eab5d0a1a9741a4cae1b3c125d75d1aabedf Author: Pawel Osciak Date: Fri Apr 23 05:38:38 2010 -0300 V4L/DVB: [v5,2/2] v4l: Add a mem-to-mem videobuf framework test device This is a virtual device driver for testing the memory-to-memory framework. This virtual device uses in-memory buffers for both its source and destination. It is capable of multi-instance, multi-buffer-per-transaction operation (via the mem2mem framework). [mchehab@redhat.com: use videobuf_queue_to_vaddr instead of the removed videobuf_queue_to_vmalloc] Signed-off-by: Pawel Osciak Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit 7f98639def42a676998d734b381af6c0e64d7791 Author: Pawel Osciak Date: Fri Apr 23 05:38:37 2010 -0300 V4L/DVB: add memory-to-memory device helper framework for videobuf A mem-to-mem device is a device that uses memory buffers passed by userspace applications for both their source and destination data. This is different from existing drivers, which utilize memory buffers for either input or output, but not both. In terms of V4L2 such a device would be both of OUTPUT and CAPTURE type. Examples of such devices would be: image 'resizers', 'rotators', 'colorspace converters', etc. This patch adds a separate Kconfig sub-menu for mem-to-mem devices as well. Signed-off-by: Pawel Osciak Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit 35e6aa9fc38fb7f47f39711e52cb0f58fbf4441c Author: Xiaolin Zhang Date: Sun Apr 18 23:06:50 2010 -0300 V4L/DVB: core: add support for more color effects Add support for more color effects (negative, sketch, emboss, etc) by extending the v4l2_colorfx enum items. Signed-off-by: Xiaolin Zhang Signed-off-by: Mauro Carvalho Chehab commit aec11e5d495a6c9b10ded81dde5b0e42b0875541 Author: Guennadi Liakhovetski Date: Mon Mar 29 04:45:22 2010 -0300 V4L/DVB: V4L: v4l2-subdev driver for AK8813 and AK8814 TV-encoders from AKM AK8814 only differs from AK8813 by included Macrovision Copy Protection function. This patch adds a driver for AK8813 and AK8814 I2C PAL/NTSC TV encoders. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit a81fb9b223508f5773d8d7e226b1574d1b068642 Author: Guennadi Liakhovetski Date: Wed Mar 17 11:21:13 2010 -0300 V4L/DVB: V4L: SuperH Video Output Unit (VOU) driver A number of SuperH Mobile SoCs, including sh7724, include a Video Output Unit. This patch adds a video (V4L2) output driver for it. The driver uses v4l2-subdev and mediabus APIs to interface to TV encoders. Signed-off-by: Guennadi Liakhovetski Acked-by: Paul Mundt Signed-off-by: Mauro Carvalho Chehab commit f35f1bb8fc1e56646a3dab0ecd12e23bca6323c4 Author: Guennadi Liakhovetski Date: Tue Mar 23 11:52:11 2010 -0300 V4L/DVB: videobuf-dma-contig.c: simplify pointer dereference Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit f7fc97adb1efd51609d965ba76d559f7daef4262 Author: Guennadi Liakhovetski Date: Tue Mar 23 11:42:32 2010 -0300 V4L/DVB: sh_mobile_ceu_camera.c: update documentation to reflect the new cropping Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit ab56d5eb58182b0c9e179c33ddd3f3aabb6c798f Author: Guennadi Liakhovetski Date: Tue Mar 23 11:31:46 2010 -0300 V4L/DVB: soc-camera: update comment soc-camera no longer requires .set_crop() implementations to update their argument. Update the commentary. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit e622681d124688d3caf1bf62cce96465a9078a11 Author: Guennadi Liakhovetski Date: Tue Mar 23 11:23:31 2010 -0300 V4L/DVB: sh_mobile_ceu_camera.c: preserve output window on VIDIOC_S_CROP Current version of sh_mobile_ceu_camera.c interprets the V4L2 API specification of the VIDIOC_S_CROP ioctl as "change input (for capture devices) area, preserve scaling factors, therefore change output window," whereas a more intuitive interpretation of the API is "change input area, preserve output window." Switch sh_mobile_ceu_camera.c to use this interpretation. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 730947bc141b7e8feb091dcf3ee8e6a7b9379512 Author: Hans Verkuil Date: Sat Apr 10 04:13:53 2010 -0300 V4L/DVB: vivi: clean up and a major overhaul - Clean up the code - Use the kernel's built-in vga8x16 font instead of our own. - Drop exclusive open: now multiple users can open the device as per the V4L2 spec. - Move the format description to the vivi device instead of keeping it in the file handle. Again as per the spec. - Streamline and simplify the drawing code. It is now easy to add text on top of the colorbar pattern. - Upgrade the max resolution to 1920x1200. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 474675ad8006834be996c046b47436d8ca7a5105 Author: Mauro Carvalho Chehab Date: Sun Apr 25 11:23:52 2010 -0300 V4L/DVB: videobuf-dma-sg: Avoid using a wrong size drivers/media/video/videobuf-dma-sg.c: In function ‘__videobuf_mmap_mapper’: drivers/media/video/videobuf-dma-sg.c:557: warning: ‘size’ may be used uninitialized in this function The condition where size is floating should never happen, due to the paranoia check, but a future change at the logic might break it. So, let's just set size to zero and use it for the paranoia check. Signed-off-by: Mauro Carvalho Chehab commit e4dac289f01da80d7966a123bc1ea97be199ba4f Author: Jean-François Moine Date: Fri Apr 9 06:11:36 2010 -0300 V4L/DVB: gspca - main: Stop the webcam when bandwidth too small Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 832d0a9130c18b9ee4b671c46763b972eb2a2568 Author: Jean-François Moine Date: Fri Apr 9 06:07:58 2010 -0300 V4L/DVB: gspca - main: Restart streaming after reqbuf Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 18bf99aa0cb80b4fa3974a511fd033c2967b04c8 Author: Jean-François Moine Date: Fri Apr 9 06:06:11 2010 -0300 V4L/DVB: gspca - main: Check the file doing stream on/off Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0b62b73778554cd47480ea465f0b255cc63b4336 Author: Hans Verkuil Date: Sun Mar 28 09:09:05 2010 -0300 V4L/DVB: v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper mmap_mapper should operate on a buffer, not on a complete queue. So let the videobuf-core find the correct buffer instead of duplicating that code in each mmap_mapper implementation. The dma-sg implementation has backwards compatibility code for handling the V4L1_COMPAT layer. This code is now under the v4L1_COMPAT config option. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 37111039c9521c751ce0597c129fe6d45ba72818 Author: Hans Verkuil Date: Sun Mar 28 09:22:53 2010 -0300 V4L/DVB: v4l videobuf: move video_copy_to_user and copy_stream to core The video_copy_to_user and copy_stream ops are almost identical for all videobuf memtype variants. All that is needed is to use the new vaddr op and these functions can be moved into the core, ensuring we have just one single implementation instead of three. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f4fce60e8b1559306fa1112287bc8765f6977de3 Author: Hans Verkuil Date: Sun Mar 28 08:33:23 2010 -0300 V4L/DVB: v4l videobuf: rename videobuf_queue_to_vmalloc to videobuf_queue_to_vaddr Ths function returns the virtual kernel address of the buffer and has nothing to do with allocation. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 037c75eb14cd6adb837f81f0c2b2a52c31c91e69 Author: Hans Verkuil Date: Sun Mar 28 08:18:37 2010 -0300 V4L/DVB: v4l videobuf: rename .vmalloc to .vaddr Rename the .vmalloc op in struct videobuf_qtype_ops to .vaddr. This op returns the virtual kernel address of a buffer. vaddr is a lot less confusing than vmalloc since this callback does do any allocations. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a4cf4cac2979a828e7cd0a3cd02d7a5308a44a7f Author: Hans Verkuil Date: Sun Mar 28 08:09:44 2010 -0300 V4L/DVB: v4l videobuf: use struct videobuf_buffer * instead of void * for videobuf_alloc videobuf_alloc() returned a void *. Change to struct videobuf_buffer * to get better type checking. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 63e424856b4ab0652c58f75a2d2ecb9c1f95db27 Author: Hans Verkuil Date: Sun Mar 28 07:59:11 2010 -0300 V4L/DVB: v4l videobuf: remove unused is_mmapped field Thanks to Pawel Osciak for noticing this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 53aaf07637baae8f53c33b803bbc96047d8da1c4 Author: Hans Verkuil Date: Sun Mar 28 07:54:29 2010 -0300 V4L/DVB: v4l videobuf: remove mmap_free callback Remove the mmap_free callback from struct videobuf_qtype_ops. All implementations of this callback do the same trivial check: return -EBUSY if any buffer is mmapped. That can also be tested in the videobuf core. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 33435167e6dc9e23a97a494cec6b8ca47f8ded75 Author: Hans Verkuil Date: Sun Mar 28 07:34:18 2010 -0300 V4L/DVB: v4l videobuf: remove unused mmap callback The mmap callback in struct videobuf_qtype_ops is never used. Remove. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c590402becc6e3c55fee14c7c18a796c91a4bc4f Author: Mauro Carvalho Chehab Date: Thu Apr 22 17:09:18 2010 -0300 V4L/DVB: Add firmware v2.4 to xc2028/xc3028 extracting tool From: Stefan Ringel The firmware were seen to be needed with some tm6000 devices that don't work with version 2.7. Thanks-to: Bee Hock Goh Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit c683357236969c48f7b945fd718f141bf36e8ba2 Author: Mauro Carvalho Chehab Date: Wed Apr 21 11:36:57 2010 -0300 Revert "V4L/DVB: Add FE_CAN_PSK_8 to allow apps to identify PSK_8 capable DVB devices" Patch reverted per Andreas Oberritter request. It is basically not ready yet for upstream merge. This reverts commit 77b2ad374a82e3d740cb1780ff4caedc3e051b37. Signed-off-by: Mauro Carvalho Chehab commit eb78deecb496a8b0888d24f1cfa73f6e907b82e2 Author: Dean Anderson Date: Mon Apr 12 15:05:37 2010 -0300 V4L/DVB: s2255drv: firmware reload on timeout Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit b187913c77adbd865194c6b8072764e3474d56ea Author: Klaus Schmidinger Date: Sun Apr 11 06:12:52 2010 -0300 V4L/DVB: Add FE_CAN_PSK_8 to allow apps to identify PSK_8 capable DVB devices The enum fe_caps provides flags that allow an application to detect whether a device is capable of handling various modulation types etc. A flag for detecting PSK_8, however, is missing. This patch adds the flag FE_CAN_PSK_8 to frontend.h and implements it for the gp8psk-fe.c and cx24116.c driver (apparently the only ones with PSK_8). Only the gp8psk-fe.c has been explicitly tested, though. Signed-off-by: Klaus Schmidinger Tested-by: Derek Kelly Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit dd3f616d4b60a50328be152f66c93bd451461a39 Author: David Härdeman Date: Thu Apr 15 18:46:35 2010 -0300 V4L/DVB: ir-core: fix some confusing comments Fix some confusing comments in drivers/media/IR/* Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 42880cd438d6e74b6005648a7dc06867d4b30b44 Author: Mauro Carvalho Chehab Date: Tue May 18 02:06:06 2010 -0300 V4L/DVB: ir-core: fix table resize during keymap init drivers/media/IR/ir-keytable.c would alloc a suitably sized keymap table only to have it resized as it is populated with the initial keymap. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit d46844300ccd99444d32e481751b6508c8c7834e Author: David Härdeman Date: Thu Apr 15 18:46:25 2010 -0300 V4L/DVB: ir-core: fix double spinlock init in drivers/media/IR/rc-map.c Fix a double initialization of the same spinlock in drivers/media/IR/rc-map.c. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 15100d891a53ffc717cec21d805f8c49db51fb65 Author: David Härdeman Date: Thu Apr 15 18:46:15 2010 -0300 V4L/DVB: ir-core: remove ir-functions usage from dm1105 Convert drivers/media/dvb/dm1105/dm1105.c to not rely on ir-functions.c. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 1f71baef3edd8ba27f38f92da457950e52d88b5f Author: Mauro Carvalho Chehab Date: Tue Apr 20 19:11:30 2010 -0300 V4L/DVB: irmon: Cleanup some warning noise Driver is not properly initializing u64 constants on 32 bit systems: drivers/media/IR/imon.c:301: warning: integer constant is too large for ‘long’ type drivers/media/IR/imon.c:302: warning: integer constant is too large for ‘long’ type drivers/media/IR/imon.c:304: warning: integer constant is too large for ‘long’ type drivers/media/IR/imon.c:305: warning: integer constant is too large for ‘long’ type drivers/media/IR/imon.c:308: warning: integer constant is too large for ‘long’ type drivers/media/IR/imon.c:309: warning: integer constant is too large for ‘long’ type drivers/media/IR/imon.c:310: warning: integer constant is too large for ‘long’ type Fix also a few troubles at error printk handling: drivers/media/IR/imon.c: In function ‘imon_init_intf0’: drivers/media/IR/imon.c:1909: warning: ‘ret’ may be used uninitialized in this function drivers/media/IR/imon.c: In function ‘imon_init_intf1’: drivers/media/IR/imon.c:1989: warning: ‘ret’ may be used uninitialized in this function Cc: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 3fe29c897272b18e18663832c43942c3936dffe6 Author: David Härdeman Date: Thu Apr 15 18:46:10 2010 -0300 V4L/DVB: ir-core: Add Sony support to ir-core This patch adds a Sony12/15/20 decoder to ir-core. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit bf670f641d478fa5a2dd60ed41bab3156cc780c0 Author: David Härdeman Date: Thu Apr 15 18:46:05 2010 -0300 V4L/DVB: ir-core: Add JVC support to ir-core This patch adds a JVC decoder to ir-core. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 384f23e8c9b189888d6d8c84ae5ebd23b074a0b6 Author: Mauro Carvalho Chehab Date: Tue Apr 20 18:50:54 2010 -0300 V4L/DVB: ir-core-priv.h: Fix a few CodingStyle errors As reported by checkpatch.pl: ERROR: open brace '{' following function declarations go on the next line +static inline bool geq_margin(unsigned d1, unsigned d2, unsigned margin) { ERROR: open brace '{' following function declarations go on the next line +static inline bool eq_margin(unsigned d1, unsigned d2, unsigned margin) { ERROR: open brace '{' following function declarations go on the next line +static inline bool is_transition(struct ir_raw_event *x, struct ir_raw_event *y) { Cc: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit e40b1127f994a427568319d1be9b9e5ab1f58dd1 Author: David Härdeman Date: Thu Apr 15 18:46:00 2010 -0300 V4L/DVB: ir-core: change duration to be coded as a u32 integer This patch implements the agreed upon 1:31 integer encoded pulse/duration struct for ir-core raw decoders. All decoders have been tested after the change. Comments are welcome. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 21677cfc562a27e099719d413287bc8d1d24deb7 Author: Jarod Wilson Date: Fri Apr 16 18:29:02 2010 -0300 V4L/DVB: ir-core: add imon driver This is a new driver for the SoundGraph iMON and Antec Veris IR/display devices commonly found in many home theater pc cases and as after-market case additions. [mchehab@redhat.com: add KERN_CONT on line 2098 to shutup checkpatc.pl] Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 1159f838c0a334855c05c7c94f7a20799c57442d Author: Jarod Wilson Date: Fri Apr 16 18:28:35 2010 -0300 V4L/DVB: ir-core: add imon pad and mce keymaps This adds the keymaps for the hardware decode scancodes imon devices create for their native imon pad (and mini) remotes, and the hardware scancodes generated by the imon devices when used with an rc6 windows media center ed. remote. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 1c0e0ee580c476234b5ea410f5263fcb27d96389 Author: Jarod Wilson Date: Fri Apr 16 18:27:58 2010 -0300 V4L/DVB: ir-core: make ir_g_keycode_from_table a public function The imon driver I've previously submitted and have been porting to use ir-core needs to use ir_g_keycode_from_table, as ir_keydown is not sufficient, due to these things having really oddball hardware decoders in them. This just moves the function declaration from ir-core-priv.h over to ir-core.h. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit d62e85a0949d2b899405a1ffbae06615227d4c97 Author: Dean Anderson Date: Fri Apr 9 19:54:26 2010 -0300 V4L/DVB: s2255drv: removes kref tracking and videodev parent kref replaced as suggested in code review uses atomic variable to track when it is ok to delete device removes setting of video device parent, which is now handled in v4l2_device.c Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 65c6edb300ee5c2aaac6d20c5fc8d11c3827593e Author: Dean Anderson Date: Tue Apr 20 17:21:32 2010 -0300 V4L/DVB: s2255drv: fix: v4l2_dev should be registered once only. usb_set_intfdata should not be used when using v4l2_device_register and a non-NULL argument for the device. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 108bdd7ad778ac4616857820cbbc17924073a7d5 Author: Joe Perches Date: Mon Apr 5 16:05:39 2010 -0300 V4L/DVB: pvrusb2-v4l2: Rename dev_info to pdi There is a macro called dev_info that prints struct device specific information. Having variables with the same name can be confusing and prevents conversion of the macro to a function. Rename the existing dev_info variables to something else in preparation to converting the dev_info macro to a function. Signed-off-by: Joe Perches Acked-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 09bd00e7e12bbc9ca0ba20e0511995cddd3c93b9 Author: Mauro Carvalho Chehab Date: Sun Apr 11 00:26:23 2010 -0300 ir-core: Fix the delete logic Instead of removing an entry, the logic were doing both a deletion and a key addition, as shown by the log: [11517.323314] ir_getkeycode: unknown key for scancode 0x0050 [11517.326529] ir_do_setkeycode: #80: Deleting scan 0x0050 [11517.326529] ir_do_setkeycode: #80: New scan 0x0050 with key 0x0000 [11517.340598] ir_getkeycode: unknown key for scancode 0x0051 [11517.343811] ir_do_setkeycode: #81: Deleting scan 0x0051 [11517.343811] ir_do_setkeycode: #81: New scan 0x0051 with key 0x0000 [11517.357889] ir_getkeycode: unknown key for scancode 0x0052 [11517.361104] ir_do_setkeycode: #82: Deleting scan 0x0052 [11517.361104] ir_do_setkeycode: #82: New scan 0x0052 with key 0x0000 [11517.375453] ir_getkeycode: unknown key for scancode 0x0053 [11517.378474] ir_do_setkeycode: #83: Deleting scan 0x0053 [11517.378474] ir_do_setkeycode: #83: New scan 0x0053 with key 0x0000 Signed-off-by: Mauro Carvalho Chehab commit 3efaa062a9bd1cd41c4901b8f41718410452499c Author: Mauro Carvalho Chehab Date: Sat Apr 10 23:43:39 2010 -0300 ir-core: Remove the quotation mark from the uevent names There's no need to use quotation marks at the uevent names for the driver and table. Signed-off-by: Mauro Carvalho Chehab commit 897c7b3b19cca7aad20bb1a3422553d7b646f2fd Author: Mauro Carvalho Chehab Date: Fri Apr 9 09:20:11 2010 -0300 V4L/DVB: ir Kconfig: better describe the options Signed-off-by: Mauro Carvalho Chehab commit f35473e6f556b48ebf1a105ce27ed5ec1c81844b Author: Mauro Carvalho Chehab Date: Fri Apr 9 09:17:02 2010 -0300 V4L/DVB: ir-core-priv: fix a typo for RC6 config option As Adreas pointed, RC6 should use CONFIG_IR_RC6_DECODER_MODULE, instead of the RC5 config option. Thanks-to: Andreas Oberitter Acked-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit af9d9cfd54091e8916b8892aaf40812345aac6d3 Author: Mauro Carvalho Chehab Date: Fri Apr 9 01:57:21 2010 -0300 V4L/DVB: tm6000: fix compilation due to the lack of a semicolon Add a missing semicolon to fix this error: In file included from drivers/staging/tm6000/tm6000-cards.c:32: drivers/staging/tm6000/tm6000.h:123: error: two or more data types in declaration specifiers Signed-off-by: Mauro Carvalho Chehab commit 5624c64803dd7c6da7add5a1880d66dbf2df8dc5 Author: Jean-François Moine Date: Fri Apr 2 07:12:42 2010 -0300 V4L/DVB: gspca - vc032x: Change the ov7670 format to YUYV Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c26b12d0646e0f571389a0a990882af3732b26a8 Author: Jean-François Moine Date: Fri Apr 2 07:08:39 2010 -0300 V4L/DVB: gspca - sonixj: Add autogain for sensor gc0307 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 73e4934c80338757dca46ffaa30a3443a31043fb Author: Jean-François Moine Date: Fri Apr 2 07:05:59 2010 -0300 V4L/DVB: gspca - sonixj: Let the JPEG header in the device Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 27c6f9e548633f148a45a138f2d6d0e513514172 Author: Jean-François Moine Date: Fri Apr 2 06:59:13 2010 -0300 V4L/DVB: gspca: Change some copyrights and module authors Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c16dd82b4858b4a01ccce5c0a56ba58993802700 Author: Bee Hock Goh Date: Wed Apr 7 20:57:19 2010 -0300 V4L/DVB: TM6000: Fix code which cause memory corruption The driver was doing malloc when buf is null causing memory corruption. The analog part is still pretty much broken but at least fixing this will stop it from crashing the machine when streamon. Signed-off-by: Bee Hock Goh Signed-off-by: Mauro Carvalho Chehab commit 4d1f413e820c7e1402475eea254e2bc82d98de35 Author: HIRANO Takahito Date: Wed Apr 7 11:48:48 2010 -0300 V4L/DVB: pt1: Support Earthsoft PT2 Support Earthsoft PT2. Signed-off-by: HIRANO Takahito Signed-off-by: Mauro Carvalho Chehab commit 2f7908848642c177b16b71a2ed52b57d614637ef Author: Stefan Ringel Date: Fri Apr 2 13:52:49 2010 -0300 V4L/DVB: tm6000: request labeling board version check request labeling board version check Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit f1434f4e90cec0bc57616c2f5f7de6985d7920d9 Author: Stefan Ringel Date: Fri Apr 2 13:52:50 2010 -0300 V4L/DVB: tm6000: tm6000_i2c_xfer: request labeling labeling the request after tuner reading and writeing Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit a41b2ea73ad81bb42364841b37d4c3830a53dc0d Author: Dan Carpenter Date: Fri Apr 2 08:31:50 2010 -0300 V4L/DVB: cx88: improve error handling Return -EINVAL if we don't find the right query control id. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 8e47567f7d24346980f109d7eaed083106ff170d Author: Dan Carpenter Date: Fri Apr 2 08:30:10 2010 -0300 V4L/DVB: cx231xx: improve error handling Return -EINVAL if we don't find the control id. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit f76280154cdbb0ad02d5402972d1eb85f9e2898a Author: Randy Dunlap Date: Tue Mar 30 14:32:04 2010 -0300 V4L/DVB: [-next] gspca: fix build for INPUT=m or INPUT=n Handle case of GSPCA=m, INPUT=m when building gspca core; also handle case of INPUT=n by using stubs. drivers/media/video/gspca/gspca.c:662: error: implicit declaration of function 'gspca_input_destroy_urb' drivers/media/video/gspca/gspca.c:668: error: implicit declaration of function 'gspca_input_create_urb' drivers/media/video/gspca/gspca.c:2284: error: implicit declaration of function 'gspca_input_connect' Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit b400f09246247e2c55b116bd7b71da4fb0cb19dc Author: Dmitri Belimov Date: Tue Mar 30 03:02:17 2010 -0300 V4L/DVB: Fix default state Beholder H6 tuner The hybrid tuner FMD1216MEX_MK3 after cold start has disabled IF. This tuner has internal I2C switch. This switch switch I2C bus between DVB-T and IF part. Default state is DVB-T. When module saa7134 is load it can't find IF tda9887 and disable analog TV mode. Sets internal I2C switch of the tuner to IF by send special value to the tuner as for receive analog TV from low band. It can be usefule for other cards. I didn't set configure a tuner by a tuner model because this tuner can have different I2C address. May be we can do it later after discuss for more robust support a tuners. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit b57f432c28403b53a298803272b874c1c333f22e Author: Stefan Ringel Date: Mon Mar 29 13:51:12 2010 -0300 V4L/DVB: tm6000: add gpios for tm6010 generic board Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 2edab1ee86e5aff83404d6a42b6c54d40981faae Author: Stefan Ringel Date: Mon Mar 29 13:51:11 2010 -0300 V4L/DVB: tm6000: add gpios to board struct Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 32a2232bfd6a5eda4f4d6977ebf68ce9d2408e9b Author: Stefan Ringel Date: Mon Mar 29 13:51:10 2010 -0300 V4L/DVB: tm6000: switch to gpio strcut switch to a gpio structure Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 124371e33ce733a81fde8419946adb0d6c14f4c0 Author: Dan Carpenter Date: Sun Mar 28 08:50:05 2010 -0300 V4L/DVB: video/sn9c102: improve error handling Return an error if the controller is not found. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 67e13e7709736b3b25dda98f92cc7164b210dda6 Author: Dan Carpenter Date: Sun Mar 28 08:49:45 2010 -0300 V4L/DVB: video/et61x251: improve error handling The original code doesn't handle the situation where the controller is not found. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit f24350b48eed2d5518a5f0c2c95d51a655387457 Author: Dan Carpenter Date: Sun Mar 28 08:49:20 2010 -0300 V4L/DVB: video/zc0301: improve error handling Return an error if the controller is not found. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit a9fac6b1487aea9f5aaefe93def522fab477f5dc Author: Dan Carpenter Date: Sun Mar 28 08:29:35 2010 -0300 V4L/DVB: video/cx231xx: cleanup. remove unneed null checks "dev" is never NULL here so there is no need to check. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 3a67b5cc6f6ae37500b8f41fd52628395f7276a8 Author: Dean Anderson Date: Thu Apr 8 23:52:20 2010 -0300 V4L/DVB: s2255drv: adding v4l2_device structure. video_register_device cleanup adding v4l2_device structure. if one video_register_device call fails, allows use of other devices or channels. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 85b85482c243398839564d5f95d75f479bed591c Author: Dean Anderson Date: Thu Apr 8 23:51:17 2010 -0300 V4L/DVB: s2255drv: cleanup of debug messages Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit a5ef91c9a55c89e8c57e628d371107cdfe2d0bd9 Author: Dean Anderson Date: Thu Apr 8 23:46:08 2010 -0300 V4L/DVB: s2255drv: removal of big kernel lock big kernel lock removed from open function. v4l2 code does not require locking the open function except to check asynchronous firmware load state, which is protected by a mutex Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit c0a2ec956d6e61081b6f98b839b0e28979941687 Author: Dean Anderson Date: Thu Apr 8 23:40:31 2010 -0300 V4L/DVB: s2255drv: video_device_alloc call not checked fix call to video_device_alloc was not being checked in probe function. code simplified and uses video_device inside device structure. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit ab85c6a33c7168cc42ce12ac3335c2f12d5a8d22 Author: Dean Anderson Date: Thu Apr 8 23:39:12 2010 -0300 V4L/DVB: s2255drv: code cleanup removal of unused pipe array (of size one). Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit ff7e22dfa1b8c291f154db990ff686adbe334448 Author: Dean Anderson Date: Thu Apr 8 23:38:07 2010 -0300 V4L/DVB: s2255drv: cleanup of driver disconnect code simplifies use of kref in driver Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit f5e20c34e9c1bcf9e92f2634411bffd98511fc48 Author: Dan Carpenter Date: Sun Mar 28 08:21:18 2010 -0300 V4L/DVB: video/au0828: off by one bug The "AUVI_INPUT(tmp)" macro uses "tmp" as an index of an array with AU0828_MAX_INPUT elements. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 6e1f4df7da6edd21a184daff023a8eef67f005dc Author: istvan_v@mailbox.hu Date: Sat Mar 27 09:31:32 2010 -0300 V4L/DVB: cx88: fix checks for analog TV inputs The following patch fixes code that checks for CX88_VMUX_TELEVISION, but not CX88_VMUX_CABLE. This prevented for example the audio standard from being set when using the cable input. Signed-off-by: Istvan Varga Signed-off-by: Mauro Carvalho Chehab commit 10f1a6e8eda5cccc2753955ae81fa217d75bf68d Author: Christoph Fritz Date: Wed Mar 24 22:40:41 2010 -0300 V4L/DVB: pwc Kconfig dependency fix makes USB_PWC_INPUT_EVDEV to depend also on USB_PWC Signed-off-by: Christoph Fritz Signed-off-by: Mauro Carvalho Chehab commit dd0bbcc626d8baa6821c6cb9c45ecf3759ef8088 Author: Bjørn Mork Date: Wed Mar 24 10:30:15 2010 -0300 V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference" Never call dvb_frontend_detach if we failed to attach a frontend. This fixes the following oops: [ 8.172997] DVB: registering new adapter (TT-Budget S2-1600 PCI) [ 8.209018] adapter has MAC addr = 00:d0:5c:cc:a7:29 [ 8.328665] Intel ICH 0000:00:1f.5: PCI INT B -> GSI 17 (level, low) -> IRQ 17 [ 8.328753] Intel ICH 0000:00:1f.5: setting latency timer to 64 [ 8.562047] DVB: Unable to find symbol stv090x_attach() [ 8.562117] BUG: unable to handle kernel NULL pointer dereference at 000000ac [ 8.562239] IP: [] dvb_frontend_detach+0x4/0x67 [dvb_core] Ref http://bugs.debian.org/575207 Also clean up if we are unable to register the tuner and LNB drivers [mchehab@redhat.com: add printk log level, to calm down chechpatch.pl] Signed-off-by: Bjørn Mork Reported-by: Fladischer Michael Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 784a493168f71ce02b5f9eab0ec19df29b999631 Author: David Härdeman Date: Thu Apr 8 20:04:40 2010 -0300 V4L/DVB: Add RC6 support to ir-core This patch adds an RC6 decoder (modes 0 and 6A) to ir-core. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 25bb10c11e6cca461f09df8f59c2eb501a9e4d52 Author: David Härdeman Date: Thu Apr 8 20:04:35 2010 -0300 V4L/DVB: Add NECx support to ir-core This patch adds NECx support to drivers/media/IR/ir-nec-decoder.c Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 733419b5c4d29186006982a9a27227e214a39dbc Author: David Härdeman Date: Thu Apr 8 20:04:30 2010 -0300 V4L/DVB: Add RC5x support to ir-core This patch adds RC5x support to drivers/media/IR/ir-rc5-decoder.c Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 450df22286eee7431b34644410aeff18936c7afe Author: Nicolas Noirbent Date: Mon Mar 22 14:54:43 2010 -0300 V4L/DVB: ds3000: fix divide-by-zero error in ds3000_read_snr() Fix a divide-by-zero error in ds3000's ds3000_read_snr(), when getting a very low signal reading (dvbs2_signal_reading >= 1). This prevents some nasty EIPs when running szap-s2 with a very low signal strength. Signed-off-by: Nicolas Noirbent Signed-off-by: Mauro Carvalho Chehab commit b4bc3dcbefc0a359744ab13bc8b67c6cb5cd0086 Author: Mauro Carvalho Chehab Date: Thu Apr 8 19:09:13 2010 -0300 V4L/DVB: cpia1: comment unused command_setlights() drivers/media/video/gspca/cpia1.c:1063: warning: ‘command_setlights’ defined but not used Signed-off-by: Mauro Carvalho Chehab commit 5fa2989f78a381ccc1cde219f0a3da942d6c1680 Author: Mauro Carvalho Chehab Date: Thu Apr 8 19:04:06 2010 -0300 V4L/DVB: ir-core: Remove warining noise if decoders compiled builtin drivers/media/IR/ir-raw-event.c:55: warning: ‘wq_load’ defined but not used drivers/media/IR/ir-raw-event.c:222: warning: ‘init_decoders’ defined but not used drivers/media/IR/rc-map.c: In function ‘get_rc_map’: drivers/media/IR/rc-map.c:40: warning: unused variable ‘rc’ Signed-off-by: Mauro Carvalho Chehab commit dab7e3106ddd6cbc3b55301228407b9d17ce7773 Author: Andreas Bombe Date: Sun Mar 21 16:02:45 2010 -0300 V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks Due to obvious copy and paste coding a number of video capture drivers which implement a limit on the buffer memory decremented the user supplied buffer count in a while loop until it reaches an acceptable value. This is a silly thing to do when the maximum value can be directly computed. Signed-off-by: Andreas Bombe Signed-off-by: Mauro Carvalho Chehab commit 0a062033f727dc041691bfd768f4cf0598f559a1 Author: Herton Ronaldo Krzesinski Date: Fri Mar 19 14:58:23 2010 -0300 Revert "V4L/DVB (11906): saa7134: Use v4l bounding/alignment function" This reverts commit bc52d6eb44de8f19934768d4d10d19fdbdc99950. On newer kernels, a saa7134 board stopped to display TV video output properly. After a bisect, I found it as the commit causing the issue. Turns out that v4l_bound_align_image isn't doing the same bounding calculation as manually done previously in saa7134_try_fmt_vid_cap. What isn't equal is the calculation done in clamp align, while previously it did "f->fmt.pix.width &= ~0x03", clamp_align function does "Round to nearest aligned value" as stated in the comment, which yields a different result. If I comment the round calculation in clamp_align like this: "x = (x /*+ (1 << (align - 1))*/) & mask", I get it fixed too, because this way the calculation is the same then. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Mauro Carvalho Chehab commit 2b0691cfc714a0f4dff582c913de1a3a68cb38a7 Author: Wolfram Sang Date: Mon Apr 5 01:14:26 2010 -0300 V4L/DVB: dvb/dib8000: fix build warning In file included from drivers/media/dvb/dvb-usb/dib0700_devices.c:14: drivers/media/dvb/frontends/dib8000.h: In function 'dib8000_get_adc_power': drivers/media/dvb/frontends/dib8000.h:112: warning: no return statement in function returning non-void Fixed by adding a return to the dummy function. Signed-off-by: Wolfram Sang Signed-off-by: Mauro Carvalho Chehab commit d5978ed6b6d3de92dac14032bae0eea64d960f37 Author: Huang Weiyi Date: Thu Apr 8 08:50:17 2010 -0300 V4L/DVB: DVB: ngene, remove unused #include Remove unused #include ('s) in drivers/media/dvb/ngene/ngene-core.c Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit ce68025e9f10481b9104c5bdf88b0dac52790757 Author: Hans Verkuil Date: Tue Apr 6 15:58:53 2010 -0300 V4L/DVB: ivtv: move the _IO() decoder ioctls into vidioc_default Now that video_ioctl2 no longer clobbers the argument for _IO() ioctls we can move these into vidioc_default where they really belong. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6a717883e720f75dec252c8af2a2d6dd049af254 Author: Hans Verkuil Date: Tue Apr 6 15:56:08 2010 -0300 V4L/DVB: video_ioctl2: handle the v4l1 compat bit first and move VIDIOCGMBUF into the switch Try to make a more sensible sequence of events in __video_do_ioctl: first check for a valid ops pointer, then get the compat part done. The VIDIOCGMBUF command is now part of the big switch. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dd1ad942ac0b1bb7f72f9f3d822ec937aa07dc4d Author: Hans Verkuil Date: Tue Apr 6 11:44:39 2010 -0300 V4L/DVB: v4l2-framework.txt: fix incorrect statement After unregister_device all fileops are blocked, except for ioctls. So it is not just the open that is blocked, others are as well. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 626e2acfdce76b5a6a1daa4bc8ef556d507f5941 Author: Hans Verkuil Date: Tue Apr 6 11:36:39 2010 -0300 V4L/DVB: w9966: convert to V4L2 Note that I have not been able to find anyone with this hardware. I tried contacting the author without success, searched on eBay and similar places without luck either. So this conversion is untested. That said, it was pretty straightforward so it is time to have this driver join the V4L2 world at last. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e426e8663f028272b99f91e57bbbab6fda603bf1 Author: Hans Verkuil Date: Tue Apr 6 10:32:19 2010 -0300 V4L/DVB: DocBook/v4l/compat.xml: add missing The indentation of the sections had gone wrong, causing a mistake with section nesting. Fixed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fa0290eaee03c3205cb6d344db25580fb3e5e53e Author: Hans Verkuil Date: Tue Apr 6 08:20:56 2010 -0300 V4L/DVB: usbvision: remove non-working vbi device The usbvision driver created vbi device nodes but the actual implementation was just stubs and only returned errors to userspace. In addition it used video_usercopy() and we want to remove that eventually. So remove all the vbi code except for the vbi flag in the card definition should someone ever be mad enough to work on a proper implementation for this driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3f5e18249ce0d71a900bfdb8df327269483e730d Author: Hans Verkuil Date: Tue Apr 6 08:14:11 2010 -0300 V4L/DVB: video_ioctl2: don't return, use break You want to be able to reach the debug code at the end of this function, so don't use return, use break. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d94aa369da073acff26fa98ad6b2168cb028ab1 Author: Hans Verkuil Date: Tue Apr 6 08:12:21 2010 -0300 V4L/DVB: video_ioctl2: do not replace arg with NULL for _IO() ioctls If the ioctl was defined without direction (e.g. _IO('o', 25)), then the arg as passed to vidioc_default was NULL instead of the original argument. Several ioctls in e.g. include/linux/dvb/video.h and audio.h use this type of ioctl to pass simple numerical values to the driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ea64f8c2204cd8b9a95072c7ef85cc9a120a2693 Author: Hans Verkuil Date: Tue Apr 6 06:53:57 2010 -0300 V4L/DVB: videodev2.h: move definition of enum v4l2_ctrl_type to the other control types For some reason the definition of enum v4l2_ctrl_type is far from the place where it is actually needed. This makes it hard to work with this header. Move it to just before struct v4l2_queryctrl, which is the one that actually uses it. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 860553023bfed0179b3fe5d01838635f54a314a3 Author: Hans Verkuil Date: Tue Apr 6 06:41:28 2010 -0300 V4L/DVB: V4L2 Spec: fix V4L2_CTRL_TYPE_CTRL_CLASS documentation The spec says that the control ID for these types of controls is the same as that of the control class. But it should read: 'control class + 1'. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2b080c5df00e431baec09222aa8d623f0cd77314 Author: Dan Carpenter Date: Wed Apr 7 06:21:05 2010 -0300 V4L/DVB: davinci: don't return under lock on error path If the kmalloc() failed for "ccdc_cfg = kmalloc(...);" then we would exit with the lock held. I moved the mutex_lock() below the allocation because it isn't protecting anything in that block and allocations are allocations are sometimes slow. Signed-off-by: Dan Carpenter Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit 3f113e36106f133752de47208816b28aa8e60f88 Author: Mauro Carvalho Chehab Date: Thu Apr 8 15:10:27 2010 -0300 V4L/DVB: ir-core: move subsystem internal calls to ir-core-priv.h ir-core.h has the kABI to be used by the bridge drivers, when needing to register IR protocols and pass IR events. However, the same file also contains IR subsystem internal calls, meant to be used inside ir-core and between ir-core and the raw decoders. Better to move those functions to an internal header, for some reasons: 1) Header will be a little more cleaner; 2) It avoids the need of recompile everything (bridge/hardware drivers, etc), just because a new decoder were added, or some other internal change were needed; 3) Better organize the ir-core API, splitting the functions that are internal to IR core and the ancillary drivers (decoders, lirc_dev) from the features that should be exported to IR subsystem clients. Signed-off-by: Mauro Carvalho Chehab commit 724e2495502a98aaa3f93c404472a991da8ff857 Author: David Härdeman Date: Thu Apr 8 13:10:00 2010 -0300 V4L/DVB: Teach drivers/media/IR/ir-raw-event.c to use durations drivers/media/IR/ir-raw-event.c is currently written with the assumption that all "raw" hardware will generate events only on state change (i.e. when a pulse or space starts). However, some hardware (like mceusb, probably the most popular IR receiver out there) only generates duration data (and that data is buffered so using any kind of timing on the data is futile). Furthermore, using signed int's to represent pulse/space durations is a well-known approach when writing ir decoders. With this patch: - s64 int's are used to represent pulse/space durations in ns - a workqueue is used to decode the ir protocols outside of interrupt context - #defines are added to make decoders clearer - decoder reset is implemented by passing a zero duration to the kfifo queue and decoders are updated accordingly Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit d22e546ea18ee66c255af906f2714d3ee82d4b42 Author: Mauro Carvalho Chehab Date: Thu Apr 8 09:33:45 2010 -0300 V4L/DVB: ir-core: fix gcc warning noise drivers/media/IR/ir-sysfs.c: In function ‘store_protocol’: drivers/media/IR/ir-sysfs.c:93: warning: suggest parentheses around assignment used as truth value Signed-off-by: Mauro Carvalho Chehab commit b320f80a6a02bbf31f7ed6ab3332f7c4ebaaac2c Author: Mauro Carvalho Chehab Date: Thu Apr 8 01:02:49 2010 -0300 V4L/DVB: ir-core: properly present the supported and current protocols Hardware decoders have a more limited set of decoders than software ones. In general, they support just one protocol at a given time, but allow changing between a few options. Rename the previous badly named "current_protocol" as just "protocol", meaning the current protocol(s) accepted by the driver, and add a "support_protocols" to represent the entire universe of supported protocols by that specific hardware. As commented on http://lwn.net/Articles/378884/, the "one file, one value" rule doesn't fit nor does make much sense for bitmap or enum values. So, the supported_protocols will enum all supported protocols, and the protocol will present all active protocols. Signed-off-by: Mauro Carvalho Chehab commit 626cf6979e99bf2c642456308bed7bb25a37569b Author: Mauro Carvalho Chehab Date: Tue Apr 6 23:21:46 2010 -0300 V4L/DVB: ir-core: Distinguish sysfs attributes for in-hardware and raw decoders Some devices have in-hardware Remote Controller decoder, while others need a software decoder to get the IR code. As each software decoder can be enabled/disabled individually, allowing multiple protocol decoding capability. On the other hand, hardware decoders have a limited protocol support, often being able of decoding just one protocol each time. So, each type needs a different set of capabilities to control the supported protocol(s). Signed-off-by: Mauro Carvalho Chehab commit de88f31cef8fee7c890cf2128bec8dae06bb20f2 Author: David Härdeman Date: Sun Mar 28 18:38:49 2010 -0300 V4L/DVB: rename sysfs remote controller devices from rcrcv to rc When the remote controller class is anyway being renamed from ir to rc this would be a good time to also rename the devices from rcrcvX to rcX. I know we haven't reached any agreement on whether transmission will eventually be handled by the same device, but this change will at least make the device name non-receive-specific which will make it possible in the future (and if a different approach is finally agreed upon, the device name still works). Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 6eb9435b874ae5ff56d56952167a8e9be5c5deeb Author: Mauro Carvalho Chehab Date: Wed Apr 7 16:19:36 2010 -0300 V4L/DVB: ir: Make sure that the spinlocks are properly initialized Some spinlocks are not properly initialized on ir core: [ 471.714132] BUG: spinlock bad magic on CPU#0, modprobe/1899 [ 471.719838] lock: f92a08ac, .magic: 00000000, .owner: /-1, .owner_cpu: 0 [ 471.727301] Pid: 1899, comm: modprobe Not tainted 2.6.33 #36 [ 471.733062] Call Trace: [ 471.735537] [] ? printk+0x1d/0x22 [ 471.739866] [] spin_bug+0xa3/0xf0 [ 471.744224] [] do_raw_spin_lock+0x7d/0x160 [ 471.749364] [] ? ir_rc5_register+0x6f/0xf0 [ir_rc5_decoder] So, use static initialization for the static spinlocks, instead of the dynamic ones (currently used), as proposed by David Härdeman on one of his RFC patches. Signed-off-by: Mauro Carvalho Chehab commit c373cabfbbb7631526003f17d470c0d1e5915a4c Author: Mauro Carvalho Chehab Date: Wed Apr 7 22:57:04 2010 -0300 V4L/DVB: em28xx: fix a regression caused by the rc-map changes The patch that adds the rc-map changes didn't take into account that an a table with IR_TYPE_UNKNOWN would make change_protocol to return -EINVAL. As this function is fundamental to initialize some data, including a callback to the getkey function, this caused the driver to stop working, hanging the machine most of the times. The fix were simply to add a handler for the IR type, but, to avoid further issues, explicitly call change_protocol and handle the error before initializing the IR. Also, let input_dev to start/stop IR handling, after the opening of the input device. Signed-off-by: Mauro Carvalho Chehab commit 9b09df51b8c2b4615376e5ada3e2eb7eeed3cf5d Author: Mauro Carvalho Chehab Date: Tue Apr 6 02:29:42 2010 -0300 V4L/DVB: ir-rc5-decoder: fix state machine Reimplement the RC-5 decoder state machine. Code is now clear, and works properly. It is also simpler than the previous implementations. Signed-off-by: Mauro Carvalho Chehab commit 7f20d32d446097789ade5ada6b645742ddac4ece Author: Mauro Carvalho Chehab Date: Sun Apr 4 14:45:04 2010 -0300 V4L/DVB: re-add enable/disable check to the IR decoders A previous cleanup patch removed more than needed. Re-add the logic that disable the decoders. Signed-off-by: Mauro Carvalho Chehab commit 9dfe4e8339499bfe8e9a362fefc290b4cb9c3803 Author: Mauro Carvalho Chehab Date: Sun Apr 4 14:06:55 2010 -0300 V4L/DVB: ir-core: Add support for badly-implemented hardware decoders A few hardware Remote Controller decoders, even using a standard protocol, aren't able to provide the entire scancode. Due to that, the capability of using other IR's are limited on those hardware. Adds a way to indicate to ir-core what are the bits that the hardware provides, from a scancode, allowing the addition of a complete IR table to the kernel and allowing a limited support for changing the Remote Controller on those devices. Signed-off-by: Mauro Carvalho Chehab commit 4f9256b496677adf799342cee7d406dd46e566d9 Author: Mauro Carvalho Chehab Date: Sun Apr 4 12:38:57 2010 -0300 V4L/DVB: ir-core: move rc map code to rc-map.h The keymaps don't need to be recompiled every time a change at ir-core.h happens, since it only depends on rc-map defines. By moving those definitions to the proper header, the code became cleaner, and avoids needing to recompile all the RC maps every time a non-related change is introduced. Signed-off-by: Mauro Carvalho Chehab commit 587835a4b0ada7d78c4f3300e3ab26b7b2495705 Author: Mauro Carvalho Chehab Date: Sun Apr 4 10:44:51 2010 -0300 V4L-DVB: ir-core: remove the ancillary buffer Now that the decoders are state machine, there's no need to create an ancillary buffer while decoding the protocol. Just call the decoders code directly, event by event. Signed-off-by: Mauro Carvalho Chehab commit 26d5683d36729f11f5764909ae37c69488596d36 Author: Mauro Carvalho Chehab Date: Sun Apr 4 10:32:04 2010 -0300 V4L/DVB: cx88: don't handle IR on Pixelview too fast Signed-off-by: Mauro Carvalho Chehab commit db1423a6c79f66db2b1846614c13bde9c2db7ad2 Author: Mauro Carvalho Chehab Date: Sun Apr 4 10:27:20 2010 -0300 V4L-DVB: ir-rc5-decoder: Add a decoder for RC-5 IR protocol This decoder is also based on a state machine, just like the NEC protocol decoder. It is pedantic in the sense that accepts only 14 bits. As there are some variants that outputs less bits, it needs to be improved to also handle those. Signed-off-by: Mauro Carvalho Chehab commit 67780d6a2347d03b640f22295f8df7f00fbc829f Author: Mauro Carvalho Chehab Date: Sat Apr 3 20:33:00 2010 -0300 V4L/DVB: ir-nec-decoder: Cleanups Remove dead code and properly name a few constants Signed-off-by: Mauro Carvalho Chehab commit 2f16f6315f583964732bc23c873d4024281d763c Author: Mauro Carvalho Chehab Date: Sat Apr 3 18:51:50 2010 -0300 V4L/DVB: ir-nec-decoder: Reimplement the entire decoder Thanks to Andy Walls for pointing me his code, that gave me some ideas to better implement it. After some work with saa7134 bits, I found a way to catch both IRQ edge pulses. By enabling it, the NEC decoder can now take both pulse and spaces into account, making it more precise. Instead of the old strategy of handling the events all at once, this code implements a state machine. Due to that, it handles individual pulse or space events, validating them against the protocol, producing a much more reliable decoding. With the new implementation, the protocol trailer bits are properly handled, making possible for the repeat key to work. Also, the code is now capable of handling both NEC and NEC extended IR devices. With NEC, it produces a 16 bits code, while with NEC extended, a 24 bits code is returned. Signed-off-by: Mauro Carvalho Chehab commit 13c24497086418010bf4f76378bcae241d7f59cd Author: David Härdeman Date: Fri Apr 2 15:58:30 2010 -0300 V4L/DVB: Convert drivers/media/dvb/ttpci/budget-ci.c to use ir-core Converts drivers/media/dvb/ttpci/budget-ci.c to use ir-core rather than rolling its own keydown timeout handler and reporting keys via drivers/media/IR/ir-functions.c. [mchehab@redhat.com: Drop the call to ir_input_init() as it is no longer needed] Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit a374fef4437abd0a1ee27afe0cca7a55425c1c3c Author: David Härdeman Date: Fri Apr 2 15:58:29 2010 -0300 V4L/DVB: ir-core: improve keyup/keydown logic Rewrites the keyup/keydown logic in drivers/media/IR/ir-keytable.c. All knowledge of keystates etc is now internal to ir-keytable.c and not scattered around ir-raw-event.c and ir-nec-decoder.c (where it doesn't belong). In addition, I've changed the API slightly so that ir_input_dev is passed as the first argument rather than input_dev. If we're ever going to support multiple keytables we need to move towards making ir_input_dev the main interface from a driver POV and obscure away the input_dev as an implementational detail in ir-core. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 354389467b6b2a3b36666b6e933d78bbd9e23577 Author: Mauro Carvalho Chehab Date: Sat Apr 3 16:53:16 2010 -0300 V4L/DVB: ir-core: re-add some debug functions for keytable changes Signed-off-by: Mauro Carvalho Chehab commit b3074c0a3f020766c05c1249a31212bff4a77bea Author: David Härdeman Date: Fri Apr 2 15:58:28 2010 -0300 V4L/DVB: drivers/media/IR - improve keytable code The attached patch rewrites much of the keytable code in drivers/media/IR/ir-keytable.c. The scancodes are now inserted into the array in sorted order which allows for a binary search on lookup. The code has also been shrunk by about 150 lines. In addition it fixes the following bugs: Any use of ir_seek_table() was racy. ir_dev->driver_name is leaked between ir_input_register() and ir_input_unregister(). ir_setkeycode() unconditionally does clear_bit() on dev->keybit when removing a mapping, but there might be another mapping with a different scancode and the same keycode. This version has been updated to incorporate patch feedback from Mauro Carvalho Chehab. [mchehab@redhat.com: Fix a conflict with RC keytable breakup patches and input changes] Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit bdf1c98e4205832c07d6dedbfd0ec6eab83df358 Author: Mauro Carvalho Chehab Date: Sat Apr 3 11:26:01 2010 -0300 V4L/DVB: saa7134: Add support for both positive and negative edge IRQ The code that enables IRQ for the Remote Controller on saa7134 is a little messy: it is outside saa7134-input, it checks if RC is GPIO based, and it mixes both serial raw decode with parallel reads from a hardware-based IR decoder. Also, currently, it doesn't allow to trigger both transition edges at GPIO16 and GPIO18 lines. A rework on the code is needed to provide a better way to specify what saa7134-input needs, maybe even moving part of the code from saa7134-core and saa7134-cards into saa7134-input. Yet, as a large rework is happening at RC core, it is better to wait until the core changes stablize, in order to rework saa7134 RC internals.While this don't happen, let's just change the logic a little bit to allow enabling IRQ to be generated on both edge transitions, in order to better support pulse/space raw decoders. Signed-off-by: Mauro Carvalho Chehab commit 3629e1dadff88d22f35f88d53edbac14fd8931de Author: Mauro Carvalho Chehab Date: Sat Apr 3 01:43:36 2010 -0300 V4L/DVB: saa7134: Fix IRQ2 bit names for the register map There's an error at the IRQ2 bit map registers. Also, it doesn't show what bits are needed for positive and for negative edge. In the case of IR raw decoding, for some protocols, it is important to detect both positive and negative edges. So, a latter patch will need to use the other values. Also, the code that detects problems on IRQ handling is incomplete, as it disables only one of the IRQ bits for GPIO16 and GPIO18. Signed-off-by: Mauro Carvalho Chehab commit bd7261d3d7dfe61e8bf8945051c1905ba4dba3b5 Author: Mauro Carvalho Chehab Date: Fri Apr 2 20:11:45 2010 -0300 V4L/DVB: ir-common: remove keymap tables from the module Now that the remote keymaps were broken into separate modules, get rid of the keycode tables that were hardcoded into ir-common. Signed-off-by: Mauro Carvalho Chehab commit 02858eedcb78a664215b918d98cdb753ce432ce6 Author: Mauro Carvalho Chehab Date: Fri Apr 2 20:01:00 2010 -0300 V4L/DVB: ir-core: Make use of the new IR keymap modules Instead of using the ugly keymap sequences, use the new rc-*.ko keymap files. For now, it is still needed to have one keymap loaded, for the RC code to work. Later patches will remove this depenency. Signed-off-by: Mauro Carvalho Chehab commit b2245ba1644eb1eba400fd04c6e7bb3ab2d4a8fa Author: Mauro Carvalho Chehab Date: Fri Apr 2 13:18:42 2010 -0300 V4L/DVB: ir: prepare IR code for a parameter change at register function A latter patch will reuse the ir_input_register with a different meaning. Before it, change all occurrences to a temporary name. Signed-off-by: Mauro Carvalho Chehab commit 6686fa6917caaaaf3d595df6accedb87607517c9 Author: Mauro Carvalho Chehab Date: Fri Apr 2 03:05:46 2010 -0300 V4L/DVB: Break Remote Controller keymaps into modules The original Remote Controller approach were very messy: a big file, that were part of ir-common kernel module, containing 64 different RC keymap tables, used by the V4L/DVB drivers. Better to break each RC keymap table into a separate module, registering them into rc core on a process similar to the fs/nls tables. As an userspace program is now in charge of loading those tables, adds an option to allow the complete removal of those tables from kernelspace. Yet, on embedded devices like Set Top Boxes and TV sets, maybe the only available input device is the IR. So, we should keep allowing the usage of in-kernel tables, but a latter patch should change the default to 'n', after giving some time for distros to add the v4l-utils with the ir-keytable program, to allow the table load via userspace. Signed-off-by: Mauro Carvalho Chehab commit 9ce50c1a5faad80cf6100ea4e8970416ee3b8b59 Author: Mauro Carvalho Chehab Date: Fri Apr 2 02:33:35 2010 -0300 V4L/DVB: ir-core: Add support for RC map code register Instead of having all RC tables hardcoded on one file with all tables there, add infrastructure for registering and dynamically load the table(s) when needed. Signed-off-by: Mauro Carvalho Chehab commit 77b7422d48cda9b8e5dabb7f4bc056861c5ed4fe Author: Mauro Carvalho Chehab Date: Thu Apr 1 22:43:29 2010 -0300 V4L/DVB: ir-common: move IR tables from ir-keymaps.c to a separate file Instead of having one big file with lots of keytables, create one include file for each IR keymap. Signed-off-by: Mauro Carvalho Chehab commit dce4a3e3b228fd31bcfd2d84e673bc08b553e6cc Author: Mauro Carvalho Chehab Date: Thu Apr 1 22:23:38 2010 -0300 V4L/DVB: ir-common: Use macros to define the keytables The usage of macros ensures that the proper namespace is being used by all tables. It also makes easier to associate a keytable with the name used inside the drivers. Signed-off-by: Mauro Carvalho Chehab commit e27e971c69f87bd6c00c4cff973497de365229ef Author: Mauro Carvalho Chehab Date: Thu Apr 1 21:35:32 2010 -0300 V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table Several DVB drivers use a different name convention. As we're moving the keytables, we need to use the same convention on all places. Signed-off-by: Mauro Carvalho Chehab commit d705d2ab7596b4661a2f13172f4f93ad11bd761f Author: Mauro Carvalho Chehab Date: Thu Apr 1 21:27:04 2010 -0300 V4L/DVB: ir: use IR_KEYTABLE where an IR table is needed Replaces most of the occurences of IR keytables on V4L drivers by a macro that evaluates to provide the name of the exported symbol. Signed-off-by: Mauro Carvalho Chehab commit 165344bd43b1410d10dc9dc8a376da31178d1694 Author: Mauro Carvalho Chehab Date: Thu Apr 1 21:10:58 2010 -0300 V4L/DVB: ir-common: re-order keytables by name and remove duplicates Signed-off-by: Mauro Carvalho Chehab commit 8b75acb52f477099d7e5203994dac43cc5f599a0 Author: Mauro Carvalho Chehab Date: Thu Apr 1 21:05:21 2010 -0300 V4L/DVB: ir-common: Use a function to declare an IR table This is the first patch of a series of changes that will break the IR tables into a series of small modules that can be dynamically loaded, or just loaded from userspace. Signed-off-by: Mauro Carvalho Chehab commit d53b213c5ca7d5a944d471b72b068714bb16e8dc Author: Dmitri Belimov Date: Thu Mar 18 04:00:19 2010 -0300 V4L/DVB: Add CHIP ID of the uPD61151 Add CHIP ID of the NEC MPEG2 encoders uPD61151 and uPD61152. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 42397ce42cb0a56276abde767e1598af74ca0af2 Author: Joe Perches Date: Wed Apr 7 02:59:26 2010 -0300 V4L/DVB: ov511: Fix continuation lines Signed-off-by: Joe Perches Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit e838326312bbacd6c320113711e2662568d4fc6c Author: Vladimir Ermakov Date: Wed Apr 7 02:23:31 2010 -0300 V4L/DVB: saa7134: fix GPIO HW-404M7 Signed-off-by: Vladimir Ermakov Reviewed-by: hermann pitton Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit e20144770f5a119516f93959eca9818fa5ff065e Author: Julia Lawall Date: Tue Apr 6 02:51:04 2010 -0300 V4L/DVB: drivers/media/video: avoid NULL dereference It seems impossible for ov to be NULL at this point. The semantic match that finds the problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E, E1; identifier f; statement S1,S3; iterator iter; @@ if ((E == NULL && ...) || ...) { ... when != false ((E == NULL && ...) || ...) when != true ((E != NULL && ...) || ...) when != iter(E,...) S1 when != E = E1 ( sizeof(E->f) | * E->f ) ... when any return ...; } else S3 // Signed-off-by: Julia Lawall Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit d49f7a240575937703f04d07cf41be1672ce2e25 Author: Ricardo Maraschini Date: Tue Apr 6 02:40:43 2010 -0300 V4L/DVB: cx88-dvb: fix on switch identation [dougsland@redhat.com: fixed reject due changes in cx88-dvb.c] Signed-off-by: Ricardo Maraschini Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit b084307c750cb3de4a366aeced1b69ee768c81aa Author: Dan Carpenter Date: Tue Apr 6 02:26:48 2010 -0300 V4L/DVB: cx23885: strcpy() => strlcpy() cap->driver is a 16 char buffer and dev->name is a 32 char buffer. I don't see an actual problem, but we may as well make the static checkers happy. Signed-off-by: Dan Carpenter Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 10991235177578ad3793b5d7569e70eb1c50aab2 Author: Olimpiu Pascariu Date: Tue Apr 6 02:09:00 2010 -0300 V4L/DVB: cx25821: fix coding style issues in cx25821-video-upstream.c This is a patch to cx25821-video-upstream.c file that fixes up warnings and errors found by the checkpatch.pl tool Signed-off-by: Olimpiu Pascariu Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 266d38c8e3d7f62152b1448fd9a7265f32f32d87 Author: Jarkko Nikula Date: Wed May 19 13:55:26 2010 +0300 ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT Codec output pin should be defined with SND_SOC_DAPM_OUTPUT as otherwise external widgets doesn't alter the output state. Signed-off-by: Jarkko Nikula Cc: Peter Ujfalusi Signed-off-by: Liam Girdwood commit d8b55d2cd00df4d599985440fd75b38d153bffcb Author: Liam Girdwood Date: Wed May 19 14:14:51 2010 +0100 ASoC: sdp4430 - add sdp4430 pcm ops to DAI. Fix build warning about unused ops and add ops to the sdp4430 DAI link. Signed-off-by: Liam Girdwood commit 871a05a78b4879d768bc2fde4b75439f517e2839 Author: Jorge Eduardo Candelaria Date: Tue May 18 12:44:18 2010 -0500 ASoC: TWL6040: Enable earphone path in codec Add control to enable earphone driver in TWL6040 codec. This driver is connected to HSDAC Left. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7254e2bddc96c47cb5edd30cfd3e1f12a2df9149 Author: Jorge Eduardo Candelaria Date: Tue May 18 12:44:17 2010 -0500 ASoC: SDP4430: Add support for Earphone speaker Enable earphone speaker in sdp4430 machine driver. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 5e64d6aadd2b8d5d480c3ff402f5dbbd009f58c5 Author: Misael Lopez Cruz Date: Mon May 17 19:53:10 2010 -0500 ASoC: SDP4430: Add sdp4430 machine driver Add ASoC support for TI SDP4430. Signed-off-by: Misael Lopez Cruz Signed-off-by: Margarita Olaya Cabrera Signed-off-by: Jorge Eduardo Candelaria Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 504d36e91ac12ccdb0e1193cee7bef9831a1c99e Author: Ben Dooks Date: Wed May 19 14:45:01 2010 +0900 Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry Make the driver depend on either ARCH_S3C2410 (as legacy) or the new device selection of SAMSUNG_DEV_TS. Change the menuconfig name to reflect this driver is now handling more devices that just the s3c2410. Signed-off-by: Ben Dooks Acked-by: Dmitry Torokhov commit 91df77d7b550d3c8167c97c6e3b97f2ca4d9f3af Author: Naveen Krishna Date: Tue May 18 20:44:45 2010 +0900 Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support This patch adds a feature bit field in the touchscreen driver for Samsung SoCs. Which can be used to distinguish the TSADC module features. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim [ben-linux@fluff.org: minor fix to title] Signed-off-by: Ben Dooks Acked-by: Dmitry Torokhov commit 658ad39ea91d8f0597654032a768930497161a58 Author: Naveen Krishna Date: Tue May 18 20:44:38 2010 +0900 Input: s3c24xx_ts - Implement generic GPIO configuration callback This patch implements generic GPIO configuration function in Samsung touchscreen driver. And makes the touchscreen driver s3c24xx-ts.c generic to all the Samsung SoCs. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim [ben-linux@fluff.org: fixed title ] Signed-off-by: Ben Dooks Acked-by: Dmitry Torokhov commit 2b6c02abca5a04bf8d9f8a3b1976a5b10d317603 Author: Ben Dooks Date: Wed May 19 14:36:28 2010 +0900 ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration Move the arch/arm/mach-s3c64xx/dev-ts.c file to arch/arm/plat-samsung and rename the Kconfig entry appropriately. Signed-off-by: Ben Dooks commit 5bfdca146edc558ae6b3bac6b05dc5b1f094fbf3 Author: Naveen Krishna Date: Tue May 18 20:44:27 2010 +0900 ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen This patch implements cfg_gpio function for Samsung touchscreen. And also modifies the H1940 machine respectively. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 909de0d67dbd9488d5f77bdcadcd34264fea3c02 Author: Maurus Cuelenaere Date: Tue May 4 13:12:44 2010 +0200 ARM: S3C64XX: Add touchscreen platform device definition This patch adds the touchscreen platform device definition for S3C64XX boards. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 73e59b1d6b69f5ae02e3be5e2b3259c46d8bb27a Author: Maurus Cuelenaere Date: Tue May 4 13:12:41 2010 +0200 ARM: SAMSUNG: Move mach/ts.h to plat/ts.h This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in order to prepare for s3c64xx support in the touchscreen driver. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 51ffd971edb2d5187007967c14712a8ed956c092 Author: Marek Szyprowski Date: Tue May 18 12:38:44 2010 +0200 ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 Move i2c helpers from plat-s5pc1xx to mach-s5pc100. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit b884c0e07058478bff82b8edcecff4e2919fa361 Author: Marek Szyprowski Date: Tue May 18 12:38:43 2010 +0200 ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100 Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit c8bb9635f926aaf15987450c57af05e422874b92 Author: Marek Szyprowski Date: Tue May 18 12:38:42 2010 +0200 ARM: S5PC100: gpio.h cleanup This patch renames gpio related registers from s5pc1xx to s5pc100 to better match the plat-s5p framework style. GPIO_MP* defines now used anywhere thus has been removed. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit 7904449021de399a03ec8a32e536d031a61def5b Author: Marek Szyprowski Date: Tue May 18 12:38:41 2010 +0200 ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100 Move gpio-lib support from plat-s5pc1xx to mach-s5pc100. Only basic gpio functionality is now supported. Gpio interrupts are disabled temporarly and will be added later. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit 252b8efeba9cd1e28ade902275b27133114d2382 Author: Marek Szyprowski Date: Tue May 18 12:38:40 2010 +0200 ARM: S5PC100: Use common functions for gpiolib implementation GPIOlib helpers from plat-samsung already have functions for accessing 4bit gpio banks. This patch removes the duplicated functions from plat-s5pc1xx/gpiolib.c. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit cb34a67472c3171f350e45bc66eebf480acec792 Author: Marek Szyprowski Date: Tue May 18 12:38:39 2010 +0200 drivers: serial: S5PC100 serial driver cleanup Remove unnecessary Kconfig entry. S5PC100 has exactly the same driver as S3C6400/S3C6410/S5P6440. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit a443a6373d8527657cfde3d3c515d4a64532c585 Author: Thomas Abraham Date: Fri May 14 16:27:28 2010 +0900 ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move This is a pre-requisite clock patch for the plat-s5pc1xx to plat-s5p movement. The patches that perform the movement of the code from plat-s5pc1xx to plat-s5p (and mach-s5pc100) should also enable the build for the mach-s5pc100/clock.c code. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a0f735812e9ffb65fa4c8a16975f5b63909fb447 Author: Marek Szyprowski Date: Tue May 18 12:23:35 2010 +0200 ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit 838c6d499b780c42fccbbdfecc0f5dcc471d0ef3 Author: Marek Szyprowski Date: Tue May 18 12:23:36 2010 +0200 ARM: SAMSUNG: move driver strength gpio configuration helper to common dir Driver strength parameter can be changed not only on S5PC100 but also on S5PV210/S5PC110 platforms, so move the helper functions to the common plat-samsung directory. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park Signed-off-by: Ben Dooks commit 14b8a0f92b309ff452a8c339abd9a096d00b210f Merge: 05a690d adc0950c Author: Ben Dooks Date: Wed May 19 18:07:25 2010 +0900 ARM: Merge for-2635/samsung-rtc Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2 Conflicts: arch/arm/mach-s3c64xx/include/mach/map.h arch/arm/plat-samsung/Kconfig arch/arm/plat-samsung/Makefile commit 05a690d2db5bd57d3c94293b06b69158535835df Merge: 1770a89 4f7cdc3 Author: Ben Dooks Date: Wed May 19 18:05:42 2010 +0900 ARM: Merge for-2635/samsung-ts Merge branch 'for-2635/samsung-ts' into for-linus/samsung2 commit 1770a8988f6178efdc1bfc85fb29deacac49fe91 Merge: 1e8ff63 7345520 Author: Ben Dooks Date: Wed May 19 18:05:33 2010 +0900 ARM: Merge for-2635/s5p-audio Merge branch 'for-2635/s5p-audio' into for-linus/samsung2 commit 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 Merge: 3245794 7d1a207 Author: Ben Dooks Date: Wed May 19 18:05:15 2010 +0900 ARM: Merge for-2635/s5p-dma Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile commit 32457942b90aabb9242b450f02d18d9c8d982916 Merge: 6071399 f64bea4 Author: Ben Dooks Date: Wed May 19 18:04:11 2010 +0900 ARM: Merge for-2635/fb-updates1 Merge branch 'for-2635/fb-updates1' into for-linus/samsung2 commit 6071399674e813d797d9f458ec8913b86c85398e Merge: d16067b f64cacc Author: Ben Dooks Date: Wed May 19 18:04:10 2010 +0900 ARM: Merge for-2635/s5pv210-clock Merge branch 'for-2635/s5pv210-clock' into for-linus/samsung2 commit d16067b25e17d38ee11f5760f90edcecc4c77c09 Merge: 2abbfb2 b3b84d6 Author: Ben Dooks Date: Wed May 19 18:04:09 2010 +0900 ARM: Merge for-2635/s5p6440-clock Merge branch 'for-2635/s5p6440-clock' into for-linus/samsung2 commit 2abbfb26de6cc8c362033f7d03278824113a4b0d Merge: ff1b8ba 05e021f Author: Ben Dooks Date: Wed May 19 18:04:09 2010 +0900 ARM: Merge for-2635/s3c6410-clock Merge branch 'for-2635/s3c6410-clock' into for-linus/samsung2 commit ff1b8ba01dc80da338890a187c112fdd3c0b9202 Merge: 5fcdb16 32b6cb3 Author: Ben Dooks Date: Wed May 19 18:04:08 2010 +0900 ARM: Merge for-2635/gpio2 Merge branch 'for-2635/gpio2' into for-linus/samsung2 commit 5fcdb16bd04fdeb313ee33bb269b04e59a9abf91 Merge: 5a5c419 192ff91 Author: Ben Dooks Date: Wed May 19 18:04:07 2010 +0900 ARM: Merge for-2635/rx1950 Merge branch 'for-2635/rx1950' into for-linus/samsung2 commit 5a5c419fe902458bfef936e32dc6472de04c56cf Merge: 71b4439 0c3767b Author: Ben Dooks Date: Wed May 19 18:04:06 2010 +0900 ARM: Merge for-2635/acer-n35 Merge branch 'for-2635/acer-n35' into for-linus/samsung2 commit 71b4439657a135a9ca7d11bc4ae3105628ed1186 Merge: f447ea4 f001d5b Author: Ben Dooks Date: Wed May 19 18:04:06 2010 +0900 ARM: Merge for-2635/samsung-clock Merge branch 'for-2635/samsung-clock' into for-linus/samsung2 commit f447ea4b1c90fe94f0627d7a6655a402100f8ca5 Merge: c733a71 6cd82ff Author: Ben Dooks Date: Wed May 19 18:04:05 2010 +0900 ARM: Merge for-2635/samsung-hwmon Merge branch 'for-2635/samsung-hwmon' into for-linus/samsung2 commit c733a7179cacdf77be9c1eeef02d6e0833919d89 Merge: 359542b 14894b9 Author: Ben Dooks Date: Wed May 19 18:04:04 2010 +0900 ARM: Merge for-2635/samsung-dma Merge branch 'for-2635/samsung-dma' into for-linus/samsung2 commit 359542b2a1d8a945c135c2c4ea4434ce69fc2723 Merge: bc3b67b ea5f507 Author: Ben Dooks Date: Wed May 19 18:04:03 2010 +0900 ARM: Merge for-2635/s5p-general Merge branch 'for-2635/s5p-general' into for-linus/samsung2 commit bc3b67b8e965c1b499d604b7ec7d2e6090570c13 Merge: b78232d 26be1b7 Author: Ben Dooks Date: Wed May 19 18:04:03 2010 +0900 ARM: Merge for-2635/s3c24xx-general Merge branch 'for-2635/s3c24xx-general' into for-linus/samsung2 commit ea5f50706385b61c1c0d24271bbe7c6e93129fbc Author: Pannaga Bhushan Date: Wed May 19 17:25:32 2010 +0900 ARM: S5PV210: Add GPIOlib support This patch adds GPIOlib support for S5PV210. Signed-off-by: Pannaga Bhushan Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1131379b48228afb32fa626fb27586a02246acf9 Author: Marek Szyprowski Date: Fri May 14 08:18:52 2010 +0200 ARM: SAMSUNGy: fix broken timer irq base Timer interrupts range was defined as 43-47, what overlaps with VIC0 range (32-64). This was caused probably by a typo while the common interrupts definition was refactored. This patch moves timer interrupt range to safe area of 11-15 (just before uart range). This fixes the commit 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec ("ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series.") which meant to move these into the old (and previously reserved) ISA space. Signed-off-by: Marek Szyprowski Signed-off-by: Kyungmin Park [ben-linux@fluff.org: update description] Signed-off-by: Ben Dooks commit 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 Merge: 7b39f90 537b60d Author: David S. Miller Date: Tue May 18 23:01:55 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c commit 7b39f90fabcf9e2af0cd79d0a60440d821e22b56 Author: Amit Kumar Salecha Date: Tue May 18 22:57:36 2010 -0700 qlcnic: adding co maintainer Adding Anirban as co maintainer Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit ea0a04dfc1c6701489edabf47f608d8aa474cbab Author: Don Skidmore Date: Tue May 18 16:00:13 2010 +0000 ixgbe: add support for active DA cables This patch adds support of active DA cables. This is renaming and adding some PHY type enumerations. Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 33c66bd10fb0c07ba05a7b55b8ad0cd41cb0e68a Author: John Fastabend Date: Tue May 18 16:00:11 2010 +0000 ixgbe: dcb, do not tag tc_prio_control frames The network stack indicate packets should not be DCB tagged by setting the priority to TC_PRIO_CONTROL. One usage for this is lldp frames which are not suppossed to be tagged. Signed-off-by: John Fastabend Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7483d9ddaf8a68a055bf3f14b5cff2e16c0469ff Author: John Fastabend Date: Tue May 18 16:00:10 2010 +0000 ixgbe: fix ixgbe_tx_is_paused logic The TFCS bits show the current XON state. Meaning that the device is paused if these bits are 0. This fixes the logic to work as it was intended. Signed-off-by: John Fastabend Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 38e0bd9898e5d04d464e92973785a26e774f5430 Author: Yi Zou Date: Tue May 18 16:00:08 2010 +0000 ixgbe: always enable vlan strip/insert when DCB is enabled when DCB mode is on, we want the HW VLAN stripping to be always enabled. Signed-off-by: Yi Zou Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 497f683f033d1498a6d42a48c095927de5949906 Author: Yi Zou Date: Tue May 18 16:00:07 2010 +0000 ixgbe: remove some redundant code in setting FCoE FIP filter The ETQS setup for FIP out side the if..else is enough for the ETQS setup for FIP, so remove redundant code. Signed-off-by: Yi Zou Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit be5d507d9af23c45983c828394cc4f6d728b18eb Author: Yi Zou Date: Tue May 18 16:00:05 2010 +0000 ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp Make sure we point to the right offset of the fc_frame_header when VLAN header exists and HW has VLAN stripping disabled. Signed-off-by: Yi Zou Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0b746e08cd7fb35d80c184f8e3f4656aa1f1ae11 Author: Shannon Nelson Date: Tue May 18 16:00:03 2010 +0000 ixgbe: fix header len when unsplit packet overflows to data buffer When in packet split mode, packet type is not recognized, and the packet is larger than the header size, the 82599 overflows the packet into the data area, but doesn't set the HDR_LEN field. We can safely assume the length is the current header size. This fixes an obscure corner case that can be triggered by non-ip packet headers or (more likely) by disabling the L2 packet recognition. Signed-off-by: Shannon Nelson Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e4e83ea47babd9d4bf95a13aed87f8ef51e46472 Author: J. Bruce Fields Date: Thu Apr 22 16:21:39 2010 -0400 Revert "nfsd4: distinguish expired from stale stateids" This reverts commit 78155ed75f470710f2aecb3e75e3d97107ba8374. We're depending here on the boot time that we use to generate the stateid being monotonic, but get_seconds() is not necessarily. We still depend at least on boot_time being different every time, but that is a safer bet. We have a few reports of errors that might be explained by this problem, though we haven't been able to confirm any of them. But the minor gain of distinguishing expired from stale errors seems not worth the risk. Conflicts: fs/nfsd/nfs4state.c Signed-off-by: J. Bruce Fields commit 622ccdf107bcb49c4d8fb65512652566d4c8928a Author: Herbert Xu Date: Tue May 18 15:56:06 2010 -0700 ipv6: Never schedule DAD timer on dead address This patch ensures that all places that schedule the DAD timer look at the address state in a safe manner before scheduling the timer. This ensures that we don't end up with pending timers after deleting an address. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f2344a131bccdbfc5338e17fa71a807dee7944fa Author: Herbert Xu Date: Tue May 18 15:55:27 2010 -0700 ipv6: Use POSTDAD state This patch makes use of the new POSTDAD state. This prevents a race between DAD completion and failure. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 4c5ff6a6fe794f102479db998c69054319279e3c Author: Herbert Xu Date: Tue May 18 15:54:18 2010 -0700 ipv6: Use state_lock to protect ifa state This patch makes use of the new state_lock to synchronise between updates to the ifa state. This fixes the issue where a remotely triggered address deletion (through DAD failure) coincides with a local administrative address deletion, causing certain actions to be performed twice incorrectly. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit e9d3e084975869754d16f639378675c353560be9 Author: Herbert Xu Date: Tue May 18 15:36:06 2010 -0700 ipv6: Replace inet6_ifaddr->dead with state This patch replaces the boolean dead flag on inet6_ifaddr with a state enum. This allows us to roll back changes when deleting an address according to whether DAD has completed or not. This patch only adds the state field and does not change the logic. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 273fca0ecad9305247043815e185d1bfd04047d4 Author: David S. Miller Date: Tue May 18 15:23:58 2010 -0700 sparc: Define ARCH_SLAB_MINALIGN Because SLOB fancies being different, the default minimum alignment is only "unsigned long" instead of SLAB/SLUB where the default is "unsigned long long" The inconsistency makes no sense and is asking for trouble, but define ARCH_SLAB_MINALIGN to get it right in all cases even after they fix the inconsistency. Signed-off-by: David S. Miller commit e29f5dbc9e9719af158a960e5c1d16f32740ebc3 Author: Dimitris Michailidis Date: Tue May 18 10:07:13 2010 +0000 cxgb4: notify upper drivers if the device is already up when they load Upper layer drivers aren't notified that a device is ready if their modules load after the device becomes ready. Add the missing notification. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit aaefae9b32b2cba7350a4d524357168119372e51 Author: Dimitris Michailidis Date: Tue May 18 10:07:12 2010 +0000 cxgb4: keep interrupts available when the ports are brought down The PF driver needs to remain alert while its ports are down to service requests or errors from virtual functions or FW so keep interrupts and queues available when the ports are brought down. The change makes open_device_map unnecessary so remove it. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit b6bd29e793c1747e0b4be8791d5738acea3a86df Author: Dimitris Michailidis Date: Tue May 18 10:07:11 2010 +0000 cxgb4: fix initial addition of MAC address The call to add the MAC address during link initialization wasn't adding the address to one of the HW tables. Fix. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 48f753d2ba94a4081400fa8d26bdbfbbf12b10de Author: Michael Chan Date: Tue May 18 11:32:53 2010 +0000 cnic: Return SPQ credit to bnx2x after ring setup and shutdown. Everytime the iSCSI ring finishes setup or shutdown, we need to return the SPQ (slow path queue) credit to the bnx2x driver. Without this step, the SPQ will eventually be full causing iSCSI to fail. This can happen after 3 or 4 MTU changes for example. Add code to wait for these slow path commands to complete in the RX ring and return the SPQ credit to bnx2x. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 1f1332a3cb7ac73e3bcff6ea42ff965c90a29d12 Author: Michael Chan Date: Tue May 18 11:32:52 2010 +0000 cnic: Convert cnic_local_flags to atomic ops. It is easier to expand the flags for other purposes because it does not require a spin_lock. The next bug fix patch needs a flag in cnic_local_flags. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 2a2ae2426bba944ce6dbcad35e1580df57aafcf1 Author: Tony Luck Date: Wed May 12 09:30:27 2010 -0700 [IA64] Drop duplicated "config IOMMU_HELPER" One entry for this in arch/ia64/Kconfig should be enough. Reported-by: Christoph Egger Signed-off-by: Tony Luck commit 0c3b96e44739cdba7a75030107a2b47a15ee5f60 Author: npiggin@suse.de Date: Fri May 7 14:34:33 2010 -0700 [IA64] invoke oom-killer from page fault As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Acked-by: David Rientjes Signed-off-by: Nick Piggin Signed-off-by: Tony Luck commit 7683a3f9748f7adfbe47e33002a4f710ab557293 Author: Akinobu Mita Date: Sun Feb 28 19:58:14 2010 +0900 [IA64] use __ratelimit Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Signed-off-by: Tony Luck commit 552dce3a071f0de2a84023fbba7f3b4ac36602cd Author: Julia Lawall Date: Fri Mar 26 23:02:23 2010 +0100 [IA64] Use set_cpus_allowed_ptr Use set_cpus_allowed_ptr rather than set_cpus_allowed. Signed-off-by: Julia Lawall Signed-off-by: Tony Luck commit 93f7c93bee6382e01c34ea0c34ff8fb98c648734 Author: Julia Lawall Date: Fri Mar 26 23:02:47 2010 +0100 [IA64] Use set_cpus_allowed_ptr Use set_cpus_allowed_ptr rather than set_cpus_allowed. Signed-off-by: Julia Lawall Signed-off-by: Tony Luck commit 80aa9bf0d8083554967400d48dbec078aa8f128e Author: Joe Perches Date: Mon Apr 5 12:05:31 2010 -0700 [IA64] arch/ia64/hp/common/sba_iommu.c: Rename dev_info to adi There is a macro called dev_info that prints struct device specific information. Having variables with the same name can be confusing and prevents conversion of the macro to a function. Rename the existing dev_info variables to something else in preparation to converting the dev_info macro to a function. Signed-off-by: Joe Perches Signed-off-by: Tony Luck commit 82b22c887e02fc6ebeebc8ec43fb1d348e2a6a58 Author: Jiri Olsa Date: Thu May 6 19:36:06 2010 +0200 [IA64] removing redundant ifdef Pointless to use #ifdef CONFIG_NUMA in code that is already inside another #ifdef CONFIG_NUMA. Signed-off-by: Jiri Olsa Signed-off-by: Tony Luck commit 57c8a456640fa3ca777652f11f2db4179a3e66b6 Author: Oliver Hartkopp Date: Tue May 18 14:03:10 2010 -0700 can: Fix SJA1000 command register writes on SMP systems The SJA1000 command register is concurrently written in the rx-path to free the receive buffer _and_ in the tx-path to start the transmission. The SJA1000 data sheet, 6.4.4 COMMAND REGISTER (CMR) states: "Between two commands at least one internal clock cycle is needed in order to proceed. The internal clock is half of the external oscillator frequency." On SMP systems the current implementation leads to a write stall in the tx-path, which can be solved by adding some general locking and some time to settle the write_reg() operation for the command register. Thanks to Klaus Hitschler for the original fix and detailed problem description. This patch applies on net-2.6 and (with some offsets) on net-next-2.6 . Signed-off-by: Oliver Hartkopp Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4 Author: Randy Dunlap Date: Tue May 18 12:26:27 2010 -0700 bridge: fix build for CONFIG_SYSFS disabled Fix build when CONFIG_SYSFS is not enabled: net/bridge/br_if.c:136: error: 'struct net_bridge_port' has no member named 'sysfs_name' Note: dev->name == sysfs_name except when change name is in progress, and we are protected from that by RTNL mutex. Signed-off-by: Randy Dunlap Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 537b60d17894b7c19a6060feae40299d7109d6e7 Merge: 3ae684e a289cc7 Author: Linus Torvalds Date: Tue May 18 09:46:35 2010 -0700 Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV: uv_irq.c: Fix all sparse warnings x86, UV: Improve BAU performance and error recovery x86, UV: Delete unneeded boot messages x86, UV: Clean up UV headers for MMR definitions commit 3ae684e1c48e6deedc9b9faff8fa1c391ca8a652 Merge: c4fd308 4bd96a7 Author: Linus Torvalds Date: Tue May 18 09:28:24 2010 -0700 Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, tboot: Add support for S3 memory integrity protection commit c4fd308ed62f292518363ea9c6c2adb3c2d95f9d Merge: 96fbeb9 1f9cc3c Author: Linus Torvalds Date: Tue May 18 09:28:04 2010 -0700 Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, pat: Update the page flags for memtype atomically instead of using memtype_lock x86, pat: In rbt_memtype_check_insert(), update new->type only if valid x86, pat: Migrate to rbtree only backend for pat memtype management x86, pat: Preparatory changes in pat.c for bigger rbtree change rbtree: Add support for augmented rbtrees commit 96fbeb973a7e17594a429537201611ca0b395622 Merge: 1f8caa9 fea24e2 Author: Linus Torvalds Date: Tue May 18 09:27:49 2010 -0700 Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mrst: add nop functions to x86_init mpparse functions x86, mrst, pci: return 0 for non-present pci bars x86: Avoid check hlt for newer cpus commit 1f8caa986a5f4de2e40f3defe66a07b4c5a019c2 Merge: d6f3875 2e61878 Author: Linus Torvalds Date: Tue May 18 09:17:50 2010 -0700 Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64: Combine SRAT regions when possible commit d6f3875252bb703a9a3de0b92f7ae154f12c986c Merge: cb41838 3f10940 Author: Linus Torvalds Date: Tue May 18 09:17:17 2010 -0700 Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/microcode: Use nonseekable_open() x86: Improve Intel microcode loader performance commit cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea Merge: 98f0172 c59bd56 Author: Linus Torvalds Date: Tue May 18 09:17:01 2010 -0700 Merge branch 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-hweight-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hweight: Use a 32-bit popcnt for __arch_hweight32() arch, hweight: Fix compilation errors x86: Add optimized popcnt variants bitops: Optimize hweight() by making use of compile-time evaluation commit 98f01720cbe3e2eb719682777049b6514e9db556 Merge: 41d5910 4f47b4c Author: Linus Torvalds Date: Tue May 18 09:15:57 2010 -0700 Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, acpi/irq: Define gsi_end when X86_IO_APIC is undefined x86, irq: Kill io_apic_renumber_irq x86, acpi/irq: Handle isa irqs that are not identity mapped to gsi's. x86, ioapic: Simplify probe_nr_irqs_gsi. x86, ioapic: Optimize pin_2_irq x86, ioapic: Move nr_ioapic_registers calculation to mp_register_ioapic. x86, ioapic: In mpparse use mp_register_ioapic x86, ioapic: Teach mp_register_ioapic to compute a global gsi_end x86, ioapic: Fix the types of gsi values x86, ioapic: Fix io_apic_redir_entries to return the number of entries. x86, ioapic: Only export mp_find_ioapic and mp_find_ioapic_pin in io_apic.h x86, acpi/irq: Generalize mp_config_acpi_legacy_irqs x86, acpi/irq: Fix acpi_sci_ioapic_setup so it has both bus_irq and gsi x86, acpi/irq: pci device dev->irq is an isa irq not a gsi x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq x86, acpi/irq: Introduce apci_isa_irq_to_gsi commit 47cee541a46a73b20dc279bf4c4690f776f6c81b Author: Pavel Emelyanov Date: Mon May 17 20:00:37 2010 +0400 nfsd: safer initialization order in find_file() The alloc_init_file() first adds a file to the hash and then initializes its fi_inode, fi_id and fi_had_conflict. The uninitialized fi_inode could thus be erroneously checked by the find_file(), so move the hash insertion lower. The client_mutex should prevent this race in practice; however, we eventually hope to make less use of the client_mutex, so the ordering here is an accident waiting to happen. I didn't find whether the same can be true for two other fields, but the common sense tells me it's better to initialize an object before putting it into a global hash table :) Signed-off-by: Pavel Emelyanov Signed-off-by: J. Bruce Fields commit 41d59102e146a4423a490b8eca68a5860af4fe1c Merge: 3e1dd19 c9775b4 Author: Linus Torvalds Date: Tue May 18 08:58:16 2010 -0700 Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, fpu: Use static_cpu_has() to implement use_xsave() x86: Add new static_cpu_has() function using alternatives x86, fpu: Use the proper asm constraint in use_xsave() x86, fpu: Unbreak FPU emulation x86: Introduce 'struct fpu' and related API x86: Eliminate TS_XSAVE x86-32: Don't set ignore_fpu_irq in simd exception x86: Merge kernel_math_error() into math_error() x86: Merge simd_math_error() into math_error() x86-32: Rework cache flush denied handler Fix trivial conflict in arch/x86/kernel/process.c commit 3e1dd193edefd2a806a0ba6cf0879cf1a95217da Merge: 07d7775 372e22e Author: Linus Torvalds Date: Tue May 18 08:53:57 2010 -0700 Merge branch 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, docbook: Fix errors from x86 headers merger commit b7299f44394336f51b526247a870d47d28f4f97c Author: J. Bruce Fields Date: Fri May 14 17:57:35 2010 -0400 nfs4: minor callback code simplification, comment Note the position in the version array doesn't have to match the actual rpc version number--to me it seems clearer to maintain the distinction. Also document choice of rpc callback version number, as discussed in e.g. http://www.ietf.org/mail-archive/web/nfsv4/current/msg07985.html and followups. Signed-off-by: J. Bruce Fields commit 07d77759c95d899b84f8e473a01cff001019dd5f Merge: b7723f9 3998d09 Author: Linus Torvalds Date: Tue May 18 08:49:13 2010 -0700 Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hypervisor: add missing Modify the VMware balloon driver for the new x86_hyper API x86, hypervisor: Export the x86_hyper* symbols x86: Clean up the hypervisor layer x86, HyperV: fix up the license to mshyperv.c x86: Detect running on a Microsoft HyperV system x86, cpu: Make APERF/MPERF a normal table-driven flag x86, k8: Fix build error when K8_NB is disabled x86, cacheinfo: Disable index in all four subcaches x86, cacheinfo: Make L3 cache info per node x86, cacheinfo: Reorganize AMD L3 cache structure x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments x86, cacheinfo: Unify AMD L3 cache index disable checking cpufreq: Unify sysfs attribute definition macros powernow-k8: Fix frequency reporting x86, cpufreq: Add APERF/MPERF support for AMD processors x86: Unify APERF/MPERF support powernow-k8: Add core performance boost support x86, cpu: Add AMD core boosting feature flag to /proc/cpuinfo Fix up trivial conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c and drivers/cpufreq/cpufreq_ondemand.c commit b7723f9d21d8d6043e63f5e3e412f321f5f1900c Merge: 93c9d7f 6fc108a Author: Linus Torvalds Date: Tue May 18 08:40:21 2010 -0700 Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Clean up arch/x86/Kconfig* x86-64: Don't export init_level4_pgt commit 93c9d7f60c0cb7715890b1f9e159da6f4d1f5a65 Merge: 7421a10 d9c5841 Author: Linus Torvalds Date: Tue May 18 08:40:05 2010 -0700 Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix LOCK_PREFIX_HERE for uniprocessor build x86, atomic64: In selftest, distinguish x86-64 from 586+ x86-32: Fix atomic64_inc_not_zero return value convention lib: Fix atomic64_inc_not_zero test lib: Fix atomic64_add_unless return value convention x86-32: Fix atomic64_add_unless return value convention lib: Fix atomic64_add_unless test x86: Implement atomic[64]_dec_if_positive() lib: Only test atomic64_dec_if_positive on archs having it x86-32: Rewrite 32-bit atomic64 functions in assembly lib: Add self-test for atomic64_t x86-32: Allow UP/SMP lock replacement in cmpxchg64 x86: Add support for lock prefix in alternatives commit 7421a10de7a525f67cc082fca7a91011d00eada4 Merge: 752f114 9e56529 Author: Linus Torvalds Date: Tue May 18 08:35:37 2010 -0700 Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Use .cfi_sections for assembly code x86-64: Reduce SMP locks table size x86, asm: Introduce and use percpu_inc() commit 752f114fb83c5839de37a250b4f8257ed5438341 Merge: b8ae30e ad56b07 Author: Linus Torvalds Date: Tue May 18 08:35:04 2010 -0700 Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix "integer as NULL pointer" warning. tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header tracing: Make the documentation clear on trace_event boot option ring-buffer: Wrap open-coded WARN_ONCE tracing: Convert nop macros to static inlines tracing: Fix sleep time function profiling tracing: Show sample std dev in function profiling tracing: Add documentation for trace commands mod, traceon/traceoff ring-buffer: Make benchmark handle missed events ring-buffer: Make non-consuming read less expensive with lots of cpus. tracing: Add graph output support for irqsoff tracer tracing: Have graph flags passed in to ouput functions tracing: Add ftrace events for graph tracer tracing: Dump either the oops's cpu source or all cpus buffers tracing: Fix uninitialized variable of tracing/trace output commit b8ae30ee26d379db436b0b8c8c3ff1b52f69e5d1 Merge: 4d7b4ac 9c6f7e4 Author: Linus Torvalds Date: Tue May 18 08:27:54 2010 -0700 Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (49 commits) stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback() sched, wait: Use wrapper functions sched: Remove a stale comment ondemand: Make the iowait-is-busy time a sysfs tunable ondemand: Solve a big performance issue by counting IOWAIT time as busy sched: Intoduce get_cpu_iowait_time_us() sched: Eliminate the ts->idle_lastupdate field sched: Fold updating of the last_update_time_info into update_ts_time_stats() sched: Update the idle statistics in get_cpu_idle_time_us() sched: Introduce a function to update the idle statistics sched: Add a comment to get_cpu_idle_time_us() cpu_stop: add dummy implementation for UP sched: Remove rq argument to the tracepoints rcu: need barrier() in UP synchronize_sched_expedited() sched: correctly place paranioa memory barriers in synchronize_sched_expedited() sched: kill paranoia check in synchronize_sched_expedited() sched: replace migration_thread with cpu_stop stop_machine: reimplement using cpu_stop cpu_stop: implement stop_cpu[s]() sched: Fix select_idle_sibling() logic in select_task_rq_fair() ... commit 4d7b4ac22fbec1a03206c6cde353f2fd6942f828 Merge: 3aaf51a 94f3ca9 Author: Linus Torvalds Date: Tue May 18 08:19:03 2010 -0700 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (311 commits) perf tools: Add mode to build without newt support perf symbols: symbol inconsistency message should be done only at verbose=1 perf tui: Add explicit -lslang option perf options: Type check all the remaining OPT_ variants perf options: Type check OPT_BOOLEAN and fix the offenders perf options: Check v type in OPT_U?INTEGER perf options: Introduce OPT_UINTEGER perf tui: Add workaround for slang < 2.1.4 perf record: Fix bug mismatch with -c option definition perf options: Introduce OPT_U64 perf tui: Add help window to show key associations perf tui: Make <- exit menus too perf newt: Add single key shortcuts for zoom into DSO and threads perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed perf newt: Fix the 'A'/'a' shortcut for annotate perf newt: Make <- exit the ui_browser x86, perf: P4 PMU - fix counters management logic perf newt: Make <- zoom out filters perf report: Report number of events, not samples perf hist: Clarify events_stats fields usage ... Fix up trivial conflicts in kernel/fork.c and tools/perf/builtin-record.c commit 3aaf51ace5975050ab43c7d4d7e439e0ae7d13d7 Merge: f262af3 cc49b09 Author: Linus Torvalds Date: Tue May 18 08:18:07 2010 -0700 Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits) oprofile/x86: make AMD IBS hotplug capable oprofile/x86: notify cpus only when daemon is running oprofile/x86: reordering some functions oprofile/x86: stop disabled counters in nmi handler oprofile/x86: protect cpu hotplug sections oprofile/x86: remove CONFIG_SMP macros oprofile/x86: fix uninitialized counter usage during cpu hotplug oprofile/x86: remove duplicate IBS capability check oprofile/x86: move IBS code oprofile/x86: return -EBUSY if counters are already reserved oprofile/x86: moving shutdown functions oprofile/x86: reserve counter msrs pairwise oprofile/x86: rework error handler in nmi_setup() oprofile: update file list in MAINTAINERS file oprofile: protect from not being in an IRQ context oprofile: remove double ring buffering ring-buffer: Add lost event count to end of sub buffer tracing: Show the lost events in the trace_pipe output ring-buffer: Add place holder recording of dropped events tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set ... commit f262af3d08d3fffc4e11277d3a177b2d67ea2aba Merge: 1014cfe 72d5a9f Author: Linus Torvalds Date: Tue May 18 08:17:58 2010 -0700 Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits) rcu: remove all rcu head initializations, except on_stack initializations rcu head introduce rcu head init on stack Debugobjects transition check rcu: fix build bug in RCU_FAST_NO_HZ builds rcu: RCU_FAST_NO_HZ must check RCU dyntick state rcu: make SRCU usable in modules rcu: improve the RCU CPU-stall warning documentation rcu: reduce the number of spurious RCU_SOFTIRQ invocations rcu: permit discontiguous cpu_possible_mask CPU numbering rcu: improve RCU CPU stall-warning messages rcu: print boot-time console messages if RCU configs out of ordinary rcu: disable CPU stall warnings upon panic rcu: enable CPU_STALL_VERBOSE by default rcu: slim down rcutiny by removing rcu_scheduler_active and friends rcu: refactor RCU's context-switch handling rcu: rename rcutiny rcu_ctrlblk to rcu_sched_ctrlblk rcu: shrink rcutiny by making synchronize_rcu_bh() be inline rcu: fix now-bogus rcu_scheduler_active comments. rcu: Fix bogus CONFIG_PROVE_LOCKING in comments to reflect reality. rcu: ignore offline CPUs in last non-dyntick-idle CPU check ... commit 1014cfe2fb4cdd663137aafb21448cb613dd6a7d Merge: 8123d8f 4726f2a Author: Linus Torvalds Date: Tue May 18 08:17:35 2010 -0700 Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: Reduce stack_trace usage lockdep: No need to disable preemption in debug atomic ops lockdep: Actually _dec_ in debug_atomic_dec lockdep: Provide off case for redundant_hardirqs_on increment lockdep: Simplify debug atomic ops lockdep: Fix redundant_hardirqs_on incremented with irqs enabled lockstat: Make lockstat counting per cpu i8253: Convert i8253_lock to raw_spinlock commit 8123d8f17d8ba9d67e556688e4f025456ca97842 Merge: 06ee772 795e74f Author: Linus Torvalds Date: Tue May 18 07:22:37 2010 -0700 Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/amd-iommu: Add amd_iommu=off command line option iommu-api: Remove iommu_{un}map_range functions x86/amd-iommu: Implement ->{un}map callbacks for iommu-api x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes kvm: Change kvm_iommu_map_pages to map large pages VT-d: Change {un}map_range functions to implement {un}map interface iommu-api: Add ->{un}map callbacks to iommu_ops iommu-api: Add iommu_map and iommu_unmap functions iommu-api: Rename ->{un}map function pointers to ->{un}map_range commit 06ee772043c7ad125f2c2e6a08dc563706f39e8d Merge: fd25a1f 1fb2f77 Author: Linus Torvalds Date: Tue May 18 07:20:19 2010 -0700 Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: debugobjects: Section mismatch cleanup commit fd25a1f556760dbd6e29dec66c70223a8912cdb2 Merge: ba2e1c5f 4065c80 Author: Linus Torvalds Date: Tue May 18 07:18:38 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (23 commits) cifs: fix noserverino handling when unix extensions are enabled cifs: don't update uniqueid in cifs_fattr_to_inode cifs: always revalidate hardlinked inodes when using noserverino [CIFS] drop quota operation stubs cifs: propagate cifs_new_fileinfo() error back to the caller cifs: add comments explaining cifs_new_fileinfo behavior cifs: remove unused parameter from cifs_posix_open_inode_helper() [CIFS] Remove unused cifs_oplock_cachep cifs: have decode_negTokenInit set flags in server struct cifs: break negotiate protocol calls out of cifs_setup_session cifs: eliminate "first_time" parm to CIFS_SessSetup [CIFS] Fix lease break for writes cifs: save the dialect chosen by server cifs: change && to || cifs: rename "extended_security" to "global_secflags" cifs: move tcon find/create into separate function cifs: move SMB session creation code into separate function cifs: track local_nls in volume info [CIFS] Allow null nd (as nfs server uses) on create [CIFS] Fix losing locks during fork() ... commit 734552072335b00476b626b027ca4a9f57147b6f Author: Jassi Brar Date: Tue May 18 16:03:07 2010 +0900 ARM: SMDK6440: Add audio devices on board Add audio platform devices on the smdk by default. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 08885d0a4c4fa929c386e17c9682bf0d524146b9 Author: Jassi Brar Date: Tue May 18 16:03:02 2010 +0900 ARM: S5P6440: Add audio platform devices Define platform devices for all audio devices found on S5P6440 Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 78a368234f51e54a8878ab00375be91a22e945b3 Author: Jassi Brar Date: Tue May 18 16:02:58 2010 +0900 ARM: SMDK6442: Add audio devices on board Add audio platform devices on the smdk by default. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 070c808546f69bc37db14db96e043a3b8894e0e2 Author: Jassi Brar Date: Tue May 18 16:02:50 2010 +0900 ARM: S5P6442: Add audio platform devices Define platform devices for all audio devices found on S5P6442 Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 95fa6e6cd34d33915504d207a832920d98e4e932 Author: Jassi Brar Date: Tue May 18 16:02:35 2010 +0900 ARM: SMDKC110: Add audio devices on board Add audio platform devices on the smdk by default. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 9b5f1e08c95a9df7de9a96a7a4240362358acd5f Author: Jassi Brar Date: Tue May 18 16:02:30 2010 +0900 ARM: SMDKV210: Add audio devices on board Add audio platform devices on the smdk by default. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 602bf0cfbdedfd988e43203d2a26bdbbab639309 Author: Jassi Brar Date: Tue May 18 16:02:26 2010 +0900 ARM: S5PV210: Add audio platform devices Define platform devices for all audio devices found on S5PV210 Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 32b6cb3872883861f3a2669cce880f3a7ef8979a Author: Ben Dooks Date: Tue May 18 19:07:05 2010 +0900 ARM: SAMSUNG: Fix additional increment when running through gpios The pm-gpio.c code was incrementing the gpio_nr from the nr_gpios field and the bank-bank offset inside the loop, and also in the for() loop with a ++. Remove the ++, as the number is already at the next GPIO, thus ensuring that we don't skip a gpio bank by accident. Signed-off-by: Ben Dooks commit 4ac2a39767c2a93c06b654a0bf1c635e03ff75ac Author: Ben Dooks Date: Mon May 17 15:12:33 2010 +0900 ARM: S3C24XX: Add note on GPIO bank sizes Add a table for the GPIO bank sizes for each SoC Signed-off-by: Ben Dooks commit 1635ca4aaf835794401da33079e50ce1d6bbb5d0 Author: Ben Dooks Date: Mon May 17 14:53:48 2010 +0900 ARM: S3C24XX: Remove macros mapping GPIO number to base As part of the cleanup, remove the old macros mapping GPIO numbers to the base of the register now we have gpiolib to manage the GPIO mappings for us. Signed-off-by: Ben Dooks commit 7987bd7a7051c979f7b9b572898f92dbef6aaeb1 Author: Ben Dooks Date: Mon May 17 14:28:44 2010 +0900 ARM: S3C24XX: Update missed gpio calls to use gpiolib Update a couple of S3C24XX and S3C2412 files that are still using the GPIO number to register mapping calls to get the s3c_gpio_chip and use the base field from that. Signed-off-by: Ben Dooks commit 2c8fcfbf735e2d3b139e4247eb3e73edf64bb23f Author: Ben Dooks Date: Mon May 17 14:13:16 2010 +0900 ARM: S3C24XX: Start cleanup of GPIO numbering Start cleaning up the numbering of GPIO banks by removing the old bank start definitions currently being used by some of the header files. Signed-off-by: Ben Dooks commit a0026418d3d99b68dbd6c91f277d6f764fe41956 Author: Vasily Khoruzhick Date: Wed May 12 10:22:41 2010 +0300 ARM: S3C244X: fix gpiolib port J support Increase GPIOs number for S3C244X, and make S3C_GPIO_END point to BANKJ end, otherwise gpiolib refuses to register BANKJ Signed-off-by: Vasily Khoruzhick [ben-linux@fluff.org: Move pm fix to new patch] Signed-off-by: Ben Dooks commit f64bea4318a73e833d0a9b8400cc0f6cee957da3 Author: Ben Dooks Date: Mon May 3 15:29:44 2010 +0900 ARM: SMDK2416: Add support for framebuffer device and ensure correct setup Add support for the LCD display on the SMDJK2416, and correctly name the framebuffer device. Signed-off-by: Ben Dooks commit f077f3fc055b329787783a1ab0efb9a8f8ecc874 Author: Ben Dooks Date: Thu May 13 14:44:50 2010 +0900 ARM: SAMSUNG: Set S3C_FB_MAX_WIN in Move the S3C_FB_MAX_WIN to the platform data to avoid having to include the registers with the platform data. Set S3C_FB_MAX_WIN to 5, which is the maximum that any of the current hardware can do and the cost of having it set to this for all is minimal (at least for the platform data case), then always leave this as the maximum for the systems supported. Also remove the inclusion of from the device definition in arch/arm/plat-samsung Signed-off-by: Ben Dooks commit dc5d2e8236e2eec461e8c34d302635142e93ab49 Author: Ben Dooks Date: Fri Apr 30 19:34:25 2010 +0900 ARM: S3C2443: Fix definition of LCD clock bit Fix the definition of the LCD clock bit, it is the TFT display controller on bit 9, not the older STN on bit 10. Signed-off-by: Ben Dooks commit fbd6fe73514cf31a07c7b16518930ea84c644463 Author: Ben Dooks Date: Fri Apr 30 19:08:38 2010 +0900 ARM: S3C2443: Add initial defines for framebuffer support Add the necessary defines to get the s3c-fb device to compile for s3c2443. Signed-off-by: Ben Dooks commit 05e021f095ffe9c7c1a695a3e2835f39243c6270 Author: Maurus Cuelenaere Date: Mon May 17 20:17:42 2010 +0200 ARM: S3C64XX: Add USB external clock definition This adds the xusbxti clock to S3C64XX platform. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 4d0956b8f597aac10208ca763f8fe641fde16aab Author: Paul Mundt Date: Tue May 18 18:18:28 2010 +0900 sh: update defconfigs. Signed-off-by: Paul Mundt commit 06225c08ec2ad0f0dec063df7f08773a8358db12 Author: Paul Mundt Date: Tue May 18 18:15:44 2010 +0900 sh: Fix up the NUMA build for recent LMB changes. Now that the node 0 initialization code has been overhauled, kill off the now obsolete setup_memory() bits. Signed-off-by: Paul Mundt commit 7d1a2077a7e519fc0c68617526abea3f72632e60 Author: Jassi Brar Date: Tue May 18 11:59:34 2010 +0900 S5PV210: DMA: Add platform devices for PL330 DMACs Samsung's Soc S5PV210 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 S5PV210 platform. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit d460f5b035c3b1d192d7ba1dbca50cb441fef08e Author: Jassi Brar Date: Tue May 18 11:59:27 2010 +0900 S5P6442: DMA: Add platform devices for PL330 DMACs Samsung's Soc S5P6442 has two PL330 DMACs. First is dedicated for Memory->Memory data transfer while the second is meant for data transfer with peripherals. Define and add the peripheral PL330 DMAC as platform device on the S5P6442 platform. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit d8b5065b75e87e87c2cbba984b3050e869b4b910 Author: Jassi Brar Date: Tue May 18 11:59:20 2010 +0900 S5P6440: DMA: Add platform devices for PL330 DMACs Samsung's Soc S5P6440 has one PL330 DMAC. Define and add the PL330 DMAC as platform device on the S5P6440 platform. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit d800edebe33cac300ab1ff3b95e8a74d53e842d2 Author: Jassi Brar Date: Tue May 18 11:59:06 2010 +0900 S3C: DMA: Add api driver for PL330 Latest Samsung SoCs have one or more PL330 as their DMACs. This patch implements the S3C DMA API for PL330 core driver. The design has been kept as generic as possible while keeping effort to add support for new SoCs to the minimum possible level. Some of the salient features of this driver are:- o Automatic scheduling of client requests onto DMAC if more than one DMAC can reach the peripheral. Factors, such as current load and number of exclusive but inactive peripherals that are supported by the DMAC, are used to decide suitability of a DMAC for a particular client. o CIRCULAR buffer option is supported. o The driver scales transparently with the number of DMACs and total peripherals in the platform, since all peripherals are added to the peripheral pool and DMACs to the controller pool. For most conservative use of memory, smallest driver size and best performance, we don't employ legacy data structures of the S3C DMA API. That should not have any affect since those data structures are completely invisible to the DMA clients. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit adc0950c08e1f433f6933759f4facf9b2cf8d29d Author: Atul Dahiya Date: Tue May 18 14:58:56 2010 +0900 ARM: SAMSUNG: Move RTC device definitions in plat-samsung This patch moves RTC device definitions from mach-s3c64xx to plat-samsung, to enable the other SoCs to use same device definition. Signed-off-by: Atul Dahiya Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 717e7c2672e37253a4d3aa70e4716b5b0a658761 Author: Russell King Date: Tue May 18 08:17:56 2010 +0100 ARM: remove 'select GENERIC_TIME' GENERIC_TIME is now enabled by default, so 'select GENERIC_TIME' is redundant. Remove them. Signed-off-by: Russell King commit dd2fdd264eaa616fab4cf80e89f83f4a2fc26288 Author: Paul Mundt Date: Tue May 18 15:23:48 2010 +0900 sh64: provide a stub per_cpu_trap_init() definition. This is needed to fix up the build at the moment. Gradually this will be reworked to follow the 32-bit initialization path and deal with delayed VBR initialization. Signed-off-by: Paul Mundt commit e7971c80a8e0299f91272ad8e8ac4167623e1862 Author: Andreas Bombe Date: Mon May 17 23:12:46 2010 -0700 ARCNET: Limit com20020 PCI ID matches for SOHARD cards The SH SOHARD ARCNET cards are implemented using generic PLX Technology PCI<->IOBus bridges. Subvendor and subdevice IDs were not specified, causing the driver to attach to any such bridge and likely crash the system by attempting to initialize an unrelated device. Fix by specifying subvendor and subdevice according to the values found in the PCI-ID Repository at http://pci-ids.ucw.cz/ . Cc: stable@kernel.org Signed-off-by: Andreas Bombe Signed-off-by: David S. Miller commit 3fa21e07e6acefa31f974d57fba2b6920a7ebd1a Author: Joe Perches Date: Mon May 17 23:08:21 2010 -0700 net: Remove unnecessary returns from void function()s This patch removes from net/ (but not any netfilter files) all the unnecessary return; statements that precede the last closing brace of void functions. It does not remove the returns that are immediately preceded by a label as gcc doesn't like that. Done via: $ grep -rP --include=*.[ch] -l "return;\n}" net/ | \ xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }' Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b60b6592baa69c43a5a0f55d6300a7feaab15338 Author: stephen hemminger Date: Tue May 11 14:24:12 2010 +0000 net sched: cleanup and rate limit warning If the user has a bad classification configuration, and gets a packet that goes through too many steps. Chances are more packets will arrive, and the message spew will overrun syslog because it is not rate limited. And because it is not tagged with appropriate priority it can't not be screened. Added the qdisc to the message to try and give some more context when the message does arrive. Signed-off-by: Stephen Hemminger Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 207024b9477e253859abfc30f1ff314cd6008b24 Author: stephen hemminger Date: Wed May 12 06:37:07 2010 +0000 pfkey: add severity to printk Put severity level on pfkey printk messages Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 62db5cfd70b1ef53aa21f144a806fe3b78c84fab Author: stephen hemminger Date: Wed May 12 06:37:06 2010 +0000 xfrm: add severity to printk Serious oh sh*t messages converted to WARN(). Add KERN_NOTICE severity to the unknown policy type messages. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 6ff9c3644e72bfac20844e0155c2cc8108602820 Author: stephen hemminger Date: Wed May 12 06:37:05 2010 +0000 net sched: printk message severity The previous patch encourage me to go look at all the messages in the network scheduler and fix them. Many messages were missing any severity level. Some serious ones that should never happen were turned into WARN(), and the random noise messages that were handled changed to pr_debug(). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 00c60a8312c235cac1c879b620ecb71413e9245d Author: Rami Rosen Date: Tue May 11 19:37:36 2010 +0000 cleanup: remove pppoe_ioctl() declaration. Hi, - This patch removes pppoe_ioctl() declaration in drivers/net/pppoe.c as it is unneeded. Regards, Rami Rosen Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit a05abcb5c912ce7127e5c638b490313e88541784 Author: Julia Lawall Date: Thu May 13 10:06:01 2010 +0000 drivers/net: Use kcalloc or kzalloc Use kcalloc or kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,y,flags; statement S; type T; @@ x = - kmalloc + kcalloc ( - y * sizeof(T), + y, sizeof(T), flags); if (x == NULL) S -memset(x, 0, y * sizeof(T)); @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 476c609e6eebe73e6038068b16a22238617b54a4 Author: Julia Lawall Date: Thu May 13 10:05:40 2010 +0000 drivers/net/vmxnet3: Use kzalloc Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Signed-off-by: Bhavesh Davda Signed-off-by: David S. Miller commit 49afa55b5bd792cda4fca15d3238e9b6f370c856 Author: Julia Lawall Date: Thu May 13 10:03:32 2010 +0000 net/caif: Use kzalloc Use kzalloc rather than the combination of kmalloc and memset. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Acked-by: Sjur Brændeland Signed-off-by: David S. Miller commit beae22e6f393c461ee7fb394dbf06fa50157836b Author: Julia Lawall Date: Thu May 13 10:00:22 2010 +0000 drivers/net: Use kzalloc Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Acked-by: Lennert Buytenhek Signed-off-by: David S. Miller commit c77b29db74a0ea4fdce0564a63b8876798625d64 Author: Paul Mundt Date: Tue May 18 14:53:23 2010 +0900 sh: fix up CONFIG_KEXEC=n build. The reserve_crashkernel() definition is in asm/kexec.h which is only dragged in via linux/kexec.h if CONFIG_KEXEC is set. Just switch over to asm/kexec.h unconditionally to fix up the build. Signed-off-by: Paul Mundt commit 2e3219b5c8a2e44e0b83ae6e04f52f20a82ac0f2 Author: Wei Yongjun Date: Mon May 17 22:51:58 2010 -0700 sctp: fix append error cause to ERROR chunk correctly commit 5fa782c2f5ef6c2e4f04d3e228412c9b4a4c8809 sctp: Fix skb_over_panic resulting from multiple invalid \ parameter errors (CVE-2010-1173) (v4) cause 'error cause' never be add the the ERROR chunk due to some typo when check valid length in sctp_init_cause_fixed(). Signed-off-by: Wei Yongjun Reviewed-by: Neil Horman Acked-by: Vlad Yasevich Signed-off-by: David S. Miller commit f8bd909183acffad68780b10c1cdf36161cfd5d1 Author: Scott Feldman Date: Mon May 17 22:50:19 2010 -0700 net: Add ndo_{set|get}_vf_port support for enic dynamic vnics Add enic ndo_{set|get}_vf_port ops to support setting/getting port-profile for enic dynamic devices. Enic dynamic devices are just like normal enic eth devices except dynamic enics require an extra configuration step to assign a port-profile identifier to the interface before the interface is useable. Once a port-profile is assigned, link comes up on the interface and is ready for I/O. The port-profile is used to configure the network port assigned to the interface. The network port configuration includes VLAN membership, QoS policies, and port security settings typical of a data center network. A dynamic enic initially has a zero-mac address. Before a port-profile is assigned, a valid non-zero unicast mac address should be assign to the dynamic enic interface. Signed-off-by: Scott Feldman Signed-off-by: Roopa Prabhu commit 57b610805ce92dbd79fc97509f80fa5391b99623 Author: Scott Feldman Date: Mon May 17 22:49:55 2010 -0700 net: Add netlink support for virtual port management (was iovnl) Add new netdev ops ndo_{set|get}_vf_port to allow setting of port-profile on a netdev interface. Extends netlink socket RTM_SETLINK/ RTM_GETLINK with two new sub msgs called IFLA_VF_PORTS and IFLA_PORT_SELF (added to end of IFLA_cmd list). These are both nested atrtibutes using this layout: [IFLA_NUM_VF] [IFLA_VF_PORTS] [IFLA_VF_PORT] [IFLA_PORT_*], ... [IFLA_VF_PORT] [IFLA_PORT_*], ... ... [IFLA_PORT_SELF] [IFLA_PORT_*], ... These attributes are design to be set and get symmetrically. VF_PORTS is a list of VF_PORTs, one for each VF, when dealing with an SR-IOV device. PORT_SELF is for the PF of the SR-IOV device, in case it wants to also have a port-profile, or for the case where the VF==PF, like in enic patch 2/2 of this patch set. A port-profile is used to configure/enable the external switch virtual port backing the netdev interface, not to configure the host-facing side of the netdev. A port-profile is an identifier known to the switch. How port- profiles are installed on the switch or how available port-profiles are made know to the host is outside the scope of this patch. There are two types of port-profiles specs in the netlink msg. The first spec is for 802.1Qbg (pre-)standard, VDP protocol. The second spec is for devices that run a similar protocol as VDP but in firmware, thus hiding the protocol details. In either case, the specs have much in common and makes sense to define the netlink msg as the union of the two specs. For example, both specs have a notition of associating/deassociating a port-profile. And both specs require some information from the hypervisor manager, such as client port instance ID. The general flow is the port-profile is applied to a host netdev interface using RTM_SETLINK, the receiver of the RTM_SETLINK msg communicates with the switch, and the switch virtual port backing the host netdev interface is configured/enabled based on the settings defined by the port-profile. What those settings comprise, and how those settings are managed is again outside the scope of this patch, since this patch only deals with the first step in the flow. Signed-off-by: Scott Feldman Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller commit ee289b6440c3b0ccb9459495783e8c299bec6604 Author: Joe Perches Date: Mon May 17 22:47:34 2010 -0700 drivers/net: remove useless semicolons switch and while statements don't need semicolons at end of statement [ Fixup minor conflicts with recent wimax merge... -DaveM ] Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 5113fec0984276836cb6f0677f7cb53586ec3451 Author: Ursula Braun Date: Sun May 16 21:15:14 2010 +0000 qeth: support the new OSA CHPID types OSX and OSM The qeth driver is enabled to support the new OSA CHPID types OSX and OSM. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit ae57b20a0a1d3aa6cc35b51355949177de94aece Author: Julia Lawall Date: Sun May 16 21:15:13 2010 +0000 drivers/s390/net: Drop memory allocation cast Drop cast on the result of kmalloc and similar functions. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ type T; @@ - (T *) (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\| kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)) // Signed-off-by: Julia Lawall Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 95718c1c25370b2c85061a4d8dfab2831b3ad280 Author: Tadashi Abe Date: Mon May 17 22:41:45 2010 -0700 pegasus: fix USB device ID for ETX-US2 USB device ID definition for I-O Data ETX-US2 is wrong. Correct ID is 0x093a. Here's snippet from /proc/bus/usb/devices; T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ff(vend.) Sub=ff Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=04bb ProdID=093a Rev= 1.01 S: Manufacturer=I-O DATA DEVICE,INC. S: Product=I-O DATA ETX2-US2 S: SerialNumber=A26427 C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=224mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=00 Driver=pegasus E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=125us This patch enables pegasus driver to work fine with ETX-US2. Signed-off-by: Tadashi Abe Signed-off-by: David S. Miller commit 56e6943b902562e09d3e74126d8d8256b5ea17fb Author: Wolfgang Grandegger Date: Mon May 17 22:39:48 2010 -0700 can: sja1000 platform data fixes The member "clock" of struct "sja1000_platform_data" is documented as "CAN bus oscillator frequency in Hz" but it's actually used as the CAN clock frequency, which is half of it. To avoid further confusion, this patch fixes it by renaming the member to "osc_freq". That way, also non mainline users will notice the change. The platform code for the relevant boards is updated accordingly. Furthermore, pre-defined values are now used for the members "ocr" and "cdr". Signed-off-by: Wolfgang Grandegger Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit d19d56ddc88e7895429ef118db9c83c7bbe3ce6a Author: Eric Dumazet Date: Mon May 17 22:36:55 2010 -0700 net: Introduce skb_tunnel_rx() helper skb rxhash should be cleared when a skb is handled by a tunnel before being delivered again, so that correct packet steering can take place. There are other cleanups and accounting that we can factorize in a new helper, skb_tunnel_rx() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit de213e5eedecdfb1b1eea7e6be28bc64cac5c078 Author: Eric Dumazet Date: Mon May 17 22:35:36 2010 -0700 tcp: tcp_synack_options() fix Commit 33ad798c924b4a (tcp: options clean up) introduced a problem if MD5+SACK+timestamps were used in initial SYN message. Some stacks (old linux for example) try to negotiate MD5+SACK+TSTAMP sessions, but since 40 bytes of tcp options space are not enough to store all the bits needed, we chose to disable timestamps in this case. We send a SYN-ACK _without_ timestamp option, but socket has timestamps enabled and all further outgoing messages contain a TS block, all with the initial timestamp of the remote peer. Fix is to really disable timestamps option for the whole session. Reported-by: Bijay Singh Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit eedf042a63ffef050ebc015de19b52dc065e830b Author: Stephen Hemminger Date: Mon May 17 22:27:12 2010 -0700 ipv6: fix the bug of address check The duplicate address check code got broken in the conversion to hlist (2.6.35). The earlier patch did not fix the case where two addresses match same hash value. Use two exit paths, rather than depending on state of loop variables (from macro). Based on earlier fix by Shan Wei. Signed-off-by: Stephen Hemminger Reviewed-by: Shan Wei Signed-off-by: David S. Miller commit 4f7cdc38c000deba82479205f4c99f4c1e7c6d1f Author: Naveen Krishna Date: Thu May 13 22:06:36 2010 +0900 ARM: SAMSUNG: Moving ADC device definition to plat-samsung. This patch moves ADC device definition to plat-samsung. Because that is generic to the S3C64XX and S5P Series SoCs. Signed-off-by: Naveen Krishna Ch Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 820ae8a80eb59962aefbbd4908dfe144ec0f9edb Merge: 380fefb 6fe70aa Author: David S. Miller Date: Mon May 17 21:09:11 2010 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 92f4fc10d7ba01fd84abbfae963d379c73ba5a0f Author: Mauro Carvalho Chehab Date: Wed Mar 31 16:07:49 2010 -0300 V4L/DVB: cx88: Only start IR if the input device is opened Signed-off-by: Mauro Carvalho Chehab commit 716aab44df8bb9bdf16abea9013890274329b61f Author: Mauro Carvalho Chehab Date: Wed Mar 31 14:40:35 2010 -0300 V4L/DVB: ir-core: Add callbacks for input/evdev open/close on IR core Especially when IR needs to do polling, it generates lots of wakeups per second. This makes no sense, if the input event device is closed. Adds a callback handler to the IR hardware driver, to allow registering an open/close ops. Signed-off-by: Mauro Carvalho Chehab commit e202c15b4209f05fe109dd396463a524f4c2d3d8 Author: Mauro Carvalho Chehab Date: Fri Mar 26 22:45:16 2010 -0300 V4L/DVB: ir-core: rename sysfs remote controller class from ir to rc IR is an alias for Infrared Remote, while RC is an alias for Remote Controller. While currently all implementations are with Infrared Remote Controller, this subsystem is not meant to be used only by IR type of RC's. So, as discussed on both linux-media and linux-input, the better is to rename the subsystem as Remote Controller. While, currently, the only application that uses the /sys/class/irrcv is ir-keytable application, and its sysfs support works only with the current linux-next code, it is still possible to change the userspace API without the risk of breaking applications. So, better to rename this sooner than later. Later patches will be needed to rename the files and to move them away from drivers/media, but this is not a critical issue. So, for now, let's just change the name of the sysfs class/nodes. Signed-off-by: Mauro Carvalho Chehab commit d89b4bd2b47395339d5b5b6a7e28f91dd0d21b7b Author: Mauro Carvalho Chehab Date: Fri Mar 26 22:39:29 2010 -0300 V4L/DVB: saa7134: clear warning noise drivers/media/video/saa7134/saa7134-input.c: In function ‘saa7134_raw_decode_irq’: drivers/media/video/saa7134/saa7134-input.c:957: warning: unused variable ‘oldpulse’ drivers/media/video/saa7134/saa7134-input.c:957: warning: unused variable ‘count’ Signed-off-by: Mauro Carvalho Chehab commit 20d5f116ec777c9c7ce5b74f0d17ee1d01a0d833 Author: Mauro Carvalho Chehab Date: Thu Mar 25 23:49:46 2010 -0300 V4L/DVB: ir-nec-decoder: Add sysfs node to enable/disable per irrcv With the help of raw_register/raw_unregister, adds a sysfs group associated with the decoder, inside the corresponding irrcv node. Writing 1 to nec_decoder/enabled enables the decoder, while writing 0 disables it. Signed-off-by: Mauro Carvalho Chehab commit 93c312ff21b0a53e701a45741887208297646a1a Author: Mauro Carvalho Chehab Date: Thu Mar 25 21:13:43 2010 -0300 V4L/DVB: ir-core: prepare to add more operations for ir decoders Some decoders and a lirc_dev interface may need some other operations to work. For example: IR device register/unregister and ir_keydown events may need to be tracked. As some operations can occur in interrupt time, and a lock is needed to prevent un-registering a decode while decoding a key, the lock needed to be convert into a spin lock. Signed-off-by: Mauro Carvalho Chehab commit 995187bed30c0545e8da88372e9807da0a85911e Author: Mauro Carvalho Chehab Date: Wed Mar 24 20:47:53 2010 -0300 V4L/DVB: ir-core: dynamically load the compiled IR protocols Instead of hardcoding the protocols into ir-core, add a register interface for the IR protocol decoders, and convert ir-nec-decoder into a client of ir-core. With this approach, it is possible to dynamically load the needed IR protocols, and to add a RAW IR interface module, registered as one IR raw protocol decoder. This patch opens a way to register a lirc_dev interface to work as an userspace IR protocol decoder. Signed-off-by: Mauro Carvalho Chehab commit 9f1547829a6f39fe6b2da22653dff40502f3d568 Author: Mauro Carvalho Chehab Date: Sun Mar 21 13:00:55 2010 -0300 V4L/DVB: saa7134: don't wait too much to generate an IR event on raw_decode At raw_decode mode, the key is processed after the end of a timer. The previous code resets the timer every time something is received at the IR port. While this works fine with IR's that don't implement repeat, like Avermedia RM-JX IR, it keeps waiting until keydown, on IR's that implement NEC repeat command, like the Terratec yellow. The solution is to change the behaviour to do the timeout after the first received data. The timeout is currently set to 15 ms, as it works fine with NEC protcocol. It may need some adjustments to support other protocols and to better handle spurious detections that may happen with some IR sensors. Signed-off-by: Mauro Carvalho Chehab commit ada39630c758c5c3098f4fc1361103ea2bc1afe0 Author: Mauro Carvalho Chehab Date: Sun Mar 21 12:24:24 2010 -0300 V4L/DVB: ir-core/saa7134: Move ir keyup/keydown code to the ir-core Signed-off-by: Mauro Carvalho Chehab commit 6660de568d164e4eda6617dadcb999c96e62203f Author: Mauro Carvalho Chehab Date: Sun Mar 21 12:15:16 2010 -0300 V4L/DVB: ir-core: add two functions to report keyup/keydown events Signed-off-by: Mauro Carvalho Chehab commit a3572c34da8dacc78a629211a91cf34e9b408701 Author: Mauro Carvalho Chehab Date: Sat Mar 20 20:59:44 2010 -0300 V4L/DVB: ir-core: Add logic to decode IR protocols at the IR core Adds a method to pass IR raw pulse/code events into ir-core. This is needed in order to support LIRC. It also helps to move common code from the drivers into the core. In order to allow testing, it implements a simple NEC protocol decoder at ir-nec-decoder.c file. The logic is about the same used at saa7134 driver that handles Avermedia M135A and Encore FM53 boards. Signed-off-by: Mauro Carvalho Chehab commit 0210894956cf57d525d56341cc3e0f3d5d2db659 Author: Mauro Carvalho Chehab Date: Sat Mar 20 00:25:37 2010 -0300 V4L/DVB: saa7134: add code to allow changing IR protocol Signed-off-by: Mauro Carvalho Chehab commit d152b8b62421c441bea4eb5d92e9d1b4883fd201 Author: Mauro Carvalho Chehab Date: Sat Mar 20 00:23:30 2010 -0300 V4L/DVB: saa7134: use a full scancode table for M135A Signed-off-by: Mauro Carvalho Chehab commit ecf6e72da31f951aed4618e422de62a72a1d76c6 Author: Mauro Carvalho Chehab Date: Sat Mar 20 00:17:58 2010 -0300 V4L/DVB: ir-core: be less pedantic with RC protocol name Signed-off-by: Mauro Carvalho Chehab commit ed3de6015a920c131fbcc770fb95097fde592d86 Author: Laurent Pinchart Date: Wed Mar 31 12:29:26 2010 -0300 V4L/DVB: uvcvideo: Use POLLOUT and POLLWRNORM for output devices The V4L2 specification requires drivers to use the write events in the file operations poll handler for output devices. The uvcvideo driver erroneously used read events for all devices. Fix this. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 35a00c41ea8b280cb629503c735daf20cdf0f9f8 Author: Laurent Pinchart Date: Wed Jan 20 12:13:46 2010 -0300 V4L/DVB: uvcvideo: Support iris absolute and relative controls Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 48213fe3f981d2cbccd926d6858fa9cf8617beed Author: Laurent Pinchart Date: Wed Jan 20 12:12:57 2010 -0300 V4L/DVB: v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls Those control, as their names imply, control the camera aperture settings. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit f129b03ba272c86c42ad476684caa0d6109cb383 Author: Laurent Pinchart Date: Sat Mar 13 18:12:15 2010 -0300 V4L/DVB: uvcvideo: Add support for Packard Bell EasyNote MX52 integrated webcam The camera requires the STREAM_NO_FID quirk. Add a corresponding entry in the device IDs list. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 1e4d05bc95a0fe2972c5c91ed45466587d07cd2c Author: Laurent Pinchart Date: Thu Mar 4 07:51:25 2010 -0300 V4L/DVB: uvcvideo: Add support for unbranded Arkmicro 18ec:3290 webcams The camera requires the PROBE_DEF quirk. Add a corresponding entry in the device IDs list. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit dbad345e6a6159e5d8aec45533d299aa2a138aff Author: Jean-François Moine Date: Mon Mar 29 03:51:18 2010 -0300 V4L/DVB: sn9c102 / zc0301: Handle webcams when no gspca subdriver conflict Some webcams handled by both sn9c102 or zc0301 and some gspca subdrivers (sonixb, sonixj and zc3xx) were not handled when gspca was generated but not the associated subdrivers. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit be1da9ee83eb5c27a69b30577232d1ec72876e7a Author: Costantino Leandro Date: Tue Mar 23 12:31:16 2010 -0300 V4L/DVB: gspca - t613: Add color controls - Rename controls to fit real behaviour - Add global gain , r/b balance. Signed-off-by: Costantino Leandro Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 63b59cecb2fa0a274d1c7240112460816d826988 Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:54 2010 -0300 V4L/DVB: V4L: tvp514x: Add Powerup sequence during s_input to lock the signal properly For the sequence streamon -> streamoff and again s_input, it fails to lock the signal, since streamoff puts TVP514x into power off state which leads to failure in sub-sequent s_input. So add powerup sequence in s_routing (if disabled), since it is important to lock the signal at this stage. Signed-off-by: Vaibhav Hiremath Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 844cc0dcb588ee7005c70cffd92ee7a0c1270729 Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:23 2010 -0300 V4L/DVB: V4L: vpfe_capture: Add support for USERPTR mode of operation Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit e333bab73e848d72904f39c7a0f5ba6425ba41f3 Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:19 2010 -0300 V4L/DVB: V4L: dm644x_ccdc: Add Suspend/Resume Support Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit aa2dc9034859531206889b6bf07b5f9adae487a6 Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:16 2010 -0300 V4L/DVB: V4L: vpfe_capture: Return 0 from suspend/resume Now Suspend/Resume functionality is being handled by respective CCDC code, so return true (0) from bridge suspend/resume function. Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 21aa300e160f03c237d2153d9938e14a87f38e0d Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:12 2010 -0300 V4L/DVB: V4L: dm644x_ccdc: Add 10bit BT support Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 085b54a24fd0c7353cd1b2d462879b7a4a4070fa Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:07 2010 -0300 V4L/DVB: V4L: vpfe_capture: Add call back function for interrupt clear for vpfe_cfg For the devices like AM3517, it is expected that driver clears the interrupt in ISR. Since this is device spcific, callback function added to the platform_data. Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit fcc63274e69f95aee9dbb7c1dc3af3d2961813cc Author: Vaibhav Hiremath Date: Sat Mar 27 09:37:03 2010 -0300 V4L/DVB: V4L: dm644x_ccdc: Debug register read prints removed Signed-off-by: Vaibhav Hiremath Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit b8e56b6f6e5b6c55d4d375cc9ebd79151b44db58 Author: Hans Verkuil Date: Mon Mar 29 16:05:33 2010 -0300 V4L/DVB: arv: convert to V4L2 Converted this old V4L1 driver to V4L2. I would like to thank Takeo Takahashi who very kindly tested this driver for me. Much appreciated! Signed-off-by: Hans Verkuil Tested-by: Takeo Takahashi Signed-off-by: Mauro Carvalho Chehab commit debff5a79595356b1d10063c5f5a7bcdf1b54bec Author: Hans Verkuil Date: Mon Mar 22 05:25:46 2010 -0300 V4L/DVB: zoran: remove V4L1 videodev.h include Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 51270617a52793c423ef68ddd3f18745e9abd15b Author: Hans Verkuil Date: Mon Mar 22 05:22:34 2010 -0300 V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c1f2b0f29e51cf44eb6addff1b90f99988055a92 Author: Hans Verkuil Date: Mon Mar 22 05:15:14 2010 -0300 V4L/DVB: w9966: remove camelCase Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 271922c0cee0b086ca2fe9cec39d585a44a2358b Author: Hans Verkuil Date: Mon Mar 22 05:13:17 2010 -0300 V4L/DVB: w9966: reorganize the order of functions Get rid of completely unnecessary function prototypes. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 467422678e9e73bff8d175024cdd89ed48483697 Author: Hans Verkuil Date: Mon Mar 22 05:09:07 2010 -0300 V4L/DVB: pms: remove unnecessary exclusive open/close Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b3e212dcbddb10b44d472a5f4c23d5aa0b5876ca Author: Hans Verkuil Date: Mon Mar 22 04:52:21 2010 -0300 V4L/DVB: v4l: add V4L2_PIX_FMT_Y4 and V4L2_PIX_FMT_Y6 pixelformats Old 4 and 6 bit greyscale pixel formats for the old bw-qcam webcam. This is needed to convert it to V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4bfdd58604ead4d49b29630ee8f72c99b7803b7d Author: Hans Verkuil Date: Mon Mar 22 04:47:27 2010 -0300 V4L/DVB: w9966: coding style cleanup Clean up the coding style before we convert this driver to V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 88f4423454a23375f07bb4ff3a80d209930560d0 Author: Hans Verkuil Date: Mon Mar 22 04:44:29 2010 -0300 V4L/DVB: arv: coding style cleanup Clean up the coding style before we convert this driver to V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1d61aac0996d96847e17263a41d34ab54bf8e103 Author: Hans Verkuil Date: Mon Mar 22 04:36:04 2010 -0300 V4L/DVB: bw-qcam: coding style cleanup Clean up the coding style before we convert this driver to V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 51224aa436238940e09e479db9c600cecfbebd20 Author: Hans Verkuil Date: Mon Mar 22 04:33:56 2010 -0300 V4L/DVB: c-qcam: coding style cleanup Clean up the coding style before we convert this driver to V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 380de498e264cca27d19deafe4dc44f624820d09 Author: Jonathan Corbet Date: Fri Mar 26 13:09:34 2010 -0300 V4L/DVB: ov7670: silence some compiler warnings Get rid of some "unused variable" warnings. These were the result of sloppiness and should not have happened; I'll go stand in the corner now. Reported-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit a8e68c37c846236499ac05e95af76dff2e9aa1eb Author: Jonathan Corbet Date: Thu Mar 18 19:10:18 2010 -0300 V4L/DVB: ov7670: Always rewrite clkrc when setting format That makes frame rate configuration persistent. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 467142093de1507833a08c50740d74b3b8c8eaca Author: Jonathan Corbet Date: Fri Mar 19 13:16:28 2010 -0300 V4L/DVB: ov7670: Restore SMBUS I/O for the XO 1.0 The Cafe controller doesn't do non-SMBUS I/O, so we have to use it there. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 364e93372fb21ef5de18d0122c78789f065ddbf5 Author: Jonathan Corbet Date: Fri Mar 5 16:48:39 2010 -0300 V4L/DVB: ov7670: wire up controls for exposure and autoexposure Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 81898671247a6cfa6bfd6a32faee18b3999b6610 Author: Jonathan Corbet Date: Thu Mar 4 18:50:34 2010 -0300 V4L/DVB: ov7670: Wire up V4L2_CID_GAIN and V4L2_CID_AUTOGAIN Allow applications to play with the gain settings. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 2bf7de48888fceed8d8e5cddd51f1d474bdbfae6 Author: Jonathan Corbet Date: Sun Feb 28 21:02:55 2010 -0300 V4L/DVB: ov7670: Don't use SMBUS I/O Contrary to my earlier belief, the ov7670 is not actually an SMBUS device, though it will pretend to be one if it's in a good mood. Unfortunately, it's rarely in a good mood, especially on the XO 1.5. So use low-level i2c I/O instead. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit d8d201552f518370d0a64cb758684f667fdd2012 Author: Jonathan Corbet Date: Sun Dec 20 11:39:47 2009 -0300 V4L/DVB: ov7670: Avoid reading clkrc Reading the clkrc register creates flaky behavior in some situations, and we can easily track its state separately. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 97693f9178ba83068f6b4e419a47ffd3d1a20897 Author: Jonathan Corbet Date: Sun Mar 21 17:33:50 2010 -0300 V4L/DVB: ov7670: Use CCIR601 in all video modes Also provide for a longer delay after reset - the XO 1.5 needs it. Signed-off-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit 4a3eaee4d0d2724d86cbb18ad4b0088ce0b7f8a2 Author: Dan Carpenter Date: Tue Mar 23 08:40:43 2010 -0300 V4L/DVB: em28xx: "Empia Em28xx Audio" too long card->driver is 15 characters and a NULL. The original code goes past the end of the array. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 935539c97ed5f4f46867e7f44e42ad2048403f4e Author: Dan Carpenter Date: Mon Mar 22 12:39:09 2010 -0300 V4L/DVB: cx231xx: card->driver "Conexant cx231xx Audio" too long card->driver is 15 characters and a NULL, the original code could cause a buffer overflow. Signed-off-by: Dan Carpenter Acked-by: Takashi Iwai Signed-off-by: Mauro Carvalho Chehab commit f2466d63a51db8244d3e78a4e6210d72a8930cfb Author: Mauro Carvalho Chehab Date: Wed Mar 24 16:33:40 2010 -0300 V4L/DVB: cx25821: prepend cx25821_ to video exported symbols As reported by Randy Dunlap : drivers/staging/cx25821/cx25821-video.c:89:struct cx25821_fmt *format_by_fourcc(unsigned int fourcc) (not static) conflicts with (has the same non-static name as) drivers/media/common/saa7146_video.c:87:struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc) To solve, add cx25821_ prefix to the exported functions found on cx25821-video.h. This patch were generated by this little shell/perl script: cat drivers/staging/cx25821/cx25821-video.h|perl -ne \ 'if (m/extern.* ([^\s\*]+)\(/) { $n=$1; print "s/([^\d\w_\.])$1/\\1cx25821_$1/g;\n" if (!($n =~ m/cx25821/)); }' \ >changes; for i in drivers/staging/cx25821/*.[ch]; do sed -r -f changes $i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab Cc: Palash Bandyopadhyay commit d7d93387421b52f8c9240ce82b368ad34bb40cd8 Author: Mauro Carvalho Chehab Date: Wed Mar 24 14:23:25 2010 -0300 V4L/DVB: cx25821-video.c: fix table indent Table indent were likely damaged by Lindent. Fix it. Signed-off-by: Mauro Carvalho Chehab Cc: Palash Bandyopadhyay commit 51e9dd3249eba4654f12a9473b8bfb5ddbf00d00 Author: Olimpiu Pascariu Date: Sun Mar 21 14:52:31 2010 -0300 V4L/DVB: cx25821: fix coding style issues in cx25821-i2c.c Fixes up warnings and errors found by the checkpatch.pl tool on cx25821-i2c.c Signed-off-by: Olimpiu Pascariu Cc: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit 0dd8be8c94d0f273685092106daf0875d9287da0 Author: Olimpiu Pascariu Date: Sun Mar 21 15:46:26 2010 -0300 V4L/DVB: cx25821: fix coding style issues in cx25821-medusa-video.c Fixes up warnings and errors found by the checkpatch.pl tool on cx25821-medusa-video.c Signed-off-by: Olimpiu Pascariu Acked-by: Dan Carpenter Cc: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit 1c614239b6f11692087f9500465803adf710122f Author: Olimpiu Pascariu Date: Sun Mar 21 14:44:01 2010 -0300 V4L/DVB: cx25821: fix coding style issues in cx25821-gpio.c Fixes up warnings and errors found by the checkpatch.pl tool on cx25821-gpio.c. Signed-off-by: Olimpiu Pascariu Cc: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit de2c43492017d705d3f7ffc7f89c9b5a93752871 Author: Olimpiu Pascariu Date: Sun Mar 21 14:18:19 2010 -0300 V4L/DVB: cx25821: fix coding style issues in cx25821-core.c Fixes up warnings and errors found by the checkpatch.pl tool on cx25821-core.c. Signed-off-by: Olimpiu Pascariu CC: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit b5f11cc7037fad423877ac09a48f337829880a95 Author: Mauro Carvalho Chehab Date: Tue May 18 00:51:02 2010 -0300 V4L/DVB: cx25821-audio-upstream.c: Fixed some checkpatch.pl warnings/errors This patch fixes up some warnings&errors found by the checkpatch.pl script Signed-off-by: Olimpiu Pascariu CC: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit d72d7c1df98628315298102dd1d442bcf24dc44c Author: Dan Carpenter Date: Wed Mar 17 12:11:56 2010 -0300 V4L/DVB: ivtv: sizeof() => ARRAY_SIZE() This fixes a smatch warning: drivers/media/video/ivtv/ivtv-vbi.c +138 ivtv_write_vbi(43) error: buffer overflow 'vi->cc_payload' 256 <= 1023 Signed-off-by: Dan Carpenter Reviewed-by: Andy Walls Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7a02264ca9ec5409e22b9d41f32b431d08eadbce Author: Pawel Osciak Date: Wed Mar 17 04:01:04 2010 -0300 V4L/DVB: v4l: videobuf: code cleanup Make videobuf pass checkpatch; minor code cleanups. Signed-off-by: Pawel Osciak Reviewed-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab commit 85e092190b5f7dfe9b78556440472c5590a32b4e Author: Dmitri Belimov Date: Tue Mar 23 11:23:29 2010 -0300 V4L/DVB: Add SPI support to V4L2 Add support SPI bus to v4l2. Useful for control some device with SPI bus like hardware MPEG2 encoders and etc. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 443fed9fa42bbeacdb8d336b8a5002a262cac15c Author: Devin Heitmueller Date: Fri Mar 19 23:53:12 2010 -0300 V4L/DVB: em28xx: add em286x/tvp5150 reference design Add support for design which has an em2863/tvp5150 and uses the standard empia USB ID. In Sander's case, it was branded as an "Eminent model EM3705" Thanks to Sander Van Ginkel for testing and help debugging the support. [mchehab@redhat.com: move it to a vague card number slot (card=29)] Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit d1875d65599e187feb92994af33f409612e05ca3 Author: Mauro Carvalho Chehab Date: Wed Mar 24 09:36:32 2010 -0300 V4L/DVB: gspca: fixes compilation when input is not selected It seems that I merged a wrong version of the patch or that changeset 4d770eeb926d0bc44c0bd68d051d3d2a5568ef41 got mangled somehow: It were missed the #else to avoid compilation troubles. Signed-off-by: Mauro Carvalho Chehab commit a82437510256b83671e49a23774c9c5ce0d4ab00 Author: Mauro Carvalho Chehab Date: Wed Mar 24 09:35:47 2010 -0300 V4L/DVB: stv0900: Whitespace cleanup Fixes sync with -hg tree Signed-off-by: Mauro Carvalho Chehab commit 27e5842a9ad7a929f680ed151b5b1126456fb5f6 Author: Mauro Carvalho Chehab Date: Wed Mar 24 09:34:39 2010 -0300 V4L/DVB: saa7134: Use the same name on CARDLIST as found at the driver Signed-off-by: Mauro Carvalho Chehab commit 449adf94ada543026a0fc4d0139faf60304b899f Author: Mauro Carvalho Chehab Date: Mon Mar 22 14:37:52 2010 -0300 V4L/DVB: Fix cx88 and em28xx cardlists There are some missing entries there Signed-off-by: Mauro Carvalho Chehab commit f1a4f9eab2bac10d3145d75342eb372c0ef9f125 Author: Devin Heitmueller Date: Thu Mar 11 22:00:13 2010 -0300 V4L/DVB: v4l2-common: add ability to use v4l2_ctrl_query_fill for chroma gain Add the ability to use the v4l2_ctrl_query_fill() function for the newly introduced chroma gain control. Also, make use of the centralized function by the one caller. This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 87a6fe4a530cc01081d19cdec4738433972fb0ee Author: Devin Heitmueller Date: Thu Mar 11 21:49:24 2010 -0300 V4L/DVB: saa115: add support for chroma AGC and chroma gain Add support for chroma agc and gain to the saa7115 driver. This allows for users to do manual adjustment for abnormal signal conditions. This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 7a01f6dbc7abb85a6ec048dd45db92ef1b91fe78 Author: Devin Heitmueller Date: Thu Mar 11 21:27:59 2010 -0300 V4L/DVB: videodev2: introduce a common control for chroma gain Introduce a new control for modifying the chroma gain. This allows for user intervention in abnormal signal conditions cases where the decoder's chroma AGC cannot compensate and the value needs to be adjusted manually. This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit fea551fae99c79f43e519cf53e35462ff5ce2a03 Author: Devin Heitmueller Date: Wed Feb 3 00:33:48 2010 -0300 V4L/DVB: saa7115: enable anti-alias filter This patch enables the anti-alias filter, which was originally enabled for the saa7113, but the saa7115_init_misc was trampling the value. Without this patch, there would be visible vertical bands in the chroma. Thanks to Andy Walls for helping test this change against other ivtv products. This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 5fee334039550bdd5efed9e69af7860a66a9de37 Author: Devin Heitmueller Date: Fri Jan 22 02:34:32 2010 -0300 V4L/DVB: em28xx: rework buffer pointer tracking for offset to start of video Rework the logic for tracking the amount of data copied to the VBI buffer, to address problem found where the video lines are several bytes shifted to the right (and the leading pixels in the first line rendered are garbage). This would occur because the copy function would advance the pointer when detecting headers, but the caller would not adjust the length actually copied. This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1744feab9a2241f2adf03be5ef8ecbd279f5944b Author: Devin Heitmueller Date: Fri Jan 22 02:05:24 2010 -0300 V4L/DVB: em28xx: reduce cropping for VBI area It turns up we can reduce the starting line for the active area, which results in more data being captured when under PAL (while the full VBI capture window still stays properly encoded). This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 33c02facb5a3123212587295cc1c241ee7e03adb Author: Devin Heitmueller Date: Fri Jan 22 01:53:17 2010 -0300 V4L/DVB: em28xx: adjust number of packets per URB Increase the packets per URB count from 40 to 64. I suspect that whoever was looking at the usbsnoop captures saw "0x40" packets and mistook it for "40". As a result of this change, I can see a 25% reduction in the number of interrupts generated via powertop. This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit f0dbf82bf1ff97c24af228328fb21c93fcfcb983 Author: Hans de Goede Date: Thu Mar 11 06:12:39 2010 -0300 V4L/DVB: sn9c102: Make hv7131d sensor code also recognize the HV7131E The hv7131d sensor code also works for the hv7131e, this patch changes it to also recognize the hv7131e sensor id. Tested-by: Frank Danapfel Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 436c2c533a2a2f98d95347f4d5b4022becb046f6 Author: Hans de Goede Date: Sun Feb 28 09:41:04 2010 -0300 V4L/DVB: gspca_spca561: Add support for camera button gspca_spca561: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 6b33e5e7fe03c6577ccbaeeb028ab4ec1f26f2b0 Author: Hans de Goede Date: Sat Feb 27 07:18:14 2010 -0300 V4L/DVB: gspca_spca561: Fix LED on rev12a cameras Fix LED control on rev12a cameras and remove the unneeded sd_stop0 callback function. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit cc2a833590e4bf4920383345cd61bc310ba84af0 Author: Brian Johnson Date: Tue Mar 16 13:58:28 2010 -0300 V4L/DVB: gspca - sn9c20x: Fix bug with OV9655 code Fixed buggy init sequence for the OV9655 sensor. Tested with a 0c45:6288 and 0c45:62b3. Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit e99ac54da6d3e44e6152aaab693fa311279dec7c Author: Brian Johnson Date: Tue Mar 16 13:58:28 2010 -0300 V4L/DVB: gspca - sn9c20x: Add support for cameras using the MT9M112 sensor Adds the following models: - 0c45:624c - 0c45:628c - 0458:704a - 0458:704c Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit 7ddaac7fcb01eed38692f1bfa81f5f4348d848d7 Author: Brian Johnson Date: Tue Mar 16 13:58:27 2010 -0300 V4L/DVB: gspca - sn9c20x: Add upside down detection Add support for detecting webcams that are mounted upside down in laptops. Currently the only two known are two MSI modesl using the 0c45:624f. Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit 0c045eb752259d4176eabacbdf28a627644a071a Author: Brian Johnson Date: Tue Mar 16 13:58:27 2010 -0300 V4L/DVB: gspca - sn9c20x: Add support for camera LEDs Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit a39db27a08ef85ae37beab261744d8b38f21225c Author: Mauro Carvalho Chehab Date: Tue May 18 00:49:44 2010 -0300 V4L/DVB: gspca - sn9c20x: use gspca's input device handling Drop custom code for handling the input button in favor of using gspca's input hanlding mechinism. Signed-off-by: Brian Johnson Signed-off-by: Mauro Carvalho Chehab commit ad98c0f674796848c6fd8fe614ef83ef971ebfcf Author: Jean-François Moine Date: Thu Mar 18 05:15:30 2010 -0300 V4L/DVB: gspca - sonixj: Add webcam 0c45:6142 with sensors gc0307 and po2030n Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9c33afc6102517764fb5d308dcf49bf42893da2c Author: Jean-François Moine Date: Wed Mar 17 15:25:32 2010 -0300 V4L/DVB: gspca - sonixj: More static const and better array initialization Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 32208d444ab6ed427d18deebc4ad783602c695ba Author: Hans Verkuil Date: Sun Mar 14 08:01:55 2010 -0300 V4L/DVB: v4l2: sort chip IDs in v4l2-chip-ident.h This list should stay sorted to make it easy to find new ID ranges when adding new chip families. [mchehab@redhat.com: fixed bad whitespacing] Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9583183acbd40fc6e972ac39ae0a2173976f288e Author: Hans Verkuil Date: Sat Mar 13 19:03:21 2010 -0300 V4L/DVB: v4l doc: fix font of field name The field 'reserved' was not tagged as a 'structfield' as it should. This made the text a bit confusing. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 771075bb4667078687ae3c570a17c274f389e01e Author: Hans Verkuil Date: Sat Mar 13 11:47:06 2010 -0300 V4L/DVB: videobuf-core: fix spelling mistake in debug message Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8f27fd9605a28225bb71f2b3ade5d248231cd824 Author: Vladimir Ermakov Date: Wed Mar 10 12:44:57 2010 -0300 V4L/DVB: saa7134: add capture boards Hawell HW-404M7 and HW-808M7 Adds new capture boards Hawell HW-404M7 and HW-808M7. Those cards have 4 or 8 SAA7130 chips and for the work it only needs initialize registers. The value of those registers were dumped under Windows using flytest. But board haven't EEPROM. For the first chip: SAA7130 (0x7130, SubVenID:1131, SubDevID:0000, Rev: 01) I2C slave devices found: No devices GPIO pins: Mode : 0x00389C00 Value: 0x00016C00 Video input: 3 Audio input: Analog Line1 For other chips: SAA7130 (0x7130, SubVenID:1131, SubDevID:0000, Rev: 01) I2C slave devices found: No devices GPIO pins: Mode : 0x00389200 Value: 0x00010000 Video input: 3 Audio input: Analog Line1 Signed-off-by: Vladimir Ermakov Signed-off-by: Mauro Carvalho Chehab commit a3415c15e1b5965c8efe0c0eb84b49689ed954ef Author: Frank Schaefer Date: Sun Mar 14 14:28:54 2010 -0300 V4L/DVB: v4l2_ctrl_get_name(): add missing control names, and make title for V4L2_CID_BG_COLOR consistent v4l2_ctrl_get_name(): add missing control names, and make title for V4L2_CID_BG_COLOR consistent V4L2_CID_AUTOBRIGHTNESS was introduced with kernel 2.6.31 V4L2_CID_BAND_STOP_FILTER was introduced with kernel 2.6.32 Signed-off-by: Frank Schaefer Signed-off-by: Mauro Carvalho Chehab commit 8889a8a53e0144da5dee58e9693190bbdf1c3959 Author: Olimpiu Pascariu Date: Sun Mar 14 12:44:37 2010 -0300 V4L/DVB: Staging: cx25821: fix coding style issues in cx25821-alsa.c >From 9473816c446a6ca91905fc49a73732f70b5223b4 Mon Sep 17 00:00:00 2001 This is a patch to the cx25821-alsa.c file that fixes up errors and warnings found by the checkpatch.pl tool [mchehab@redhat.com: a few adjustments on the comments to improve readability] Signed-off-by: Olimpiu Pascariu Signed-off-by: Mauro Carvalho Chehab commit 4d36ec7fbf619a48c506eaa497d21619297a2b4f Author: Huang Weiyi Date: Fri Mar 12 11:12:22 2010 -0300 V4L/DVB: tlg2300: remove unused #include Remove unused #include ('s) in drivers/media/video/tlg2300/pd-main.c Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit 728385c4d31469b9124953f36fb42015435466c9 Author: Julia Lawall Date: Fri Mar 12 06:15:32 2010 -0300 V4L/DVB: drivers/media/video: move dereference after NULL test In quickcam_messenger.c, if the NULL test on uvd is needed, then the dereference should be after the NULL test. In vpif_display.c, std_info is initialized to the address of a structure field. This seems unlikely to be NULL. Test std_info->stdid instead. In saa7134-alsa.c, the function is only called from one place, where the chip argument has already been dereferenced. On the other hand, if it should be kept, then card should be initialized after it. A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/): // @match exists@ expression x, E; identifier fld; @@ * x->fld ... when != \(x = E\|&x\) * x == NULL // Signed-off-by: Julia Lawall Acked-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 4e1af31aaaa8cc4a5cc1d894bdf04dfc7450d47f Author: Andy Walls Date: Sat Mar 13 20:37:25 2010 -0300 V4L/DVB: ivtv, ivtvfb: Use a define for the output line and field register address Get rid of the magic number 0x28c0 used in several places in the ivtv and ivtvfb driver and define the register address to a meaningful name. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2443baeaa01388f56824c55c087510312b8d8197 Author: Ian Armstrong Date: Sat Mar 13 20:22:34 2010 -0300 V4L/DVB: ivtv: Avoid hard system lock on decoder output mode change Changing the decoder video standard just prior to, or during, the output of the lower field may result in a hard system lock. To avoid this, try to ensure the firmware call occurs only during the first 100 lines of the top field. (Minor comment addition and a line break added Andy Walls .) Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit f978ac90b2cfa79cb075f74fd5c403e9f9ec4246 Author: Andy Walls Date: Sat Mar 13 16:40:34 2010 -0300 V4L/DVB: cx18: Add a component video input to the PVR2100 and DVR3200H card entries This is a guess at the proper configuration for component video on the Leadtek PVR2100 and DVR3100 H. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit d9a325a865becc082d592d16a15f01a9684ef82e Author: Andy Walls Date: Sat Mar 13 16:40:03 2010 -0300 V4L/DVB: cx18: Add support for component video inputs Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit c6ebc6c4acbedcc766a8af147ccb9c39e77578ae Author: Jean Delvare Date: Sun Mar 14 22:57:56 2010 -0300 V4L/DVB: saa7134: Fix IR support of some ASUS TV-FM 7135 variants Some variants of the ASUS TV-FM 7135 are handled as the ASUSTeK P7131 Analog (card=146). However, by the time we find out, some card-specific initialization is missed. In particular, the fact that the IR is GPIO-based. Set it when we change the card type, and run saa7134_input_init1(). Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 2415a2c14ef5fde98d61e3af4c5ff6e019659799 Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:45 2010 -0300 V4L/DVB: tm6000: replace occurences of req05 magic by a naming alias Yet another naming replace magic thanks to perl scripts. This time, it is done with: cat tm6000-regs.h |perl -ne 'if (m/(TM6010_REQ[^\s]+)\s+0x([a-f0-9]+)\, 0x([a-f0-9]+)/) { $name="$1"; $req=$2; $val=$3; printf "s/REQ_${req}_SET_GET_USBREG, 0x[0]*$3,/$1,/\n" }' >a; for i in tm*.c; do sed -f a $i >b && mv b $i; done Signed-off-by: Mauro Carvalho Chehab commit d9a724073633605def45be1f879a7406af469c87 Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:45 2010 -0300 V4L/DVB: tm6000: add request to registers of the group 05 Yet another script magic. This time, the change were generated by this script: cat tm6000-regs.h |perl -ne 'if (m/^(\#define TM6010_REQ)(05)([^\s]+)(\s+)0x([A-F0-9].)/) { \ $name="$1$2$3"; $sp=$4; $req=$2; $val=$5; $val=~tr/A-F/a-f/; \ printf "$name%s0x%s, 0x%s\n", $sp, $req, $val; } else { print $_ }' \ >a; mv a tm6000-regs.h Signed-off-by: Mauro Carvalho Chehab commit f7d110c68c7d0fe1de567ea86194fb405d6a43a6 Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:45 2010 -0300 V4L/DVB: tm6000: Replace naming convention for registers of req 05 group After looking at the "magic" registers, it is clear that usb registers belong to request 5. Replace them with this script: cat /tmp/reg3 |perl -ne 'if (m/define (TM6000_U_)([^\s]+)\s+0x([A-F0-9].)/) { \ $name=$2; $val=$3; printf "s,$1$2,TM6010_REQ05_R%s_%s,g\n", $val, $name; }' >a; sed -f a tm6000-regs.h >b; mv b tm6000-regs.h Signed-off-by: Mauro Carvalho Chehab commit 9afec493e2fe1a477305a09f933267d805fe4c8c Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:46 2010 -0300 V4L/DVB: tm6000: Replace all magic values by a register alias Instead of using magic pairs of req/reg, replace them by the defined values. This patch were generated by the following script: cat tm6000-regs.h |perl -ne 'if (m/(TM6010_REQ[^\s]+)\s+0x([a-f0-9]+)\, 0x([a-f0-9]+)/) { $name="$1"; $req=$2; $val=$3; printf "s/REQ_${req}_SET_GET_AVREG[_BIT]*, 0x[0]*$3,/$1,/\n" }' >a; for i in tm*.c; do sed -f a $i >b && mv b $i; done Signed-off-by: Mauro Carvalho Chehab commit 77012fb9954ebe355ce4ecfdaf9a0d5b88cb665b Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:46 2010 -0300 V4L/DVB: tm6000: Add request at Req07/Req08 register definitions Use a pair Req/Reg for all registers at req07 and req08 groups. This makes easier to replace them at the code with a script and helps to avoid using the wrong req with some register. This change were generated by this script: if (m/^(\#define TM6010_REQ)([0-9].)([^\s]+)(\s+)0x([A-F0-9].)/) { $name="$1$2$3"; $sp=$4; $req=$2; $val=$5; $val=~tr/A-F/a-f/; printf "$name%s0x%s, 0x%s\n", $sp, $req, $val; } else { print $_ } Signed-off-by: Mauro Carvalho Chehab commit c4bccf5e780a1e32807530d6b4b0624f14346cff Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:46 2010 -0300 V4L/DVB: tm6000: Replace all Req 8 group of regs with another naming convention According with the original patch that added the register names, those are related to tm6010, so name it properly as such. Also, clearly indicates when a register belongs to Request 0x08 and add its register value at the name. This makes easier to double check if the proper register is used along the driver. This patch were made with the help of this simple perl script, applied over the definitions of the last register groups: if (m/define (TM6000_)([^\s]+)\s+0x([A-F0-9].)/) { $name=$2; $val=$3; printf "s,$1$2,TM6010_REQ08_R%s_%s,g\n", $val, $name; } And were manually adjusted to fix a few minor issues. Signed-off-by: Mauro Carvalho Chehab commit b8e286260e97be4bb245041ae63b9565922246c2 Author: Mauro Carvalho Chehab Date: Thu Mar 11 10:26:46 2010 -0300 V4L/DVB: tm6000: Replace all Req 7 group of regs with another naming convention According with the original patch that added the register names, those are related to tm6010, so name it properly as such. Also, clearly indicates when a register belongs to Request 0x07 and add its register value at the name. This makes easier to double check if the proper register is used along the driver. This patch were made with the help of this simple perl script: if (m/define (TM6000_)([^\s]+)\s+0x([A-F0-9].)/) { $name=$2; $val=$3; printf "s,$1$2,TM6010_REQ07_R%s_%s,g\n", $val, $name; } And were manually adjusted to fix a few minor issues. Signed-off-by: Mauro Carvalho Chehab commit 4605664bd94ed94ab65a00bc7c749704304cfd40 Author: Michael Krufky Date: Sun Jan 31 21:06:10 2010 -0300 V4L/DVB: dvb-usb: enable specifying a separate generic bulk ctrl response endpoint Some DVB USB devices use a separate endpoint for responses to control messages sent with bulk transfers via the generic_bulk_ctrl_endpoint. When generic_bulk_ctrl_endpoint_response is set, it will be used instead of the generic_bulk_ctrl_endpoint when reading usb responses in the dvb_usb_generic_rw helper function. Signed-off-by: Michael Krufky Reviewed-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 727e625cc2c114e449a78f851b0c12edac897a83 Author: Mauro Carvalho Chehab Date: Fri Mar 12 21:18:14 2010 -0300 V4L/DVB: ir-core: export driver name used by IR via uevent Now, both driver and keytable names are exported to userspace. This will help userspace to decide when a table need to be replaced by another one. Signed-off-by: Mauro Carvalho Chehab commit 9c89a181a09eaafca5fc638c3b7ce1620227f60a Author: Mauro Carvalho Chehab Date: Fri Mar 12 11:50:17 2010 -0300 V4L/DVB: ir-core: Export IR name via uevent Signed-off-by: Mauro Carvalho Chehab commit 2915e5ef35d103a5ecae15d9ecc614fcd0dc48f4 Author: Mauro Carvalho Chehab Date: Fri Mar 12 11:40:13 2010 -0300 V4L/DVB: ir-core: Add a macro to properly create IR tables Signed-off-by: Mauro Carvalho Chehab commit 945cdfa2c99e2a3f5ead11519ba11ed1df2dd5c1 Author: Mauro Carvalho Chehab Date: Thu Mar 11 12:41:56 2010 -0300 V4L/DVB: ir: use a real device instead of a virtual class Change the ir-sysfs approach to create irrcv0 as a device, instead of using class_dev. Also, change the way input is registered, in order to make its parent to be the irrcv device. Due to this change, now the event device is created under /sys/class/ir/irrcv class: /sys/class/irrcv/irrcv0/ |-- current_protocol |-- device -> ../../../1-3 |-- input9 | |-- capabilities | | |-- abs ... Signed-off-by: Mauro Carvalho Chehab commit 8b0d2a052733d0a0e8ed59aeb8c7e6c90fdb793e Author: Stefan Ringel Date: Wed Mar 10 14:57:57 2010 -0300 V4L/DVB: tm6000: add new hybrid-stick -add Hauppauge WinTV HVR 900H/WinTV USB2-Stick vid/pid 0x2040/6601 0x2040/6610 0x2040/6611 -add Terratec Cinergy Hybrid-Stick vid/pid 0x0ccd/0x00a5 -add Twinhan TU501(704D1) vid/pid 0x13d3/0x3240 0x13d3/0x3241 0x13d3/0x3243 0x13d3/0x3264 Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 000f64efc7fe6693261a78a0164c0e805553631b Author: Mauro Carvalho Chehab Date: Thu Mar 11 01:58:12 2010 -0300 V4L/DVB: Fix bad whitespacing Signed-off-by: Mauro Carvalho Chehab commit 6721b51ece65967fe628007fee3e16479c07afd1 Author: Max Thrun Date: Sat Feb 27 17:20:28 2010 -0300 V4L/DVB: gspca - ov534: Update copyright info Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 4b7875407b2fb56433586877ca0a564b8d999f4e Author: Mosalam Ebrahimi Date: Mon Mar 8 13:52:17 2010 -0300 V4L/DVB: gspca - ov534: Add Powerline Frequency control Note that setting this options to 50Hz can reduce the framerate, so it is still disabled (60Hz) by default. Signed-off-by: Mosalam Ebrahimi Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7f9e9e8dc2d5b226819e486e13c9532f40a0fbda Author: Antonio Ospite Date: Mon Mar 1 08:54:33 2010 -0300 V4L/DVB: gspca - ov534: Cosmetics: fix indentation and hex digits * Indent with tabs, not with spaces, nor with mixed style. * Less indentation for controls index comments. * Use lowercase hex digits. Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit eb171073b6f941e83f01b6444ab347e893785faf Author: Max Thrun Date: Sat Feb 27 17:20:25 2010 -0300 V4L/DVB: gspca - ov534: Fix unsetting hflip and vflip bits Also set default values unconditionally, for readability. Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 3149cfbfaca7912995a32d72ddd2381e66ca845e Author: Max Thrun Date: Sat Feb 27 17:20:24 2010 -0300 V4L/DVB: gspca - ov534: Fixes for sharpness control * Adjust comments for sharpness control * Set default value unconditionally, for readability Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 8fef9d962237e29b3d84243387b1f3487b3caaf4 Author: Max Thrun Date: Sat Feb 27 17:20:23 2010 -0300 V4L/DVB: gspca - ov534: Fix Auto White Balance control Set only the needed bits for AWB, and enable it by default. Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 18cf8c91ad558f8d2d0177656df493f81949cfe6 Author: Antonio Ospite Date: Mon Mar 1 08:53:34 2010 -0300 V4L/DVB: gspca - ov534: Fix and document setting manual exposure Document that even if the state is a u8 value, both MSB and LSB are set as sd->exposure represents half of the value we are going to set into registers. Skip setting exposure when AEC is enabled. Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f2938822523739e99a39fd634943865a432e9c00 Author: Max Thrun Date: Sat Feb 27 17:20:21 2010 -0300 V4L/DVB: gspca - ov534: Add Auto Exposure This also makes manual exposure actually work: it never worked before because AEC was always enabled. Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 8b7fbda484176b46a7760fd474d605ca5152c86d Author: Max Thrun Date: Sat Feb 27 17:20:20 2010 -0300 V4L/DVB: gspca - ov534: Fix autogain control, enable it by default * Use 'agc' instead of 'autogain' in the code so to align the naming as in AEC/AWB. * Tweak brightness and contrast default values. * Fix setting/resetting registers values for AGC. * Set actual gain back when disabling AGC. * Skip setting GAIN register when AGC is enabled. * Enable AGC by default. Note that as Auto Gain Control is now enabled by default, if you are using the driver for visual computing applications you might need to disable it explicitly in your software. Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0c41acf158b61577dd8e50ba00f3cadabdc3c756 Author: Antonio Ospite Date: Sat Feb 27 17:20:19 2010 -0300 V4L/DVB: gspca - ov534: Remove hue control Hue control doesn't work and the sensor datasheet is not clear about how to set hue properly. Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c3f52f630d067c7590ed438bfb0a82bcb91e0b21 Author: Max Thrun Date: Sat Feb 27 17:20:18 2010 -0300 V4L/DVB: gspca- ov534: Remove ambiguous controls Remove Blue/Red Channel Target Value, they are meant for Black Level Calibration but it is not completely clear how to use them. Signed-off-by: Max Thrun Signed-off-by: Antonio Ospite Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c4ea13b40bc962245a38148dc5e7633fd8428880 Author: Oliver Endriss Date: Wed Mar 10 12:46:46 2010 -0300 V4L/DVB: ngene: Add support for cineS2 v5 and SaTiX-S2 Dual v2 Add support for - Linux4Media cineS2 DVB-S2 Twin Tuner (v5) - Mystique SaTiX-S2 Dual (v2) Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 5ce005002cd30a71f4355bd4fa8884154d6bd1ad Author: Julia Lawall Date: Tue Mar 9 18:13:49 2010 -0300 V4L/DVB: drivers/media: drop redundant memset The region set by the call to memset is immediately overwritten by the subsequent call to memcpy. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression e1,e2,e3,e4; @@ - memset(e1,e2,e3); memcpy(e1,e4,e3); // Signed-off-by: Julia Lawall Cc: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c8382c8e3295a1c85975c1898410f4d103650e4a Author: Manu Abraham Date: Sat Feb 13 17:06:14 2010 -0300 V4L/DVB: stv090x: Add some notes about the internal tuner I/O control Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 5817ea0c83665dbc117cb7ca637202da0fb1abce Author: Andreas Regel Date: Sat Feb 13 16:48:07 2010 -0300 V4L/DVB: Budget/STV090x/STV6110x: Initialize the demodulator immediately after the tuner is attached Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 85532d1454dd3df7327d12bf6ca7ef5a00bb1282 Author: Manu Abraham Date: Sat Jan 23 06:05:37 2010 -0300 V4L/DVB: [STV090x] Use gate control, while tuner is being accessed Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c5b74b0f5e81386ca1e9b1128de83502e92fa028 Author: Manu Abraham Date: Sat Jan 23 05:49:08 2010 -0300 V4L/DVB: [STV090x, STV6110x] Use tuner sleep within the demodulator control Oliver Endriss pointed out: Imho not a good idea, as the frontend thread calls - fe->ops.tuner_ops.init - fe->ops.tuner_ops.sleep If you remove fe->ops.i2c_gate_ctrl, init and sleep will fail, because gate_ctrl was never called... -- Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 19c4ee58325ac7c9d9595153fabb5d885dfe931e Author: Manu Abraham Date: Fri Jan 22 17:19:49 2010 -0300 V4L/DVB: [STV090x] Code simplification - Remove a redundant exported gate control function Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 20d2c56de8b3c462c40ef2eff42ff722905e28cf Author: Oleg Roitburd Date: Fri Feb 26 09:47:16 2010 -0300 V4L/DVB: AZ6027: Fix initialization for some cards Also add in some more device ID's Signed-off-by: Oleg Roitburd Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 823b63b49eb9a670fd9125b625e8f4b008fe3abc Author: Oleg Roitburd Date: Thu Feb 25 17:19:31 2010 -0300 V4L/DVB: AZ6027: Add support for Technisat V1 device Signed-off-by: Oleg Roitburd Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 947f04cba2159ff731a59766b05a643536eb6262 Author: Ian Armstrong Date: Sat Mar 6 21:43:04 2010 -0300 V4L/DVB: cx2341x: Remove temporal filter control restriction Since the change that stops the CX23415/6 firmware-intiiated secondary stream appears to fix the temporal filter, it's now fully re-enabled for all capture resolutions. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 9a766d55b72a439b2e16ecf2ac3eb831ab25e0d3 Author: Ian Armstrong Date: Sat Mar 6 21:37:04 2010 -0300 V4L/DVB: ivtv: Really stop capture on device close When a capture is started, the firmware also appears to start a secondary stream. Unless this secondary stream is also stopped, the encoder will remain active and not reinitialise for the next capture. Unfortunately, setting up the video source can glitch the encoder and result in undesirable effects that this initialisation will clear. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 283328c29db4463c31ee59f9ab418449cfa376b3 Author: Andy Walls Date: Sat Mar 6 21:08:35 2010 -0300 V4L/DVB: ivtv: Combine capture start delays into a single delay Combine the two 150 ms delays into a single 300 ms delay. Ian Armstrong has noted that the delay between CX2341X_ENC_INITIALIZE_INPUT and CX2341X_ENC_START_CAPTURE can cause problems if the temporal filter is allowed to be enabled. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2a8f96085449f3aa6fe99b27d7ee506e808059b9 Author: Abylay Ospan Date: Sat Mar 6 15:46:39 2010 -0300 V4L/DVB: configurable IRQ from CAM IRQ from CAM disabled by default. In some environment enabled IRQ can cause of machine freeze. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 403c34f6bbc095f9c8b2e25becd65c9c3d159080 Author: Abylay Ospan Date: Sat Mar 6 15:05:26 2010 -0300 V4L/DVB: get_frontend for STV0900 Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 7fc8709e4d7230ab640a91b9aef8fbd0f7c1488b Author: Antti Palosaari Date: Mon Mar 1 14:06:52 2010 -0300 V4L/DVB: af9015: support for KWorld TV Stick II (395UR) Add USB ID 1b80:e39a for KWorld TV Stick II (395UR). Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit ab9b4f2c11904c3c491b626915526049ecfe5ecf Author: Antti Palosaari Date: Mon Mar 1 13:50:40 2010 -0300 V4L/DVB: af9015: support for KWorld USB DVB-T Stick Mobile (UB383-T) Add USB ID 1b80:e383 for KWorld USB DVB-T Stick Mobile (UB383-T). Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit e6b44bc521b48048e3089ed773950867e409f886 Author: Dean Anderson Date: Mon Mar 8 20:04:48 2010 -0300 V4L/DVB: s2255drv: support for frame skipping adds hardware frame skipping using VIDIOC_S_PARM ioctl. adds support for VIDIOC_ENUM_FRAMEINTERVALS. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit e7c3ee6302ef0dde86c1918bae3b0783839e6a39 Author: Márton Németh Date: Sun Mar 7 03:33:45 2010 -0300 V4L/DVB: gspca cpia1: make local functions static Make the local functions static. Note that the function command_setlights() is currently not called from anywhere. This will remove the following sparse warnings (see "make C=1"): * symbol 'command_setformat' was not declared. Should it be static? * symbol 'command_setcolourparams' was not declared. Should it be static? * symbol 'command_setapcor' was not declared. Should it be static? * symbol 'command_setvloffset' was not declared. Should it be static? * symbol 'command_setexposure' was not declared. Should it be static? * symbol 'command_setcolourbalance' was not declared. Should it be static? * symbol 'command_setcompressiontarget' was not declared. Should it be static? * symbol 'command_setyuvtresh' was not declared. Should it be static? * symbol 'command_setcompressionparams' was not declared. Should it be static? * symbol 'command_setcompression' was not declared. Should it be static? * symbol 'command_setsensorfps' was not declared. Should it be static? * symbol 'command_setflickerctrl' was not declared. Should it be static? * symbol 'command_setecptiming' was not declared. Should it be static? * symbol 'command_pause' was not declared. Should it be static? * symbol 'command_resume' was not declared. Should it be static? * symbol 'command_setlights' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 2ffbb64c671261c80703cd8b7fec5ebd21e58b0c Author: Dmitri Belimov Date: Thu Mar 4 02:40:37 2010 -0300 V4L/DVB: fix broken I2C IR for Beholder Fix broken I2C IR for TV cards of Beholder. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 5a34d9dfaf3cb690c448fac67923effac08c902d Author: Dean Anderson Date: Fri Mar 5 19:59:48 2010 -0300 V4L/DVB: s2255drv: Add support for 2257 device 2257 is 2255 with 2 svideo inputs Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 2e70db9a4553e0f79cb4db05c0552d33932cca80 Author: Dean Anderson Date: Fri Mar 5 14:29:09 2010 -0300 V4L/DVB: s2255drv: cleanup of V4L2 controls Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 3fa0060526eafe3eeda1db681b4aab5b79d4543e Author: Dean Anderson Date: Thu Mar 4 20:47:33 2010 -0300 V4L/DVB: s2255drv: fixes for big endian arch s2255drv fixes for big endian architecture Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 811fab623f435932f2a26aa64b40ec6102618cc6 Author: Antonio Larrosa Date: Thu Mar 4 22:19:48 2010 -0300 V4L/DVB: em28xx: Support for Kworld VS-DVB-T 323UR This patch adapts the changes submitted by Dainius Ridzevicius to the linux-media mailing list on 8/14/09, to the current sources in order to make the Kworld VS-DVB-T 323UR usb device work. I also removed the "not validated" flag since I own the device and validated that it works fine after the patch is applied. Thanks to Devin Heitmueller for his guidance with the code. Signed-off-by: Antonio Larrosa Acked-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4de39f5d6f8267a0b062cba70eaa84fb161007e4 Author: Dean Anderson Date: Wed Mar 3 19:39:19 2010 -0300 V4L/DVB: s2255drv: adding video input status capability Video status capability for inputs on Sensoray 2255 driver. Signed-off-by: Dean Anderson Signed-off-by: Mauro Carvalho Chehab commit 723fb9b79b5a2279ed8ea8adfa6f6c92d73deaa2 Author: Dmitri Belimov Date: Mon Mar 1 21:24:12 2010 -0300 V4L/DVB: tm6000 register defines Add defines for all registers of the tm6000 module. This defines made by doc for TM6010, need look docs for TM6000 and TM5600 Some registers can be different. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit ab6a21f363d830e96e5839b5b1ef67d76f679e59 Author: Abylay Ospan Date: Sat Mar 6 14:58:01 2010 -0300 V4L/DVB: Allow to enable TS continuity and TEI check on loaded module Current dvb_demux_tscheck processing doesn't allow to enable check on loaded module. dvb_demux_tscheck can be enabled only when loading module ( dvb_dmx_init should be called to enable dvb_demux_tscheck ). This patch fix this issue. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit a4fa8e9e8586bc769b14069bbb663e2738abe7be Author: Jean-François Moine Date: Sun Mar 7 07:18:59 2010 -0300 V4L/DVB: gspca - cpia1 / sn9c2028: Make control descriptors constant Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 2f51d00ffa2a41c76fe8a492383e1c1124137694 Author: Paulo Assis Date: Sun Mar 7 06:56:56 2010 -0300 V4L/DVB: gspca - main: Use ktime instead of jiffies for buffer timestamping Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit e10f73194d63321d020433fa1287e619d4107b79 Author: German Galkin Date: Sun Mar 7 06:19:02 2010 -0300 V4L/DVB: gspca - sn9c20x: Fix exposure control for HV7131R sensor Make the range of exposure values (0-0x1770) distribute evenly through HV7131R's exposure control bytes. Signed-off-by: German Galkin Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 24f222e77ad62e41b1a882c77feeb8268c80b909 Author: Jean-François Moine Date: Sun Mar 7 05:58:55 2010 -0300 V4L/DVB: gspca - t613: Check the result of kmalloc Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 52897d86b1f0c8639e4b132b6b4ab1973694650f Author: Erik Andrén Date: Sun Mar 7 05:13:49 2010 -0300 V4L/DVB: gspca - pac207: Let all pac207 ctrls have a coherent naming Signed-off-by: Erik Andrén Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit ad5e9b9b7db760f36b2a51a8b5802355f2d95d47 Author: Henrik Kurelid Date: Tue Jul 21 13:45:50 2009 -0300 V4L/DVB: firedtv: correct version number and current/next in CA_PMT The version number in the CA_PMT message sent to the hardware was alwaysed set to zero. This could cause problems if the PMT would change during decryption of a channel since the new CA_PMT would have the same version number as the old. The version number is now copied from the original PMT. Signed-off-by: Henrik Kurelid Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 6120792baa00542b5113222b0e09f5e52b510444 Author: Márton Németh Date: Mon Mar 1 04:10:52 2010 -0300 V4L/DVB: az6027: remove redundant condition check The condition (msg[i].addr == 0xd0) is checked twice the second one is not necessary. This will remove the following compiler warning: az6027.c: In function 'az6027_i2c_xfer': az6027.c:942: warning: 'index' may be used uninitialized in this function az6027.c:943: warning: 'value' may be used uninitialized in this function az6027.c:944: warning: 'length' may be used uninitialized in this function az6027.c:945: warning: 'req' may be used uninitialized in this function Signed-off-by: Márton Németh Cc: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 278a58cf2ab6e690fa79ca7e0d466a0cb453296f Author: Márton Németh Date: Mon Mar 1 03:31:02 2010 -0300 V4L/DVB: tlg2300: make local variables and functions static Make the local variables and functions static. Some of them are not exported by their symbol name but used trough other means. For example a pointer of the operation structure is passed through a function call. This will remove the following sparse warnings (see "make C=1"): * pd-video.c:20:5: warning: symbol 'usb_transfer_mode' was not declared. Should it be static? * pd-video.c:621:5: warning: symbol 'fire_all_urb' was not declared. Should it be static? * pd-video.c:881:5: warning: symbol 'vidioc_s_std' was not declared. Should it be static? * pd-video.c:1024:5: warning: symbol 'vidioc_g_audio' was not declared. Should it be static? * pd-video.c:1033:5: warning: symbol 'vidioc_s_audio' was not declared. Should it be static? * pd-video.c:1193:5: warning: symbol 'usb_transfer_stop' was not declared. Should it be static? * pd-video.c:1522:14: warning: symbol 'pd_video_poll' was not declared. Should it be static? * pd-video.c:1528:9: warning: symbol 'pd_video_read' was not declared. Should it be static? * pd-radio.c:164:5: warning: symbol 'tlg_fm_vidioc_g_tuner' was not declared. Should it be static? * pd-radio.c:206:5: warning: symbol 'fm_get_freq' was not declared. Should it be static? * pd-radio.c:249:5: warning: symbol 'fm_set_freq' was not declared. Should it be static? * pd-radio.c:261:5: warning: symbol 'tlg_fm_vidioc_g_ctrl' was not declared. Should it be static? * pd-radio.c:267:5: warning: symbol 'tlg_fm_vidioc_g_exts_ctrl' was not declared. Should it be static? * pd-radio.c:288:5: warning: symbol 'tlg_fm_vidioc_s_exts_ctrl' was not declared. Should it be static? * pd-radio.c:315:5: warning: symbol 'tlg_fm_vidioc_s_ctrl' was not declared. Should it be static? * pd-radio.c:321:5: warning: symbol 'tlg_fm_vidioc_queryctrl' was not declared. Should it be static? * pd-radio.c:340:5: warning: symbol 'tlg_fm_vidioc_querymenu' was not declared. Should it be static? * pd-main.c:58:12: warning: symbol 'firmware_name' was not declared. Should it be static? * pd-main.c:59:19: warning: symbol 'poseidon_driver' was not declared. Should it be static? Signed-off-by: Márton Németh Acked-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 7b1fc72c2fdeb91565f4969397757ee938cce67e Author: Márton Németh Date: Sun Feb 28 11:34:35 2010 -0300 V4L/DVB: nGene: use NULL when pointer is needed Use NULL when calling a function with pointer parameter, initializing a pointer and returning a pointer. This will remove the following sparse warning at different locations (see "make C=1"): * warning: Using plain integer as NULL pointer Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 6c9eaa82da53676db830572f5a41aa9ffea133a1 Author: Márton Németh Date: Sun Feb 28 11:19:47 2010 -0300 V4L/DVB: tlg2300: cleanups when power management is not configured When power management is not configured (CONFIG_PM) then some code is no longer necessary. This patch will remove the following compiler warnings: * pd-dvb.c: In function 'poseidon_fe_release': * pd-dvb.c:101: warning: unused variable 'pd' * pd-video.c:14: warning: 'pm_video_suspend' declared 'static' but never defined * pd-video.c:15: warning: 'pm_video_resume' declared 'static' but never defined Signed-off-by: Márton Németh Acked-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit d044189dfea1e8329d63cb4e18815a7e92d2e049 Author: Marton Balint Date: Wed Feb 24 13:23:36 2010 -0300 V4L/DVB: cx88: increase BUFFER_TIMEOUT to 2 seconds When temporarily there is no video signal, sometimes it takes more than 0.5 secs for the cx88 chip to generate a single frame. If a dma timeout occurs during recording, it confuses the recording application (at least mencoder) and the recording stops. Since there is already an #if 0 for 2 seconds buffer timeout in the code at the -hg development tree, re-enabling that seemed the most simple solution. Signed-off-by: Marton Balint Signed-off-by: Mauro Carvalho Chehab commit b628a2a3d4e97044cc9f6818bfb8330d8d0b021a Author: Devin Heitmueller Date: Wed Feb 17 22:51:46 2010 -0300 V4L/DVB: au8522: fix case where we don't perform the first tune after going digital Address a problem found in MythTV where if we are in digital mode, switch to analog mode, and the switch back to digital mode, the first tuning request after switching back to digital mode gets dropped. This is because the au8522 maintains internal state, and would think the demod was already tuned to the target frequency. Thanks to Zaphod Beeblebrox for reporting this issue. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 7f2c983cf5978186ee2c379fd63d04316158fc9b Author: Devin Heitmueller Date: Wed Feb 17 22:47:55 2010 -0300 V4L/DVB: au8522: fix race condition in switching from digital to analog mode With applications like MythTV, switching inputs results in closing the digital side and then immediately opening the analog side. This exposes a race condition where the dvb_frontend kernel thread powers down the chip and closes the i2c gate even though we're in the middle of bringing up the analog part of the chip (since the shutdown of the dvb_frontend kernel thread occurs asychronously). Introduce a construct to keep track of what mode we're in, and drop requests to power down or management the gate if we've already switched to analog mode. Thanks to Zaphod Beeblebrox for reporting this issue. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 535653b1c22c29d4e8f554928efc87fe138f917d Author: Valentin Longchamp Date: Tue Feb 9 07:59:12 2010 -0300 V4L/DVB: mt9t031: use runtime pm support to restore ADDRESS_MODE registers If the platform hooks are provided, soc_camera powers off the device on close and powers it on on open. This resets the ADDRESS_MODE registers which then can be different to the value the driver has computed for them. This patch setups runtime pm usage for mt9t031 and uses the resume function to write the ADDRESS_MODE registers in order to fix the above described problem. Signed-off-by: Valentin Longchamp Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 4f9fb5ed020324d6c151db34460df572b0fdc491 Author: Mauro Carvalho Chehab Date: Tue May 18 00:46:09 2010 -0300 V4L/DVB: soc-camera: add runtime pm support for subdevices To save power soc-camera powers subdevices down, when they are not in use, if this is supported by the platform. However, the V4L standard dictates, that video nodes shall preserve configuration between uses. This requires runtime power management, which is implemented by this patch. It allows subdevice drivers to specify their runtime power-management methods, by assigning a type to the video device. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit e26b31449142a18512b57dbea515af234992ba7c Author: Márton Németh Date: Wed Feb 24 17:13:29 2010 -0300 V4L/DVB: The first two parameters of soc_camera_limit_side() are usually pointers to struct v4l2_rect elements. They are signed, so adjust the prototype accordingly This will remove the following sparse warning (see "make C=1"): * incorrect type in argument 1 (different signedness) expected unsigned int *start got signed int * as well as a couple more signedness mismatches. Signed-off-by: Márton Németh Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 02512fe33e9162713cd522937aabc81fcd97ad74 Author: Stefan Ringel Date: Mon Feb 22 14:35:06 2010 -0300 V4L/DVB: tm6000: bugfix reading problems with demodulator zl10353 Reading from zl10353 with tm6000 has a bug. For example: regs w/o patch with patch 0x06 0x00 0x7f 0x07 0x33 0x30 0x08 0x00 0x00 0x09 0x58 0x50 0x0f 0x31 0x28 0x10 0x00 0x84 This patch provides the workaround for the bug [mchehab@redhat.com: Fix merge conflict and add a comment at the workaround] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 4e11502d4597c6252411dc1b5c16b47d08b5f246 Author: Stefan Ringel Date: Mon Feb 22 14:35:05 2010 -0300 V4L/DVB: tm6000: add send and recv function Split the i2c send and receive functions on separate functions [mchehab@redhat.com: CodingStyle and fix the logic for more than 2 read values] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit e28f49b0b2a8e678af62745ffdc4e4f36d7283a6 Author: Dmitri Belimov Date: Mon Feb 22 06:32:15 2010 -0300 V4L/DVB: tm6000: fix some info messages Fix some messages for add information about TM6010 Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 685b122906069f9e7b9995bf2b128137c86b558c Author: Stefan Ringel Date: Sun Feb 21 17:10:36 2010 -0300 V4L/DVB: tm6000: fix i2c addr test The i2c addr on I2C core is specified on 7-bit format, but tm6000 expects it on 8-bit format. Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 89eeda67118c10b0d3d0d94006919d7640b26ab4 Author: Stefan Ringel Date: Mon Feb 15 14:37:23 2010 -0300 V4L/DVB: tm6000: remove hack.c hack.h, switch to zl10353 module "hack" module were a temporary file with some zl10353 magic. This is not needed anymore. Just remove it. [mchehab@redhat.com: CodingStyle fixes] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 49e5e03c9c499e89cc0f9c7736a418869e887d56 Author: Stefan Ringel Date: Mon Feb 15 14:37:24 2010 -0300 V4L/DVB: tm6000: change version to 0.0.2 Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 606d47dae40c2bbe2e3381c06c0195fdd58c8d68 Author: Stefan Ringel Date: Mon Feb 15 14:37:21 2010 -0300 V4L/DVB: tm6000: special request for all tuner Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 38d75a7908198a309b56822f8f472208fbe47629 Author: Stefan Ringel Date: Mon Feb 15 14:37:19 2010 -0300 V4L/DVB: tm6000: reset the numbers of feeds to 8 Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 439e7c14820061cbd34e66d32a84e6bf2a63dd9a Author: Stefan Ringel Date: Mon Feb 15 14:37:18 2010 -0300 V4L/DVB: tm6000: add card setup for terratec cinergy hybrid Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 583c871467a4ecad2b09030a3a68156065f9b934 Author: Stefan Ringel Date: Mon Feb 15 14:37:17 2010 -0300 V4L/DVB: tm6000: add different tuner reset for terratec [mchehab@redhat.com: Fix CodingStyle] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit d46ca93255d260dceccfdcb60965ed205d2bd274 Author: Stefan Ringel Date: Mon Feb 15 14:37:16 2010 -0300 V4L/DVB: tm6000: add additional init register for tm6010 Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit dfd36d83d963f14c383067cb7fa23f85c7b981b9 Author: Mauro Carvalho Chehab Date: Fri Feb 12 03:52:46 2010 -0300 V4L/DVB: tm6000: fix mutex lock unbalance Signed-off-by: Mauro Carvalho Chehab commit 762e17eb520cf31daa46061818f13b0665e38d7f Author: Mauro Carvalho Chehab Date: Fri Feb 12 03:51:43 2010 -0300 V4L/DVB: tm6000: only register after initialized Udev calls an utility when it senses a v4l device. So, register needs to be delayed, otherwise it may cause block conditions. Signed-off-by: Mauro Carvalho Chehab commit f8960ee7a44d58d79aae063e46f3316e1d5748e0 Author: Julia Lawall Date: Thu Feb 11 03:30:30 2010 -0300 V4L/DVB: drivers/staging/tm6000/tm6000-video.c: correct NULL test Test the just-allocated value for NULL rather than some other value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,y; statement S; @@ x = \(kmalloc\|kcalloc\|kzalloc\)(...); ( if ((x) == NULL) S | if ( - y + x == NULL) S ) // Signed-off-by: Julia Lawall Acked-by: Greg Kroah-Hartman Signed-off-by: Mauro Carvalho Chehab commit 29ec15e90ba9e20ff33da4824c32721bbc6bcfad Author: Randy Dunlap Date: Wed Feb 10 14:53:57 2010 -0300 V4L/DVB: tm6000: fix build errors (1) tm6000 uses usb_*() interfaces, so it should depend on USB. drivers/built-in.o: In function `tm6000_usb_disconnect': tm6000-cards.c:(.text+0x4abb44): undefined reference to `usb_put_dev' drivers/built-in.o: In function `tm6000_usb_probe': tm6000-cards.c:(.text+0x4ac923): undefined reference to `usb_get_dev' tm6000-cards.c:(.text+0x4ac93c): undefined reference to `usb_set_interface' drivers/built-in.o: In function `tm6000_read_write_usb': (.text+0x4ad274): undefined reference to `usb_control_msg' drivers/built-in.o: In function `tm6000_uninit_isoc': tm6000-video.c:(.text+0x4b00d5): undefined reference to `usb_kill_urb' tm6000-video.c:(.text+0x4b00e4): undefined reference to `usb_unlink_urb' tm6000-video.c:(.text+0x4b013c): undefined reference to `usb_buffer_free' tm6000-video.c:(.text+0x4b014b): undefined reference to `usb_free_urb' drivers/built-in.o: In function `tm6000_prepare_isoc': tm6000-video.c:(.text+0x4b0773): undefined reference to `usb_alloc_urb' tm6000-video.c:(.text+0x4b0835): undefined reference to `usb_buffer_alloc' drivers/built-in.o: In function `tm6000_irq_callback': tm6000-video.c:(.text+0x4b1ad3): undefined reference to `usb_submit_urb' drivers/built-in.o: In function `tm6000_module_init': tm6000-cards.c:(.init.text+0x24499): undefined reference to `usb_register_driver' drivers/built-in.o: In function `tm6000_module_exit': tm6000-cards.c:(.exit.text+0x5cb0): undefined reference to `usb_deregister' (2) tm6000-alsa uses interfaces from tm6000-core, so when they are both built as modules, the core interfaces need to be exported. ERROR: "tm6000_set_reg" [drivers/staging/tm6000/tm6000-alsa.ko] undefined! ERROR: "tm6000_get_reg" [drivers/staging/tm6000/tm6000-alsa.ko] undefined! Cc: linux-next@vger.kernel.org, LKML , linux-media@vger.kernel.org Signed-off-by: Randy Dunlap Cc: Mauro Carvalho Chehab Cc: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit e3ee9e5ec17767a24848035a1d759af8a03c971f Author: Mauro Carvalho Chehab Date: Mon Feb 8 08:43:41 2010 -0200 V4L/DVB: tm6000: move board-specific init to tm6000-cards Signed-off-by: Mauro Carvalho Chehab commit 591a0d35a8e9bad1ae2481502ba3b7facb4a0dac Author: Mauro Carvalho Chehab Date: Mon Feb 8 08:44:26 2010 -0200 V4L/DVB: tm6000: Allow tm6000 driver compilation Signed-off-by: Mauro Carvalho Chehab commit caa0d36cc7c5674c9b8dfab060ea6c36c2a8e62f Author: Stefan Ringel Date: Fri Feb 5 20:06:54 2010 -0300 V4L/DVB: tm6000: add a different set param values Fix several parameter sets, in order to make dvb work Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 08e60ba0c1c88f86f44909a1b3b8de9960b94c2e Author: Stefan Ringel Date: Fri Feb 5 20:06:52 2010 -0300 V4L/DVB: tm6000: Fix several bugs at the usb DVB transfer Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 3a5de48a8783eeb17db7b63d50ba85c31ab7b9ef Author: Stefan Ringel Date: Fri Feb 5 19:57:08 2010 -0300 V4L/DVB: tm6000: remove unused function Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 58b2f4bd5f58e544bd19f91e240e0972b1990b13 Author: Stefan Ringel Date: Fri Feb 5 19:57:07 2010 -0300 V4L/DVB: tm6000: add tuner parameter for DVB devices Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit e78c8f22b536e646032dd9b9f396305d0893e0cd Author: Stefan Ringel Date: Fri Feb 5 19:57:06 2010 -0300 V4L/DVB: tm6000: add tuner callback for dvb frontend Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 20cabed421399a5f0f1b33742d765cbdfad4ac79 Author: Stefan Ringel Date: Fri Feb 5 19:57:04 2010 -0300 V4L/DVB: tm6000: add special usb request to quit i2c tuner transfer After sending an i2c command, tm6010 needs a reset, in order to properly work. While here, add the missing I2C_CLASS_TV_DIGITAL i2c class. Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 7b96640e8f79c0e382eba1a11486da11a60d0df3 Author: Stefan Ringel Date: Fri Feb 5 19:57:03 2010 -0300 V4L/DVB: tm6000: typo fix: the identifer string is wrong Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 80af6bb73e52c614e0571f82e4dd88a6941066a4 Author: Stefan Ringel Date: Fri Feb 5 19:57:02 2010 -0300 V4L/DVB: tm6000: fix: avoid unregister the driver after success After successfully running tm6000_init_dev, due to a lack of a return(), the driver runs the error code, unregistering the device. Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 04574a6881cd4b49b49ba95f893520dabe1d76f5 Author: Mauro Carvalho Chehab Date: Mon Feb 8 08:50:02 2010 -0200 V4L/DVB: tm6000: add Terratec Cinergy Hybrid XE [mchehab@redhat.com: moved the defines for the two beholder boards to a separate commit ] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 9d3aeb5f00a78743daa0c077add8cac29e6084b6 Author: Mauro Carvalho Chehab Date: Mon Feb 8 08:48:22 2010 -0200 V4L-DVB: tm6000: add missing BEHOLDER board definitions The missing of those board definitions break compilation Signed-off-by: Mauro Carvalho Chehab commit c733a4d5b8c75ecf8d3369c2c2ba3bb1438d67f1 Author: Stefan Ringel Date: Wed Feb 3 17:27:23 2010 -0300 V4L/DVB: tm6000: add digital init for tm6010 The init sequence requires extra initialization for tm6010 in digital mode. Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 7dcc51b7346c4d4730eb8ffe1b8a92ed31d263bf Author: Stefan Ringel Date: Wed Feb 3 18:48:24 2010 -0300 V4L/DVB: tm6000: fix driver compilation The name of xc5000.h include file were wrong Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 70ca3c4b9a722b24626ffe81bdfd7d1a6824f175 Author: Devin Heitmueller Date: Tue Jan 19 01:38:45 2010 -0300 V4L/DVB: xc3028: fix regression in firmware loading time Fix a regression in the firmware loading time where it went from 1080 ms to 4700 ms. This was noticed when the em28xx based HVR-950 took noticably longer to load the driver. Regression introduced in hg 12824. The developer added an msleep() call with an argument based on a newly introduced xc3028_ctrl field, which is left initialized to zero for pretty much every board that is currently supported. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 833724afc0e60fe94da64beb9e1afd390a9948a4 Author: Laurent Pinchart Date: Thu Dec 10 11:55:34 2009 -0200 V4L/DVB (13556a): v4l: Remove unneeded video_device::minor assignments Now that the video_device registration is tested using video_is_registered(), drivers don't need to initialize the video_device::minor field to -1 anymore. Remove those unneeded assignments. [mchehab.redhat.com: apply just the tm6000 changes on a separate patch] Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 0a34df5359ea153bf6f756c0c9db2ca2bc002cf4 Author: Mauro Carvalho Chehab Date: Tue May 18 00:43:18 2010 -0300 V4L/DVB (13555a): v4l: Use video_device_node_name() instead of the minor number Instead of using the minor number in kernel log messages, use the device node name as returned by the video_device_node_name() function. This makes debug, informational and error messages easier to understand for end users. [mchehab.redhat.com: apply just the tm6000 changes on a separate patch] Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 1eefd763fb482e5a325c68b6889c699de4b7dc16 Author: Dmitri Belimov Date: Tue Nov 10 01:37:43 2009 -0300 V4L/DVB (13403): Add new TV cards of Beholder Add new TV cards of Beholder for autodetect. With my best regards, Dmitry. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit bfc42b9a48467586296e4c3bbc5f48d814e2a00f Author: Mauro Carvalho Chehab Date: Fri Sep 18 01:44:24 2009 -0300 tm6000: Remove legacy code to work with older kernel versions Such code has no space upstream and prevents tm6000 from compiling. Signed-off-by: Mauro Carvalho Chehab commit 1fade8d9fc8ff37866fd1d4a060133fa31dbeb95 Author: Mauro Carvalho Chehab Date: Mon Sep 14 23:13:53 2009 -0300 V4L/DVB (12854): tm6000: i2c addresses should now be specified in 7bit formats Signed-off-by: Mauro Carvalho Chehab commit 64d339d42d6165c3276b524b939f7866693b83e0 Author: Mauro Carvalho Chehab Date: Mon Sep 14 17:16:32 2009 -0300 V4L/DVB (12853): tm6000: Fix almost all warnings at the driver Onr warning is left, since it is there for a purpose: tm6000-core.c:218: warning: ISO C90 forbids mixed declarations and code It indicates a place where a temporary hack were added. Tests are needed to be sure that we can remove it. Signed-off-by: Mauro Carvalho Chehab commit 427f7facb374b8651ff01b7700e690ef8ccae159 Author: Mauro Carvalho Chehab Date: Mon Sep 14 16:37:13 2009 -0300 V4L/DVB (12852): tm6000: Fix compilation against 2.6.31 Signed-off-by: Mauro Carvalho Chehab commit 77d966a25aa3732d79e740088ff0401ebf26b3c9 Author: Mauro Carvalho Chehab Date: Mon Sep 14 13:04:08 2009 -0300 V4L/DVB (12848): tm6000: Add README with todo list Signed-off-by: Mauro Carvalho Chehab commit 0fb84ce0dbffee26dc0934496e6bcdce853fa0d0 Author: Mauro Carvalho Chehab Date: Tue Dec 2 08:30:16 2008 -0300 V4L/DVB (12846): tuner-xc2028: Fix skip code for devices with broken read (tm6000) Signed-off-by: Mauro Carvalho Chehab commit e8a4845d2a797958b1e0cb6acc5e826985ee90ce Author: Mauro Carvalho Chehab Date: Fri Nov 28 07:39:00 2008 -0300 V4L/DVB (12845): tm6000: more buffer handling fixes Before this patch, we were writing outside vmalloced buffer Signed-off-by: Mauro Carvalho Chehab commit 1f9305b7a56b1c7dd62add13e763b3fc537ae499 Author: Mauro Carvalho Chehab Date: Fri Nov 28 06:44:06 2008 -0300 V4L/DVB (12844): tm6000: avoid writing on a floating pointer Signed-off-by: Mauro Carvalho Chehab commit edecce0a31b4447ee75dd0df34c7c5fc90ba6f6b Author: Mauro Carvalho Chehab Date: Fri Nov 28 06:42:24 2008 -0300 V4L/DVB (12843): tm6000: cleanup: remove a test debug code Signed-off-by: Mauro Carvalho Chehab commit 721f507b694f3be7c872d63a323afde91e43dfff Author: Mauro Carvalho Chehab Date: Sun Oct 26 09:18:53 2008 -0300 V4L/DVB (12842): tm6000: avoid kernel panic while retrieving the filling buffer Instead of storing next buf on a temp var, saved over URB processing, restore it using get_next_buf. Signed-off-by: Mauro Carvalho Chehab commit 2a8145d4b82b347c9bf49402aad2c2b6184f0540 Author: Mauro Carvalho Chehab Date: Sat Oct 25 10:43:04 2008 -0300 V4L/DVB (12841): tm6000: Fix compilation with newer v4l2-dev API Signed-off-by: Mauro Carvalho Chehab commit df7c1d9a4a021b63af92f0197ac47c3d51ac3cf8 Author: Mauro Carvalho Chehab Date: Sat Oct 25 08:56:22 2008 -0300 V4L/DVB (12840): tm6000: add support for HVR900H Signed-off-by: Mauro Carvalho Chehab commit 8ae1fc6e10cdf9be754cccee2a3ee551a981ab08 Author: Mauro Carvalho Chehab Date: Sat Oct 25 08:56:22 2008 -0300 V4L/DVB (12839): tm6000: Another trial to fix analog streaming Signed-off-by: Mauro Carvalho Chehab commit 717ecd2b9a71970698c04f34239c6a1e5d08fbc2 Author: Mauro Carvalho Chehab Date: Sat Oct 25 08:56:16 2008 -0300 V4L/DVB (12838): tm6000: Fix color support on tm6010 TM6010 uses some different registers for format support. Signed-off-by: Mauro Carvalho Chehab commit 1b4c5b1f0582df9231e6e1093e504d7df3a062b9 Author: Maykel Moya Date: Mon Apr 28 19:20:26 2008 -0300 V4L/DVB (12837): tm6000: make tree buildable Signed-off-by: Maykel Moya Signed-off-by: Mauro Carvalho Chehab commit ed0236afa2382e1b75fec2a080a1e11ff1909de1 Author: Mauro Carvalho Chehab Date: Wed Apr 9 08:07:20 2008 -0300 V4L/DVB (12836): tm6000: revert to an old way to copy video The new way is causing machine hangups. This one works. Signed-off-by: Mauro Carvalho Chehab commit c144c037153765f572ab4ffea277467370dd97dd Author: Mauro Carvalho Chehab Date: Wed Apr 9 01:49:19 2008 -0300 V4L/DVB (12835): tm6000: Cleanups to work like em28xx-video Signed-off-by: Mauro Carvalho Chehab commit 576d5739a44af5fcbacfe504a8d989a5c7ea8fc7 Author: Mauro Carvalho Chehab Date: Fri Jan 11 13:55:45 2008 -0300 V4L/DVB (12834): tm6000: Fix two warnings Signed-off-by: Mauro Carvalho Chehab commit 6ad6e88a156e131597c8636456d4d84f7987808a Author: Mauro Carvalho Chehab Date: Fri Jan 11 13:51:45 2008 -0300 V4L/DVB (12833): tm6000: add a proper init code for -alsa Uses about the same initialization code as defined on usbaudio.c. Signed-off-by: Mauro Carvalho Chehab commit 44351aa0ee98b745986c94e139e0b1fdbd270015 Author: Mauro Carvalho Chehab Date: Fri Jan 11 13:19:45 2008 -0300 V4L/DVB (12832): tm6000: allow compilation of tm6000-alsa module Signed-off-by: Mauro Carvalho Chehab commit 7ca30c524e7c6f21d05577f2ffe6fc1e632f372a Author: Mauro Carvalho Chehab Date: Fri Jan 11 13:19:09 2008 -0300 V4L/DVB (12831): tm6000: Convert cx88-alsa into tm6000-alsa - Remove cx88 specific setups; - Add tm6000 specific start/stop commands; - Do CodingStyle cleanups. Signed-off-by: Mauro Carvalho Chehab commit d72d50670efa7f41d441541aded4e60ddfec7932 Author: Mauro Carvalho Chehab Date: Fri Jan 11 10:28:50 2008 -0300 V4L/DVB (12830): tm6000: copy cx88-alsa as tm6000-alsa Signed-off-by: Mauro Carvalho Chehab commit ee1fc07c9fb038298bf85fef774669a7bdf4b58b Author: Mauro Carvalho Chehab Date: Thu Jan 10 17:27:26 2008 -0300 V4L/DVB (12829): tm6000: several changes on usb preparation trying to avoid -EPROTO errors Signed-off-by: Mauro Carvalho Chehab commit c4acf48cad7f6654c55e53734440d67140cf4269 Author: Mauro Carvalho Chehab Date: Wed Jan 9 22:44:51 2008 -0300 V4L/DVB (12828): tm6000: fixes several CodingStyle and do some cleanups Signed-off-by: Mauro Carvalho Chehab commit 204193d95974df3ea4a6309cc68948e3a9596e3c Author: Mauro Carvalho Chehab Date: Wed Jan 9 18:12:39 2008 -0300 V4L/DVB (12827): tm6000: fix image hangs A previous committed patch hanged image output. This patch corrects this issue. It also warrants that buffer is updated for each frame0+frame1 frame set. Signed-off-by: Mauro Carvalho Chehab commit e381a81010469e4443c0b69d340063d92b5eb89b Author: Mauro Carvalho Chehab Date: Tue Jan 8 11:27:59 2008 -0300 V4L/DVB (12826): tm6000: adds 10ms delay between two consecutive i2c write ops tm6000 original driver seems to use a delay between two consecutive i2c write operations. Signed-off-by: Mauro Carvalho Chehab commit 2d5024a9e97337874d8d7aa1d6a54ed1c917c5a0 Author: Mauro Carvalho Chehab Date: Mon Sep 14 10:23:20 2009 -0300 V4L/DVB (12825): tm6000: I2C reading operations is not reliable on tm6000 tm6000 sometimes can't read from i2c, but this is currently required for tuner-xc2028 to work. This patch adds an option to tuner-xc2028 to not rely on i2c reading. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit e5cc2bf4450fd9739534e690cc16efc140d7b7fc Author: Mauro Carvalho Chehab Date: Tue Jan 8 11:26:59 2008 -0300 V4L/DVB (12824): tuner-xc2028: adds an option to send i2c data on slower speed Signed-off-by: Mauro Carvalho Chehab commit 6eb5c8a6c82d7c753ea52df94ea2ff096b5aba96 Author: Mauro Carvalho Chehab Date: Tue Jan 8 11:25:57 2008 -0300 V4L/DVB (12823): tm6000: Uses another method for handling incomplete packets This requires a little more memory, and some memcpy to work, but the logic is simpler than the previous method. Signed-off-by: Mauro Carvalho Chehab commit 29c389be1ceb714739cdcd41fec6547d19b32864 Author: Mauro Carvalho Chehab Date: Tue Jan 8 11:19:22 2008 -0300 V4L/DVB (12822): tm6000: Add support for tm6010 Signed-off-by: Mauro Carvalho Chehab commit e30b9d6c641dbd9687a5605b2151a2a83d2e8770 Author: Chris Pascoe Date: Sat Nov 24 04:34:42 2007 -0300 V4L/DVB (12821): tm6000: update USB request names and clean up i2c routine Update the descriptions of the USB request types so that they match what we now know they do. Rework the i2c_xfer function so that it is more explicit what sort of I2C transfers it is that the tm6000 can't perform. Signed-off-by: Chris Pascoe Signed-off-by: Mauro Carvalho Chehab commit cf9e1509c278c3d5005f222539813933e4dc345c Author: Christopher Pascoe Date: Fri Nov 23 13:18:56 2007 -0300 V4L/DVB (12820): tm6000: fix i2c readings Signed-off-by: Mauro Carvalho Chehab commit 3716ae3ed7e4fc0a60c8733f7e6a15ba48f65b01 Author: Mauro Carvalho Chehab Date: Fri Nov 23 13:00:18 2007 -0300 V4L/DVB (12819): tm6000: mts parameter has changed on tuner-xc2028.c Signed-off-by: Mauro Carvalho Chehab commit 70bfae5aaf7254f3cdfc1647441ff2b595933f09 Author: Michel Ludwig Date: Mon Nov 19 06:10:54 2007 -0300 V4L/DVB (12818): tm6000: Use dvb_frontend_detach instead of single symbol_put commands Thanks to Mike Krufky for pointed that one out. Also include some minor cleanups. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit e762d420b4d8ba120cb5c85c484e09792e6b8a44 Author: Michel Ludwig Date: Fri Nov 16 18:07:12 2007 -0300 V4L/DVB (12817): tm6000: add a missing symbol_put Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 5b74c2c739064248bb9c78102e94751b317684d5 Author: Michel Ludwig Date: Fri Nov 16 13:16:59 2007 -0300 V4L/DVB (12816): tm6000: fix tm6000 attach method and fix a few CodingStyles Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 47878f163f68bfc93483ba9bca82ac0283c751e5 Author: Mauro Carvalho Chehab Date: Thu Nov 15 16:37:35 2007 -0300 V4L/DVB (12815): tm6000: follow videobuf API changes Signed-off-by: Mauro Carvalho Chehab commit d4e15bcd3de4bb5fccf5b1c0f512d57983c09623 Author: Mauro Carvalho Chehab Date: Mon Nov 5 15:39:41 2007 -0300 V4L/DVB (12814): tm6000: fix eeprom reading on tm6000 Signed-off-by: Mauro Carvalho Chehab commit 28cb88caaec4d22c970a28e080c1815ee3b043fa Author: Mauro Carvalho Chehab Date: Mon Nov 5 11:03:04 2007 -0300 V4L/DVB (12813): tm6000: all read messages should use prev_reg read messages with length>1 where using the wrong register. Signed-off-by: Mauro Carvalho Chehab commit b1ce40b1392e2a20529ad2f01ab76145102c0ef1 Author: Michel Ludwig Date: Sun Nov 4 16:36:15 2007 -0300 V4L/DVB (12812): tm6000: fix build dependencies for tm6000 and tuner-xc2028 Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 0ef4b05a4f7610182174c09616aa930bbd990435 Author: Mauro Carvalho Chehab Date: Fri Nov 2 11:54:18 2007 -0300 V4L/DVB (12811): tm6000: a few registers is needed from the sif/noif setings Signed-off-by: Mauro Carvalho Chehab commit cc27a8c275ff5a1d2b7cffbb5b8e96509d4231b9 Author: Mauro Carvalho Chehab Date: Fri Nov 2 11:23:14 2007 -0300 V4L/DVB (12810): tm6000: Avoid sending xc3028 setups for other tuners Signed-off-by: Mauro Carvalho Chehab commit 2c9a95ba17bfe5fc24a1f782c172c03b74fcda1e Author: Mauro Carvalho Chehab Date: Fri Nov 2 11:16:35 2007 -0300 V4L/DVB (12809): tm6000: Remove an old hack Signed-off-by: Mauro Carvalho Chehab commit 5200401ad8a80b95b3ba5636580f10adc74b6b60 Author: Mauro Carvalho Chehab Date: Fri Nov 2 09:51:13 2007 -0300 V4L/DVB (12808): tm6000: Move analog tv standards to tm6000-stds tm5600/6000/6010 requires a large config table for video standards. Better to move this to their own file. Also added register settings for tm6010 (needs testing. Signed-off-by: Mauro Carvalho Chehab commit d544f2c33f39086fe08cfabe98bd2a36592c5ffb Author: Mauro Carvalho Chehab Date: Wed Oct 24 09:22:08 2007 -0300 V4L/DVB (12807): tm6000: Properly select xc2028 parameters Signed-off-by: Mauro Carvalho Chehab commit 7594304ee775608256b60b3628e795306196a283 Author: Mauro Carvalho Chehab Date: Tue Oct 23 16:36:55 2007 -0300 V4L/DVB (12806): tm6000: Select VIDEO_TUNER for tm6000 devices Signed-off-by: Mauro Carvalho Chehab commit c1a1641450e769f534df4d1217f3feec8e38ea37 Author: Mauro Carvalho Chehab Date: Mon Oct 15 15:43:50 2007 -0300 V4L/DVB (12805): tm6000: Fix a memory leak at tm6000-video if a transfer buffer allocation fails, the last allocated urb is leaked (it hasn't been stored in dev->urb[] yet so tm6000_uninit_isoc misses it). The patch also includes a small typo fix. Thanks to Florin Malita for pointing this. Signed-off-by: Mauro Carvalho Chehab commit 2b971af2384a11db0dbdb82e41fd9577ffaea46f Author: Michel Ludwig Date: Wed Oct 10 03:50:10 2007 -0300 V4L/DVB (12804): tm6000: Build the module properly if CONFIG_VIDEO_TM6000_DVB is selected. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 7f9b1412f56eb5ec10694c27f93bd33276be0465 Author: Mauro Carvalho Chehab Date: Mon Oct 1 06:45:22 2007 -0300 V4L/DVB (12803): tm6000: make tm6000_devused static Signed-off-by: Mauro Carvalho Chehab commit 106bdbe24ea9038cecc01c168324af59343092ee Author: Mauro Carvalho Chehab Date: Thu Sep 27 18:27:35 2007 -0300 V4L/DVB (12802): tm6000: adds command to enable audio output at tm6000 Signed-off-by: Mauro Carvalho Chehab commit 4386136d29327a6645f7dba963d609d2452db843 Author: Michel Ludwig Date: Mon Sep 24 17:01:49 2007 -0300 V4L/DVB (12801): tm6000: Add support for ADSTech Mini Dual TV (PTV-339). Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit a228618c1a2c15da35f8cc60286a25541fbc6348 Author: Mauro Carvalho Chehab Date: Sat Sep 22 02:06:25 2007 -0300 V4L/DVB (12800): tm6000: fix tm6000 analog video buffer handling Previously, there were no sync between video buffer filling and received URBs. So, the presented image were a mix of frame and frame-1. Now, a filled buffer should contain only data for that frame. allocates a maximum of 64 KB per each URB area. This fixed two bugs: - Sometimes, there were no available continuos block of about 1 MB; - Image weren't not properly updated, since parts of the URBs aren't updated. Signed-off-by: Mauro Carvalho Chehab commit cc6c60d912ceeb390a0969a7c76dc05fa3fffaa9 Author: Mauro Carvalho Chehab Date: Wed Sep 19 16:24:05 2007 -0300 V4L/DVB (12799): tm6000: avoid troubles if a header is broken on separate URBs Signed-off-by: Mauro Carvalho Chehab commit e2c9500d1023623516a33b0fcb4cc62ba2419a03 Author: Mauro Carvalho Chehab Date: Wed Sep 19 15:39:22 2007 -0300 V4L/DVB (12798): tm6000: Split header processing from header find Signed-off-by: Mauro Carvalho Chehab commit c13dd70411e87e1ad1ccca0ba9bc3cf0a555e5a0 Author: Mauro Carvalho Chehab Date: Wed Sep 19 07:36:34 2007 -0300 V4L/DVB (12797): tm6000: Allow selecting audio bitrate Signed-off-by: Mauro Carvalho Chehab commit 7e2fdf025ccb8c8ad9dfd3ec09d1fda73038593b Author: Mauro Carvalho Chehab Date: Wed Sep 19 07:35:18 2007 -0300 V4L/DVB (12796): tm6000: Add a hack for PAL standards The common code is not properly working. This hack should do the work for now. Signed-off-by: Mauro Carvalho Chehab commit 71e7cfae31e4eb25e127d034ec71922c661dc958 Author: Mauro Carvalho Chehab Date: Thu Sep 6 20:12:10 2007 -0300 V4L/DVB (12795): tm6000: Fix buffering size At the first time an application were called, resolutions were wrong. Signed-off-by: Mauro Carvalho Chehab commit 4475c0444303842743049c420f41de04907e44d9 Author: Mauro Carvalho Chehab Date: Mon Sep 3 21:51:45 2007 -0300 V4L/DVB (12794): tm6000: handle also PAL/SECAM resolutions Fix the resolutions for 625 line video standards (european PAL/SECAM) Signed-off-by: Mauro Carvalho Chehab commit 88894cba79318fabc011a78094fe22ec953bfa97 Author: Mauro Carvalho Chehab Date: Mon Sep 3 21:24:52 2007 -0300 V4L/DVB (12793): tm6000: On some kernels, eeprom reading were generating a bug Signed-off-by: Mauro Carvalho Chehab commit dc6a02aa35cc3c1dd84e06fa4ff300ae50bc5a70 Author: Mauro Carvalho Chehab Date: Mon Aug 27 07:55:38 2007 -0300 V4L/DVB (12791): tm6000: fix poll() method Signed-off-by: Mauro Carvalho Chehab commit 5f796752e80b76a81a066084c87dd86bf307dada Author: Mauro Carvalho Chehab Date: Mon Aug 27 07:55:05 2007 -0300 V4L/DVB (12790): tm6000: check for errors on usb->status Signed-off-by: Mauro Carvalho Chehab commit 5c0d0b21fd3868672b5a550093efa7a72e458ed7 Author: Mauro Carvalho Chehab Date: Sat Aug 25 08:35:31 2007 -0300 V4L/DVB (12789): tm6000: fix DVB dependency Compilation were causing errors, if DVB_CORE weren't selected. Signed-off-by: Mauro Carvalho Chehab commit 3169c9b26fffa180bc3bc81dc247df2f4824ee7d Author: Michel Ludwig Date: Tue Aug 21 17:37:22 2007 -0300 V4L/DVB (12788): tm6000: Add initial DVB-T support Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit a4cf976c77ce0865ceaa0f08cc1667538894936c Author: Michel Ludwig Date: Tue Aug 21 16:05:43 2007 -0300 V4L/DVB (12786): tm6000: Remove code dealing with the ZL10353 Remove code dealing with the ZL10353 as this is all handled by the ZL10353 module. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit fb31ab4532902a3e9f3fd5103be6ac67d952bced Author: Michel Ludwig Date: Tue Jul 24 08:08:52 2007 -0300 V4L/DVB (12785): tm6000: allow user gpio address for tuner reset Modify tuner_callback to user the device's GPIO address field for tuner reset. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit ec50e8e6f19b623ff4c5590edf6118a53729369a Author: Mauro Carvalho Chehab Date: Wed Jul 18 23:14:25 2007 -0300 V4L/DVB (12784): tm6000: Some cleanups at the driver Signed-off-by: Mauro Carvalho Chehab commit 90d5802795173580db003699373058f74e5c9d0a Author: Michel Ludwig Date: Wed Jul 18 10:29:10 2007 -0300 V4L/DVB (12783): tm6000: add xc2028/3028 to dvb Add experimental DVB frontend tuner interface to xc2028/3028 Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 95a838243b906e096275b179d4e7302f282c990e Author: Michel Ludwig Date: Tue Jul 24 08:06:45 2007 -0300 V4L/DVB (12782): tm6000: Correct some device capabilities Add tuner reset GPIO and demodulator address fields to the tm6000_core struct. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit c85cba3fe6d44b3955a4c2e19efb7bb8156cab5d Author: Mauro Carvalho Chehab Date: Thu Jul 19 11:09:58 2007 -0300 V4L/DVB (12781): tm6000: Start adding support for GPIO device-specific parameters Signed-off-by: Mauro Carvalho Chehab commit 4f44dcec7141244ae4baba66c0334cc33c9bbd78 Author: Michel Ludwig Date: Wed Jul 18 10:26:38 2007 -0300 V4L/DVB (12780): tm6000: Improve handling of SMBus Write Byte commands followed by a read command. SMBus Write Byte commands followed by a read command on the same I2C address are not sent out to the chip as they wouldn't have any effect. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit a5adfbed09ffedb4ffa8e9a93dbd757096020470 Author: Michel Ludwig Date: Mon Jul 2 20:59:58 2007 -0300 V4L/DVB (12779): tm6000: Correct dev init & Add general USB ctrl msg pause Add GPIO4 reset, which is required to make DVB-T work with the Freecom stick. Add a general 5 ms pause to the "tm6000_read_write_usb" method. Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 526835d5b30a591578f2813a8837ac70172c0aa9 Author: Michel Ludwig Date: Fri Jun 29 09:51:39 2007 -0300 V4L/DVB (12778): tm6000: Fix SMBus Read Byte command Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 0ec4acc6a6405c78a8655687d382ece0daf001b8 Author: Michel Ludwig Date: Wed Jun 27 17:01:50 2007 -0300 V4L/DVB (12777): tm6000: Add support for Freecom Hybrid Stick / Moka DVB-T Receiver Dual Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit a58d35cb933f21a43fbdb5e4f575ff40faba3df2 Author: Mauro Carvalho Chehab Date: Sun Jun 17 17:14:12 2007 -0300 V4L/DVB (12776): tm6000: decrement users count Signed-off-by: Mauro Carvalho Chehab commit 2cd4fd1e57cb6897612ead8a3d39ecb444920a1a Author: Michel Ludwig Date: Sun Jun 17 17:12:32 2007 -0300 V4L/DVB (12775): tm6000: fix usb_submit_urb to be called inside interrupt context Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 7c3f53ec491b64b3c3fa339e4e77e49782b0be9f Author: Michel Ludwig Date: Sat Jun 16 23:21:48 2007 -0300 V4L/DVB (12774): tm6000: fix module load/unload Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 8c9d26fd55ac7378ad0e2afd2bd122fa060bdaee Author: Michel Ludwig Date: Fri Jun 15 11:02:56 2007 -0300 V4L/DVB (12773): tm6000: fix module unregister Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 22927e8e0007fe653dd2824cf86b799b43e3bff8 Author: Michel Ludwig Date: Thu Jun 14 17:19:59 2007 -0300 V4L/DVB (12772): tm6000: fix module load/unload Signed-off-by: Michel Ludwig Signed-off-by: Mauro Carvalho Chehab commit 9701dc94a14e54a33c3c99744ec3a761f6385fc6 Author: Mauro Carvalho Chehab Date: Mon Sep 14 09:42:41 2009 -0300 V4L/DVB (12770): Add tm6000 driver to staging tree Adds a driver for Trident TV Master tm5600/tm6000 chips. Those USB devices are usually found with a Xceive xc2028/xc3028 tuner, although the firmware seems to be modified to work with those chips on some older devices. Signed-off-by: Mauro Carvalho Chehab commit 9f2f72107ff621fdf3066e5a1b5ecb03ee587ebc Author: Tejun Heo Date: Mon May 10 21:41:32 2010 +0200 libata-sff: reorder SFF/BMDMA functions Reorder functions such that SFF and BMDMA functions are grouped. While at it, s/BMDMA/SFF in a few comments where it actually meant SFF. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6bc0d390dd3dfb7be4325ad0685ae8ec2baf15a4 Author: Tejun Heo Date: Mon May 10 21:41:31 2010 +0200 sata_inic162x: kill PORT_PRD_ADDR initialization sata_inic162x doesn't use PRD anymore. No need to initialize it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3e4ec3443f70fbe144799ccf0b1c3797f78d1715 Author: Tejun Heo Date: Mon May 10 21:41:30 2010 +0200 libata: kill ATA_FLAG_DISABLED ATA_FLAG_DISABLED is only used by drivers which don't use ->error_handler framework and is largely broken. Its only meaningful function is to make irq handlers skip processing if the flag is set, which is largely useless and even harmful as it makes those ports more likely to cause IRQ storms. Kill ATA_FLAG_DISABLED and makes the callers disable attached devices instead. ata_port_probe() and ata_port_disable() which manipulate the flag are also killed. This simplifies condition check in IRQ handlers. While updating IRQ handlers, remove ap NULL check as libata guarantees consecutive port allocation (unoccupied ports are initialized with dummies) and long-obsolete ATA_QCFLAG_ACTIVE check (checked by ata_qc_from_tag()). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 26be1b7b317f1d6e9226ba3f450476b0a6d423a3 Author: Mike Solovyev Date: Wed May 12 15:38:00 2010 +0400 ARM: h1940: framebuffer configuration fix Seems like a typo, wrong setup leads to broken image on ipaq screen. Signed-off-by: Mike Solovyev Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks commit 380fefb2ddabd4cd5f14dbe090481f0544e65078 Author: Baruch Siach Date: Mon May 17 17:45:48 2010 -0700 dm9000: fix "BUG: spinlock recursion" dm9000_set_rx_csum and dm9000_hash_table are called from atomic context (in dm9000_init_dm9000), and from non-atomic context (via ethtool_ops and net_device_ops respectively). This causes a spinlock recursion BUG. Fix this by renaming these functions to *_unlocked for the atomic context, and make the original functions locking wrappers for use in the non-atomic context. Signed-off-by: Baruch Siach Signed-off-by: David S. Miller commit 5476b8b22589fe118f3c228d71406455002b79b1 Author: Julia Lawall Date: Sat May 15 11:23:15 2010 +0000 drivers/net/usb: Use kmemdup Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 99bf236612801351834b441314379bc5304d62ce Author: Julia Lawall Date: Sat May 15 11:20:45 2010 +0000 drivers/net/usb: Use kmemdup Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 175c04414106c34f0130d8d3bf152825b4829ceb Author: Julia Lawall Date: Sat May 15 11:18:58 2010 +0000 drivers/net/usb: Use kmemdup Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 08d18f3b62b4c05731a09eca2b432842a0a18da5 Author: Anton Vorontsov Date: Fri May 14 04:27:30 2010 +0000 fsl_pq_mdio: Fix mdiobus allocation handling The driver could return success code even if mdiobus_alloc() failed. This patch fixes the issue. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit a2f79227138c71e08627af5f8961197364edbc98 Author: Patrick McHardy Date: Fri May 14 08:08:14 2010 +0000 net_sched: sch_hfsc: fix classification loops When attaching filters to a class pointing to a class higher up in the hierarchy, classification may enter an endless loop. Currently this is prevented for filters that are already resolved, but not for filters resolved at runtime. Only allow filters to point downwards in the hierarchy, similar to what CBQ does. Reported-by: Pawel Staszewski Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e1bc7eedbafe0415cdfd82e17e6f65bb3369239d Author: Nathan Williams Date: Sun May 16 03:12:36 2010 +0000 atm: select FW_LOADER in Kconfig for solos-pci solos-pci uses request_firmware() for firmware upgrades Signed-off-by: Nathan Williams Signed-off-by: David S. Miller commit ce26b4d1d52c9a881a99fd316c32e58cdf2d586e Author: Florian Fainelli Date: Sun May 16 02:30:56 2010 +0000 r6040: fix link checking with switches The current link checking logic only works for one port, which is not correct for swiches were multiple ports can have different link status. As a result we would only check for link status on port 1 of the switch. Move the calls to mii_check_media in r6040_timer which will be polling a single PHY chip correctly and assume link is up for switches. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit b14ed884df5968b0977114ebd5a22f58d0d15315 Author: Anton Vorontsov Date: Fri May 14 04:27:36 2010 +0000 gianfar: Remove legacy PM callbacks These callbacks were needed because dev_pm_ops support for OF platform devices was in the powerpc tree, and the patch that added dev_pm_ops for gianfar driver was in the netdev tree. Now that netdev and powerpc trees have merged into Linus' tree, we can remove the legacy hooks. Signed-off-by: Anton Vorontsov Signed-off-by: David S. Miller commit f0cd15081a72075df16c45a2310e873fb9fcd82f Author: stephen hemminger Date: Fri May 14 14:38:59 2010 +0000 tbf: stop wanton destruction of children (v2) Several netem users use TBF for rate control. But every time the parameters of TBF are changed it destroys the child qdisc, requiring reconfigation. Better to just keep child qdisc and just notify it of changed limit. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit ccbd6a5a4f76e821ed36f69fdaf59817c3a7f18e Author: Joe Perches Date: Fri May 14 10:58:26 2010 +0000 net: Remove unnecessary semicolons after switch statements Also added an explicit break; to avoid a fallthrough in net/ipv4/tcp_input.c Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 935e2a26b85003c0bd52b6c92712c2f77a5f9d33 Author: andrew hendry Date: Sun May 16 23:00:35 2010 +0000 X25: Remove bkl in sockopts Removes the BKL in x25 setsock and getsockopts. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 37cda78741ecdbf45dd9b64e4c99dbdb11b47b46 Author: andrew hendry Date: Sun May 16 23:00:27 2010 +0000 X25: Move accept approve flag to bitfield Moves the x25 accept approve flag from char into bitfield. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit b7792e34cba641c49cd436d42fbfd2a632ff39d3 Author: andrew hendry Date: Sun May 16 23:00:02 2010 +0000 X25: Move interrupt flag to bitfield Moves the x25 interrupt flag from char into bitfield. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit cb863ffd4a04f9f8619f52c01d472a64ccc716bd Author: andrew hendry Date: Sun May 16 22:59:41 2010 +0000 X25: Move qbit flag to bitfield Moves the X25 q bit flag from char into a bitfield to allow BKL cleanup. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit c89af1a30870e04986e2c8d24c0c765de0935f4b Author: Stanislaw Gruszka Date: Mon May 17 17:35:38 2010 -0700 bnx2x: avoid TX timeout when stopping device When stop device call netif_carrier_off() just after disabling TX queue to avoid possibility of netdev watchdog warning and ->ndo_tx_timeout() invocation. Signed-off-by: Stanislaw Gruszka Acked-by: Eilon Greenstein Signed-off-by: David S. Miller commit a0ba676008d9f050f1de9ede8d1ee4bf6820bfc9 Author: Michael Chan Date: Mon May 17 17:34:43 2010 -0700 bnx2: Use netif_carrier_off() to prevent timeout. Based on original patch from Stanislaw Gruszka . Using netif_carrier_off() is better than updating all the ->trans_start on all the tx queues. netif_carrier_off() needs to be called after bnx2_disable_int_sync() to guarantee no race conditions with the serdes timers that can modify the carrier state. If the chip or phy is reset, carrier will turn back on when we get the link interrupt. If there is no reset, we need to turn carrier back on in bnx2_netif_start(). Again, the phy_lock prevents race conditions with the serdes timers. Signed-off-by: Michael Chan Signed-off-by: Matt Carlson Signed-off-by: David S. Miller commit a931d294042b5bbd8e390c59741b968c11856ac1 Author: Michael Chan Date: Mon May 17 17:33:31 2010 -0700 bnx2: Update 5709 MIPS firmware and version to 2.0.15. New firmware fixes a performance regression on small packets. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit b98eba52784fbd4a96241c5395c2c8d99fdb9433 Author: Eddie Wai Date: Mon May 17 17:32:56 2010 -0700 bnx2: Fix register printouts during NETEV_WATCHDOG. Dump the correct MCP registers and add EMAC_RX_STATUS register during NETDEV_WATCHDOG for debugging. Signed-off-by: Eddie Wai Signed-off-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a7fc948f4d11d80ac2bd08335dc1e0fb77ddf468 Author: Amit Kumar Salecha Date: Mon May 17 01:22:14 2010 +0000 qlcnic: mark device state fail Device state need to be mark as FAILED, if fail to start firmware. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 20c67bd40eacf26c8d61727aaf9cc791d682b40a Author: Amit Kumar Salecha Date: Mon May 17 01:22:13 2010 +0000 qlcnic: remove unused register Removing register defines which are not used by Qlgoic CNA device. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 78ad38923094a479453f5b02b37a012377a36f34 Author: Sucheta Chakraborty Date: Mon May 17 01:22:12 2010 +0000 qlcnic: fix internal loopback test Reset/set DEV_UP bit during allocation and deallocation of resources. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 4d5bdb384813f1928016661f28fd45f8327c081d Author: Amit Kumar Salecha Date: Mon May 17 01:22:11 2010 +0000 qlcnic: module param for firmware load option By default fw is loaded from flash, user can change this priority using load_fw_file module param. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7e382594a258f8733fd5b1790dc9362a05b9dbd9 Author: Sucheta Chakraborty Date: Mon May 17 01:22:10 2010 +0000 qlcnic: fix rx bytes statistics Added lrobytes to it. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 02f6e46f352d52bd88ab3f63e9546ecc6a16e385 Author: Sucheta Chakraborty Date: Mon May 17 01:22:09 2010 +0000 qlcnic: change adapter name display Append mac address to adapter name. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit aadd8184ae4b3f0c7874929a1b0248aafc29e509 Author: Anirban Chakraborty Date: Mon May 17 01:22:08 2010 +0000 qlcnic: fix memory leaks Fixes memory leak in error path when memory allocation for adapter data structures fails. Signed-off-by: Anirban Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 0e995cd3d3c78377a0bc7d38236fc50e5438fabb Author: Sonic Zhang Date: Mon May 10 05:39:14 2010 +0000 netdev: bfin_mac: check for mii_bus platform data If the platform data for the mii_bus is missing, gracefully error out rather than deference NULL pointers. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 2bfa0f0c9a37460ee69128da411f6d310c1c983d Author: Mike Frysinger Date: Mon May 10 05:39:13 2010 +0000 netdev: bfin_mac: handle timeouts with the MDIO registers gracefully Have the low level MDIO functions pass back up timeout information so we don't waste time polling them multiple times when there is a problem, and so we don't let higher layers think the device is available when it isn't. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit c0da776bde79e5d5e2c955ff37a8a09fe05433b2 Author: Sonic Zhang Date: Mon May 10 05:39:12 2010 +0000 netdev: bfin_mac: use promiscuous flag for promiscuous mode Rather than using the Receive All Frames (RAF) bit to enable promiscuous mode, use the Promiscuous (PR) bit. This lowers overhead at runtime as we let the hardware process the packets that should actually be checked. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 53fd3f2829268703729a2db0e24c0e36360b68a2 Author: Michael Hennerich Date: Mon May 10 05:39:11 2010 +0000 netdev: bfin_mac: add support for wake-on-lan magic packets Note that WOL works only in PM Suspend Standby Mode (Sleep Mode). Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 812a9de71512e5da6f3177f7249a2448b6a4322e Author: Sonic Zhang Date: Mon May 10 05:39:10 2010 +0000 netdev: bfin_mac: clear RXCKS if hardware generated checksum is not enabled Otherwise we might be get a setting mismatch from a previous module or bootloader and what the driver currently expects. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit ad2864d88718714d8b347b6209b07abb2ecd3a49 Author: Sonic Zhang Date: Mon May 10 05:39:09 2010 +0000 netdev: bfin_mac: deduce Ethernet FCS from hardware IP payload checksum IP checksum is based on 16-bit one's complement algorithm, so to deduce a value from checksum is equal to add its complement. Unfortunately, the Blackfin on-chip MAC checksum logic only works when the IP packet has a header length of 20 bytes. This is true for most IPv4 packets, but not for IPv6 packets or IPv4 packets which use header options. So only use the hardware checksum when appropriate. Signed-off-by: Sonic Zhang Signed-off-by: Jon Kowal Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit f6e1e4f3e511589dd0c47d42b870501659e7195f Author: Sonic Zhang Date: Mon May 10 05:39:08 2010 +0000 netdev: bfin_mac: invalid data cache only once for each new rx skb buffer The skb buffer isn't actually used until we finish transferring and pass it up to higher layers, so only invalidate the range once before we start receiving actual data. This also avoids the problem with data invalidating on Blackfin systems -- there is no invalidate-only, just invalidate+flush. So when running in writeback mode, there is the small (but not uncommon) possibility of the flush overwriting valid DMA-ed data from the cache. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit ec497b32c311b1e1aac22a76d294d24285d06331 Author: Peter Meerwald Date: Mon May 17 17:20:50 2010 -0700 netdev: bfin_mac: handler RX status errors Signed-off-by: Peter Meerwald Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit fe92afedee23e1d91f0133360a24d2bf48270739 Author: Barry Song Date: Mon May 17 17:19:40 2010 -0700 netdev: bfin_mac: add support for IEEE 1588 PTP Newer on-chip MAC peripherals support IEEE 1588 PTP in the hardware, so extend the driver to support this functionality. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit ab6e3feba1f1bc3b9418b854da6f481408d243de Author: Eric Dumazet Date: Mon May 10 11:31:49 2010 +0000 net: No dst refcounting in ip_queue_xmit() TCP outgoing packets can avoid two atomic ops, and dirtying of previously higly contended cache line using new refdst infrastructure. Note 1: loopback device excluded because of !IFF_XMIT_DST_RELEASE Note 2: UDP packets dsts are built before ip_queue_xmit(). Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4a94445c9a5cf5461fb41d80040033b9a8e2a85a Author: Eric Dumazet Date: Mon May 10 11:33:06 2010 +0000 net: Use ip_route_input_noref() in input path Use ip_route_input_noref() in ip fast path, to avoid two atomic ops per incoming packet. Note: loopback is excluded from this optimization in ip_rcv_finish() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 407eadd996dc62a827db85f1d0c286a98fd5d336 Author: Eric Dumazet Date: Mon May 10 11:32:55 2010 +0000 net: implements ip_route_input_noref() ip_route_input() is the version returning a refcounted dst, while ip_route_input_noref() returns a non refcounted one. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7fee226ad2397b635e2fd565a59ca3ae08a164cd Author: Eric Dumazet Date: Tue May 11 23:19:48 2010 +0000 net: add a noref bit on skb dst Use low order bit of skb->_skb_dst to tell dst is not refcounted. Change _skb_dst to _skb_refdst to make sure all uses are catched. skb_dst() returns the dst, regardless of noref bit set or not, but with a lockdep check to make sure a noref dst is not given if current user is not rcu protected. New skb_dst_set_noref() helper to set an notrefcounted dst on a skb. (with lockdep check) skb_dst_drop() drops a reference only if skb dst was refcounted. skb_dst_force() helper is used to force a refcount on dst, when skb is queued and not anymore RCU protected. Use skb_dst_force() in __sk_add_backlog(), __dev_xmit_skb() if !IFF_XMIT_DST_RELEASE or skb enqueued on qdisc queue, in sock_queue_rcv_skb(), in __nf_queue(). Use skb_dst_force() in dev_requeue_skb(). Note: dst_use_noref() still dirties dst, we might transform it later to do one dirtying per jiffies. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit ebda37c27d0c768947e9b058332d7ea798210cf8 Author: Eric Dumazet Date: Thu May 6 23:51:21 2010 +0000 rps: avoid one atomic in enqueue_to_backlog If CONFIG_SMP=y, then we own a queue spinlock, we can avoid the atomic test_and_set_bit() from napi_schedule_prep(). We now have same number of atomic ops per netif_rx() calls than with pre-RPS kernel. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 3f78d1f210ff89af77f042ab7f4a8fee39feb1c9 Author: Neil Jones Date: Mon May 17 17:18:28 2010 -0700 drivers/net/usb/asix.c: Fix unaligned accesses Using this driver can cause unaligned accesses in the IP layer This has been fixed by aligning the skb data correctly using the spare room left over by the 4 byte header inserted between packets by the device. Signed-off-by: Neil Jones Signed-off-by: David S. Miller commit e7a3af5d8cd782b84e6ca4e4dcc8613be1a809f0 Author: Brian King Date: Fri May 7 08:56:08 2010 +0000 ibmveth: Add suspend/resume support Adds support for resuming from suspend for IBM virtual ethernet devices. We may have lost an interrupt over the suspend, so we just kick the interrupt handler to process anything that is outstanding. Signed-off-by: Brian King Signed-off-by: David S. Miller commit 0771275b25e84f568699a5d209c5e339ef83fa94 Author: Florian Westphal Date: Fri May 7 11:31:33 2010 +0000 ipv6 addrlabel: permit deletion of labels assigned to removed dev as addrlabels with an interface index are left alone when the interface gets removed this results in addrlabels that can no longer be removed. Restrict validation of index to adding new addrlabels. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller commit 539c99fd7fc28f8db257c713c10fb4aceadf8887 Merge: ba2e1c5f 4d09ec0 Author: James Morris Date: Tue May 18 08:57:00 2010 +1000 Merge branch 'next' into for-linus commit 4d09ec0f705cf88a12add029c058b53f288cfaa2 Author: Dan Carpenter Date: Mon May 17 14:42:35 2010 +0100 KEYS: Return more accurate error codes We were using the wrong variable here so the error codes weren't being returned properly. The original code returns -ENOKEY. Signed-off-by: Dan Carpenter Signed-off-by: David Howells Signed-off-by: James Morris commit 9c6f7e43b4e02c161b53e97ba913855246876c61 Author: Ingo Molnar Date: Tue May 18 00:17:44 2010 +0200 stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback() This addresses the following compiler warning: kernel/stop_machine.c: In function 'cpu_stop_cpu_callback': kernel/stop_machine.c:297: warning: unused variable 'work' Cc: Tejun Heo Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit c59bd5688299cddb71183e156e7a3c1409b90df2 Author: H. Peter Anvin Date: Mon May 17 15:13:23 2010 -0700 x86, hweight: Use a 32-bit popcnt for __arch_hweight32() Use a 32-bit popcnt instruction for __arch_hweight32(), even on x86-64. Even though the input register will *usually* be zero-extended due to the standard operation of the hardware, it isn't necessarily so if the input value was the result of truncating a 64-bit operation. Note: the POPCNT32 variant used on x86-64 has a technically unnecessary REX prefix to make it five bytes long, the same as a CALL instruction, therefore avoiding an unnecessary NOP. Reported-by: Linus Torvalds Signed-off-by: H. Peter Anvin Cc: Borislav Petkov LKML-Reference: commit 94f3ca95787ada3d64339a4ecb2754236ab563f6 Author: Arnaldo Carvalho de Melo Date: Mon May 17 18:18:11 2010 -0300 perf tools: Add mode to build without newt support make NO_NEWT=1 Will avoid building the newt (tui) support. Suggested-by: Ingo Molnar LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4065c802da7484fa36f8cdf10f18d087233ecb88 Author: Jeff Layton Date: Mon May 17 07:18:58 2010 -0400 cifs: fix noserverino handling when unix extensions are enabled The uniqueid field sent by the server when unix extensions are enabled is currently used sometimes when it shouldn't be. The readdir codepath is correct, but most others are not. Fix it. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 2f51903bc3139e25ec908f8944a0001c7b868e90 Author: Arnaldo Carvalho de Melo Date: Mon May 17 17:57:59 2010 -0300 perf symbols: symbol inconsistency message should be done only at verbose=1 That happened for an old perf.data file that had no fake MMAP events for the kernel modules, but even then it should warn once for each module, not one time for every symbol in every module not found. Reported-by: Ingo Molnar LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 84f30c66c3689745abbd3b9ce39816caeb9bec3b Author: Jeff Layton Date: Mon May 17 07:18:57 2010 -0400 cifs: don't update uniqueid in cifs_fattr_to_inode We use this value to find an inode within the hash bucket, so we can't change this without re-hashing the inode. For now, treat this value as immutable. Eventually, we should probably use an inode number change on a path based operation to indicate that the lookup cache is invalid, but that's a bit more code to deal with. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit db19272edc93661835bf6ec9736cfd0754aa3c62 Author: Jeff Layton Date: Mon May 17 14:51:49 2010 -0400 cifs: always revalidate hardlinked inodes when using noserverino The old cifs_revalidate logic always revalidated hardlinked inodes. This hack allowed CIFS to pass some connectathon tests when server inode numbers aren't used (basic test7, in particular). Signed-off-by: Jeff Layton Signed-off-by: Steve French commit ba2e1c5f25a99dec3873745031ad23ce3fd79bff Merge: 7d32c0a 92183b3 Author: Linus Torvalds Date: Mon May 17 13:54:29 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: amiga - Floppy platform device conversion m68k: amiga - Sound platform device conversion m68k: amiga - Frame buffer platform device conversion m68k: amiga - Zorro host bridge platform device conversion m68k: amiga - Zorro bus modalias support platform: Make platform resource input parameters const m68k: invoke oom-killer from page fault serial167: Kill unused variables m68k: Implement generic_find_next_{zero_,}le_bit() m68k: hp300 - Checkpatch cleanup m68k: Remove trailing spaces in messages m68k: Simplify param.h by using m68k: Remove BKL from rtc implementations commit 7d32c0aca4fbd0319c860d12af5fae3e88c760e6 Merge: 3d2c978 6f485b4 Author: Linus Torvalds Date: Mon May 17 13:53:35 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: logfs: handle powerfail on NAND flash logfs: handle errors from get_mtd_device() logfs: remove unused variable logfs: fix sync logfs: fix compile failure logfs: initialize li->li_refcount logfs: commit reservations under space pressure logfs: survive logfs_buf_recover read errors logfs: Close i_ino reuse race logfs: fix logfs_seek_hole() logfs: Return -EINVAL if filesystem image doesn't match LogFS: Fix typo in b6349ac8 logfs: testing the wrong variable commit 3d2c978e0cd8b1157f9eebd13062d61fb7a75ad5 Merge: 81880d6 b8bc138 Author: Linus Torvalds Date: Mon May 17 13:48:10 2010 -0700 Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: ptrace: Cleanup useless header ptrace: kill BKL in ptrace syscall commit 63aa9e7e3ab28ad5362502b1a69fae945367ad65 Author: Arnaldo Carvalho de Melo Date: Mon May 17 16:42:37 2010 -0300 perf tui: Add explicit -lslang option At least on rawhide using -lnewt is not enough if we use SLang routines directly, so add an explicit -lslang since we use SLang routines. Reported-by: Ingo Molnar Tested-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit 92183b346f02773dae09182c65f16b013f295d80 Author: Geert Uytterhoeven Date: Sun Apr 5 13:02:13 2009 +0200 m68k: amiga - Floppy platform device conversion Signed-off-by: Geert Uytterhoeven commit ff2db7c5ab78817eb3c5d15dd87f18e9be726f1a Author: Geert Uytterhoeven Date: Sun Apr 5 12:59:54 2009 +0200 m68k: amiga - Sound platform device conversion Signed-off-by: Geert Uytterhoeven commit fa6688e1c7e7341fb7d1ca5878a3641762e60dec Author: Geert Uytterhoeven Date: Sun Apr 5 12:45:56 2009 +0200 m68k: amiga - Frame buffer platform device conversion Signed-off-by: Geert Uytterhoeven commit 0d305464aefff342c85b4db8b3d7a4345246e5a1 Author: Geert Uytterhoeven Date: Sun Apr 5 12:40:41 2009 +0200 m68k: amiga - Zorro host bridge platform device conversion Signed-off-by: Geert Uytterhoeven commit bf54a2b3c0dbf76136f00ff785bf6d8f6291311d Author: Geert Uytterhoeven Date: Tue Nov 18 21:13:53 2008 +0100 m68k: amiga - Zorro bus modalias support Add Amiga Zorro bus modalias and uevent support Signed-off-by: Geert Uytterhoeven commit 0b7f1a7efb38b551f5948a13d0b36e876ba536db Author: Geert Uytterhoeven Date: Wed Jan 28 21:01:02 2009 +0100 platform: Make platform resource input parameters const Make the platform resource input parameters of platform_device_add_resources() and platform_device_register_simple() const, as the resources are copied and never modified. Signed-off-by: Geert Uytterhoeven Acked-by: Greg Kroah-Hartman commit adbf6e6952e80ae42a403442dcae21438cae94b3 Author: Nick Piggin Date: Fri Apr 23 02:06:20 2010 +1000 m68k: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Cc: linux-m68k@lists.linux-m68k.org Cc: Geert Uytterhoeven Cc: linux-arch@vger.kernel.org Signed-off-by: Nick Piggin Acked-by: David Rientjes [Geert] Kill 2 introduced compiler warnings Signed-off-by: Geert Uytterhoeven commit f3c7f317c91e45aac0ef9d0b6474cd4637de69f0 Author: Geert Uytterhoeven Date: Wed Apr 14 18:48:50 2010 +0200 serial167: Kill unused variables commits 638157bc1461f6718eeca06bedd9a09cf1f35c36 ("serial167: prepare to push BKL down into drivers") and 4165fe4ef7305609a96c7f248cefb9c414d0ede5 ("tty: Fix up char drivers request_room usage") removed code without removing the corresponding variables: | drivers/char/serial167.c: In function 'cd2401_rx_interrupt': | drivers/char/serial167.c:630: warning: unused variable 'len' | drivers/char/serial167.c: In function 'cy_ioctl': | drivers/char/serial167.c:1531: warning: unused variable 'val' Remove the variables to kill the warnings. Signed-off-by: Geert Uytterhoeven commit 2d4cdd6fc974716555fcbaf7ec1d4dda22784c1b Author: Peter Ujfalusi Date: Mon May 17 14:21:46 2010 +0300 ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF Avoid calling the dac33_hard_power when the codec was already in BIAS_OFF state. This could happen in device suspend and module removal time. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7fd1d74bfc0ecf3dfa139b47daa7941841724886 Author: Felipe Balbi Date: Mon May 17 14:21:45 2010 +0300 ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function Since the cases when the same power state would be set again handled gracefully, we do not need to use dev_warn. Signed-off-by: Felipe Balbi Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit edb7c60e27c1baff38d82440dc52eaffac9a45f4 Author: Arnaldo Carvalho de Melo Date: Mon May 17 16:22:41 2010 -0300 perf options: Type check all the remaining OPT_ variants OPT_SET_INT was renamed to OPT_SET_UINT since the only use in these tools is to set something that has an enum type, that is builtin compatible with unsigned int. Several string constifications were done to make OPT_STRING require a const char * type. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8035458fbb567ae138c77a5f710050107c6a7066 Author: Arnaldo Carvalho de Melo Date: Mon May 17 15:51:10 2010 -0300 perf options: Type check OPT_BOOLEAN and fix the offenders Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit b52dd0077cde89111c00efc73a8db07f50ebb3e8 Author: Geert Uytterhoeven Date: Sun Feb 28 13:06:27 2010 +0100 m68k: Implement generic_find_next_{zero_,}le_bit() linux-next: fs/udf/balloc.c: In function 'udf_bitmap_new_block': fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit' Convert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(), and wrap the ext2_find_next_{zero_,}bit() around the latter. Signed-off-by: Geert Uytterhoeven commit 9881bbb269e8f287d0e55ae3384e48b26f1872f7 Author: Andrea Gelmini Date: Sat Feb 27 17:51:33 2010 +0100 m68k: hp300 - Checkpatch cleanup arch/m68k/hp300/time.h:2: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini Signed-off-by: Geert Uytterhoeven commit b9b0d8b430ebd61d32e2a9544e75a3c4b10cddcd Author: Frans Pop Date: Sat Feb 6 18:47:11 2010 +0100 m68k: Remove trailing spaces in messages Signed-off-by: Frans Pop Signed-off-by: Geert Uytterhoeven commit 291d7e9553fef2e18825b1ef1345fbd316dff98f Author: Robert P. J. Day Date: Thu Dec 31 15:35:44 2009 -0500 m68k: Simplify param.h by using Signed-off-by: Robert P. J. Day Signed-off-by: Geert Uytterhoeven commit b1f3bb494e8acddeb972331c2ac642b3c7bceeb9 Author: Thomas Gleixner Date: Thu Oct 15 08:42:21 2009 +0000 m68k: Remove BKL from rtc implementations m68k does not support SMP. The access to the rtc is already serialized with local_irq_save/restore which is sufficient on UP. The open() protection in arch/m68k/mvme16x/rtc.c is not pretty but sufficient on UP and safe w/o the BKL. open() in arch/m68k/bvme6000/rtc.c can do with the same atomic logic as arch/m68k/mvme16x/rtc.c Signed-off-by: Thomas Gleixner Signed-off-by: Geert Uytterhoeven commit 1967936d688c475b85d34d84e09858cf514c893c Author: Arnaldo Carvalho de Melo Date: Mon May 17 15:39:16 2010 -0300 perf options: Check v type in OPT_U?INTEGER To avoid problems like the one fixed by Stephane Eranian in 3de29ca, now we'll got this instead: bench/sched-messaging.c:259: error: negative width in bit-field ‘’ bench/sched-messaging.c:261: error: negative width in bit-field ‘’ Which is rather cryptic, but is how BUILD_BUG_ON_ZERO works, so kernel hackers should be already used to this. With it in place found some problems, fixed by changing the affected variables to sensible types or changed some OPT_INTEGER to OPT_UINTEGER. Next csets will go thru converting each of the remaining OPT_ so that review can be made easier by grouping changes per type per patch. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c100edbee8dbf033ec4095a976a74c1c75c9fc1d Author: Arnaldo Carvalho de Melo Date: Mon May 17 15:30:00 2010 -0300 perf options: Introduce OPT_UINTEGER For unsigned int options to be parsed, next patches will make use of it. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6fe70aae0d128339febfabc073ba4c4a03de4f45 Merge: 278554b 0c348d7c Author: John W. Linville Date: Mon May 17 13:57:43 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 0c348d7c1422d59a86d6fb37b53d75788043e50b Merge: fd76f14 b8d92c9 Author: John W. Linville Date: Mon May 17 13:31:05 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit fec84e330719c20d2146c8dbdc9ff50b3a1d7039 Author: Andreas Herrmann Date: Mon May 17 18:43:24 2010 +0200 x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk (At the moment the "SB700 Family Product Errata" document is available at http://support.amd.com/us/Embedded_TechDocs/46837.pdf) Signed-off-by: Andreas Herrmann LKML-Reference: <20100517164324.GB10254@alberich.amd.com> Signed-off-by: H. Peter Anvin commit ac1d426e825ab5778995f2f6f053ca2e6b45c622 Merge: fda0e18 a3685f0 Author: Russell King Date: Mon May 17 17:24:04 2010 +0100 Merge branch 'devel-stable' into devel Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig commit fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 Merge: 98830bc d1e86d6 Author: Russell King Date: Mon May 17 17:21:23 2010 +0100 Merge branch 'devel-pmu' into devel commit 98830bc9967b18d6f9a614a1f354f5580196ef85 Author: Hartley Sweeten Date: Mon May 17 17:18:10 2010 +0100 ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which in turn will select GENERIC_GPIO. Because of this, there is no reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the architectures that have ARCH_REQUIRE_GPIOLIB. Signed-off-by: H Hartley Sweeten Signed-off-by: Russell King commit dc4ff19341126155c5714119396efbae62ab40bf Author: Arnaldo Carvalho de Melo Date: Mon May 17 12:25:09 2010 -0300 perf tui: Add workaround for slang < 2.1.4 Older versions of the slang library didn't used the 'const' specifier, causing problems with modern compilers of this kind: util/newt.c:252: error: passing argument 1 of ‘SLsmg_printf’ discards qualifiers from pointer target type Fix it by using some wrappers that when needed const the affected parameters back to plain (char *). Reported-by: Lin Ming Cc: Frédéric Weisbecker Cc: Lin Ming Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: <20100517145421.GD29052@ghostprotocols.net> Signed-off-by: Arnaldo Carvalho de Melo commit 3de29cab1f8d62db557a4afed0fb17eebfe64438 Author: Stephane Eranian Date: Mon May 17 12:20:43 2010 -0300 perf record: Fix bug mismatch with -c option definition The -c option defines the user requested sampling period. It was implemented using an unsigned int variable but the type of the option was OPT_LONG. Thus, the option parser was overwriting memory belonging to other variables, namely the mmap_pages leading to a zero page sampling buffer. The bug was exposed only when compiling at -O0, probably because the compiler was padding variables at higher optimization levels. This patch fixes this problem by declaring user_interval as u64. This also avoids wrap-around issues for large period on 32-bit systems. Commiter note: Made it use OPT_U64(user_interval) after implementing OPT_U64 in the previous patch. Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <4bf11ae9.e88cd80a.06b0.ffffa8e3@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 6ba85cea872954a36d79e46bf6a9c6ea92794f01 Author: Arnaldo Carvalho de Melo Date: Mon May 17 12:16:48 2010 -0300 perf options: Introduce OPT_U64 We have things like user_interval (-c/--count) in 'perf record' that needs this. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 81880d603d00c645e0890d0a44d50711c503b72b Author: Anton Blanchard Date: Mon May 17 14:34:57 2010 +1000 atomic_t: Remove volatile from atomic_t definition When looking at a performance problem on PowerPC, I noticed some awful code generation: c00000000051fc98: 3b 60 00 01 li r27,1 ... c00000000051fca0: 3b 80 00 00 li r28,0 ... c00000000051fcdc: 93 61 00 70 stw r27,112(r1) c00000000051fce0: 93 81 00 74 stw r28,116(r1) c00000000051fce4: 81 21 00 70 lwz r9,112(r1) c00000000051fce8: 80 01 00 74 lwz r0,116(r1) c00000000051fcec: 7d 29 07 b4 extsw r9,r9 c00000000051fcf0: 7c 00 07 b4 extsw r0,r0 c00000000051fcf4: 7c 20 04 ac lwsync c00000000051fcf8: 7d 60 f8 28 lwarx r11,0,r31 c00000000051fcfc: 7c 0b 48 00 cmpw r11,r9 c00000000051fd00: 40 c2 00 10 bne- c00000000051fd10 c00000000051fd04: 7c 00 f9 2d stwcx. r0,0,r31 c00000000051fd08: 40 c2 ff f0 bne+ c00000000051fcf8 c00000000051fd0c: 4c 00 01 2c isync We create two constants, write them out to the stack, read them straight back in and sign extend them. What a mess. It turns out this bad code is a result of us defining atomic_t as a volatile int. We removed the volatile attribute from the powerpc atomic_t definition years ago, but commit ea435467500612636f8f4fb639ff6e76b2496e4b (atomic_t: unify all arch definitions) added it back in. To dig up an old quote from Linus: > The fact is, volatile on data structures is a bug. It's a wart in the C > language. It shouldn't be used. > > Volatile accesses in *code* can be ok, and if we have "atomic_read()" > expand to a "*(volatile int *)&(x)->value", then I'd be ok with that. > > But marking data structures volatile just makes the compiler screw up > totally, and makes code for initialization sequences etc much worse. And screw up it does :) With the volatile removed, we see much more reasonable code generation: c00000000051f5b8: 3b 60 00 01 li r27,1 ... c00000000051f5c0: 3b 80 00 00 li r28,0 ... c00000000051fc7c: 7c 20 04 ac lwsync c00000000051fc80: 7c 00 f8 28 lwarx r0,0,r31 c00000000051fc84: 7c 00 d8 00 cmpw r0,r27 c00000000051fc88: 40 c2 00 10 bne- c00000000051fc98 c00000000051fc8c: 7f 80 f9 2d stwcx. r28,0,r31 c00000000051fc90: 40 c2 ff f0 bne+ c00000000051fc80 c00000000051fc94: 4c 00 01 2c isync Six instructions less. Signed-off-by: Anton Blanchard Signed-off-by: Linus Torvalds commit f3d46f9d3194e0329216002a8724d4c0957abc79 Author: Anton Blanchard Date: Mon May 17 14:33:53 2010 +1000 atomic_t: Cast to volatile when accessing atomic variables In preparation for removing volatile from the atomic_t definition, this patch adds a volatile cast to all the atomic read functions. Signed-off-by: Anton Blanchard Signed-off-by: Linus Torvalds commit acd200bf45487271d54f05938ad9e30f32a530ee Author: Dominik Brodowski Date: Sat Mar 6 13:31:17 2010 +0100 pcmcia: disable PCMCIA ioctl also for ARM As per a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb, disable the long obsolete PCMCIA ioctl also for ARM. Signed-off-by: Dominik Brodowski commit 7622802e479e30a2258afdbfd31acaf829636e7a Author: Javier Martinez Canillas Date: Fri Apr 30 16:31:48 2010 -0400 drivers/staging/comedi: dev_node removal (quatech_daqp_cs) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit bfc2cc3497dfa7800faa9d2915e997d65daaf56e Author: Javier Martinez Canillas Date: Fri Apr 30 16:31:37 2010 -0400 drivers/staging/comedi: dev_node removal (ni_mio_cs) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit 99bd8f22220efc214130488c3d65d6acc34ea893 Author: Javier Martinez Canillas Date: Fri Apr 30 16:31:23 2010 -0400 drivers/staging/comedi: dev_node removal (ni_labpc_cs) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit 78950591e42a9c5069308f24e4cff73ae4d37472 Author: Javier Martinez Canillas Date: Fri Apr 30 16:31:10 2010 -0400 drivers/staging/comedi: dev_node removal (ni_daq_dio24) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit cdc268b4a029d489798db10d10fea72b7a415ab9 Author: Javier Martinez Canillas Date: Fri Apr 30 16:30:40 2010 -0400 drivers/staging/comedi: dev_node removal (ni_daq_700) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit df3f97a2d65c52d7cdaf80907151281b5d449222 Author: Javier Martinez Canillas Date: Fri Apr 30 16:30:23 2010 -0400 drivers/staging/comedi: dev_node removal (das08_cs) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit eb8804f654a512a1a4e2f189d1bbaa41565e46b5 Author: Javier Martinez Canillas Date: Fri Apr 30 16:30:07 2010 -0400 drivers/staging/comedi: dev_node removal (cb_das16_cs) Signed-off-by: Javier Martinez Canillas Signed-off-by: Dominik Brodowski commit d1e86d64bc48dedd0d68d182d0ce6951d8b4fd0d Author: Will Deacon Date: Fri Apr 30 11:38:39 2010 +0100 ARM: 6074/1: oprofile: convert from sysdev to platform device This is a reworking of an original patch posted by Aaro Koskinen: oprofile does not work with PM, because sysdev_suspend() is done with interrupts disabled and oprofile needs a mutex. Implementing oprofile as a platform device solves this problem. Cc: Aaro Koskinen Signed-off-by: Will Deacon Signed-off-by: Aaro Koskinen Signed-off-by: Russell King commit fe166148f699cc7865ca07b6754872cfb5ebc312 Author: Will Deacon Date: Fri Apr 30 11:37:51 2010 +0100 ARM: 6073/1: oprofile: remove old files and update KConfig Enable hardware perf-events if CPU_HAS_PMU and select HAVE_OPROFILE if HAVE_PERF_EVENTS. If no hardware support is present, OProfile will fall back to timer mode. This patch also removes the old OProfile drivers in favour of the code implemented by perf. Signed-off-by: Will Deacon Signed-off-by: Russell King commit 8c1fc96f6fd1f361428ba805103af0d0eee65179 Author: Will Deacon Date: Fri Apr 30 11:36:54 2010 +0100 ARM: 6072/1: oprofile: use perf-events framework as backend There are currently two hardware performance monitoring subsystems in the kernel for ARM: OProfile and perf-events. This creates the following problems: 1.) Duplicate PMU accessor code. Inevitable code drift may lead to bugs in one framework that are fixed in the other. 2.) Locking issues. OProfile doesn't reprogram hardware counters between profiling runs if the events to be monitored have not been changed. This means that other profiling frameworks cannot use the counters if OProfile is in use. 3.) Due to differences in the two frameworks, it may not be possible to compare the results obtained by OProfile with those obtained by perf. This patch removes the OProfile PMU driver code and replaces it with calls to perf, therefore solving the issues mentioned above. The only userspace-visible change is the lack of SCU counter support for 11MPCore. This is currently unsupported by OProfile userspace tools anyway and therefore shouldn't cause any problems. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Robert Richter Cc: Jamie Iles Cc: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit 929f5199448a67d41bb249d58815ef77bcd53622 Author: Will Deacon Date: Fri Apr 30 11:34:26 2010 +0100 ARM: 6071/1: perf-events: allow modules to query the number of hardware counters For OProfile to initialise oprofilefs correctly, it needs to know the number of counters it can represent. This patch adds a function to the ARM perf-events backend to return the number of hardware counters available for the current PMU. Cc: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit 49e6a32f2f0876b6267584d9c7e0e213bca6e2b8 Author: Will Deacon Date: Fri Apr 30 11:33:33 2010 +0100 ARM: 6070/1: perf-events: add support for xscale PMUs The perf-events framework for ARM only supports v6 and v7 cores. This patch adds support for xscale v1 and v2 PMUs to perf, based on the OProfile drivers in arch/arm/oprofile/op_model_xscale.c Signed-off-by: Will Deacon Signed-off-by: Russell King commit 181193f398e7d8da6b1196138f0e219709621743 Author: Will Deacon Date: Fri Apr 30 11:32:44 2010 +0100 ARM: 6069/1: perf-events: use numeric ID to identify PMU The ARM perf-events framework provides support for a number of different PMUs using struct arm_pmu. The char *name field of this struct can be used to identify the PMU, but this is cumbersome if used outside of perf. This patch replaces the name string for a PMU with an enum, which holds a unique ID for the PMU being represented. This ID can be used to index an array of names within perf, so no functionality is lost. The presence of the ID field, allows other kernel subsystems [currently oprofile] to use their own mappings for the PMU name. Cc: Jean Pihet Acked-by: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit 49c006b93769a86bec2b32b9234abf016ac0d50e Author: Will Deacon Date: Thu Apr 29 17:13:24 2010 +0100 ARM: 6064/1: pmu: register IRQs at runtime The current PMU infrastructure for ARM requires that the IRQs for the PMU device are fixed at compile time and are selected based on the ARCH_ or MACH_ flags. This has the disadvantage of tying the Kernel down to a particular board as far as profiling is concerned. This patch replaces the compile-time IRQ registration with a runtime mechanism which allows the IRQs to be registered with the framework as a platform_device. A further advantage of this change is that there is scope for registering different types of performance counters in the future by changing the id of the platform_device and attaching different resources to it. Acked-by: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit c39e52a793f5599582dbacf4d8f62634a492f79e Merge: 7622537 8716011 4fec997 de4338f 47ab0de 2a84751 8834133 3e9cc70 4c18e77 f417cba Author: Russell King Date: Mon May 17 11:52:31 2010 +0100 Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig commit 47ab0dee661dbd5aca67abe44a333e471134fbf9 Author: Russell King Date: Sat May 15 11:02:43 2010 +0100 ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA Provide a configuration option to allow the ARMv6 to use normal bufferable memory for coherent DMA. This option is forced to 'y' for ARMv7, and offered as a configuration option on ARMv6. Enabling this option requires drivers to have the necessary barriers to ensure that data in DMA coherent memory is visible prior to the DMA operation commencing. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 939e379e9e183ae6291ac7caa4a5e1dfadae4ccc Author: Julia Lawall Date: Mon May 17 10:00:23 2010 +0200 [S390] drivers/s390/char: Use kmemdup Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // Signed-off-by: Julia Lawall Signed-off-by: Martin Schwidefsky commit 777a5510093a6d6443351160c6969a0e66f3ba8a Author: Julia Lawall Date: Mon May 17 10:00:22 2010 +0200 [S390] drivers/s390/char: Use kstrdup Use kstrdup when the goal of an allocation is copy a string into the allocated region. Additionally drop the now unused variable len. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to; expression flag,E1,E2; statement S; @@ - to = kmalloc(strlen(from) + 1,flag); + to = kstrdup(from, flag); ... when != \(from = E1 \| to = E1 \) if (to==NULL || ...) S ... when != \(from = E2 \| to = E2 \) - strcpy(to, from); // Signed-off-by: Julia Lawall Signed-off-by: Martin Schwidefsky commit ab3c68ee5fd329ba48094d3417fd60e30ea14a87 Author: Heiko Carstens Date: Mon May 17 10:00:21 2010 +0200 [S390] debug: enable exception-trace debug facility The exception-trace facility on x86 and other architectures prints traces to dmesg whenever a user space application crashes. s390 has such a feature since ages however it is called userprocess_debug and is enabled differently. This patch makes sure that whenever one of the two procfs files /proc/sys/kernel/userprocess_debug /proc/sys/debug/exception-trace is modified the contents of the second one changes as well. That way we keep backwards compatibilty but also support the same interface like other architectures do. Besides that the output of the traces is improved since it will now also contain the corresponding filename of the vma (when available) where the process caused a fault or trap. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 57b28f66316d287b9dbf7b28358ca90257230769 Author: Michael Holzheu Date: Mon May 17 10:00:20 2010 +0200 [S390] s390_hypfs: Add new attributes In order to access the data of the hypfs diagnose calls from user space also in binary form, this patch adds two new attributes in debugfs: * z/VM: s390_hypfs/d2fc_bin * LPAR: s390_hypfs/d204_bin Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit cc961d400e06e78c7aa39aeab1f001eb8f76ef90 Author: Jan Glauber Date: Mon May 17 10:00:19 2010 +0200 [S390] qdio: remove API wrappers Remove qdio API wrappers used by qeth and replace them by calling the appropriate functions directly. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit d0c9d4a89fff4352b20ae8704b84cd99a8372f66 Author: Jan Glauber Date: Mon May 17 10:00:18 2010 +0200 [S390] qdio: set correct bit in dsci The state change indicator is bit 7 not bit 0 of the dsci. Use the correct bit for setting the indicator. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 3a601bfef33c82537511c7d970d8010c38aaecd1 Author: Jan Glauber Date: Mon May 17 10:00:17 2010 +0200 [S390] qdio: dont convert timestamps to microseconds Don't convert timestamps to microseconds, use timestamps returned by get_clock() directly. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 5382fe11d90e3ed9602ce655e523852e3dbf3e35 Author: Jan Glauber Date: Mon May 17 10:00:16 2010 +0200 [S390] qdio: remove memset hack Remove memset hack that relied on the layout of struct qdio_q to avoid deletion of the slib pointer. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit f3eb20fafdc10aea0fb13b113ac3b9a3dc9a5dc6 Author: Jan Glauber Date: Mon May 17 10:00:15 2010 +0200 [S390] qdio: prevent starvation on PCI devices If adapter interrupts are not available and traditional IO interrupts are used for qdio the inbound tasklet continued to run if new data arrived. That could possibly block other tasklets scheduled on the same CPU. If new data arrives schedule the tasklet again instead of directly processing the new data. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 09a308f384c4ad2fb45959f5da9918e812207c50 Author: Jan Glauber Date: Mon May 17 10:00:14 2010 +0200 [S390] qdio: count number of qdio interrupts Add missing increment for the qdio interrupt counter. Signed-off-by: Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 6ea50968274673ea7b58695efec2eeb55ca2f5dd Author: Heiko Carstens Date: Mon May 17 10:00:13 2010 +0200 [S390] user space fault: report fault before calling do_exit Report user space faults before calling do_exit, since do_exit does not return and therefore we will never see the fault message on the console. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 10d3858950557cd3cc05f647ede597114c610177 Author: Heiko Carstens Date: Mon May 17 10:00:12 2010 +0200 [S390] topology: expose core identifier Provide a topology_core_id define which makes sure that the contents of /sys/devices/system/cpu/cpuX/topology/core_id indeed do contain the core id and not always 0. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 2dedf0d9eadf39660f2e1686b5d36e4a7515803f Author: Stefan Haberland Date: Mon May 17 10:00:11 2010 +0200 [S390] dasd: remove uid from devmap Remove the duplicate of the DASD uid from the devmap structure. Use the uid from the device private structure instead. This also removes a lockdep warning complaining about a possible SOFTIRQ-safe -> SOFTIRQ-unsafe lock order. Signed-off-by: Stefan Haberland Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 501183f2ed74434e30a1b039b2f3af30f1f3f461 Author: Stefan Haberland Date: Mon May 17 10:00:10 2010 +0200 [S390] dasd: add dynamic pav toleration For base Parallel Access Volume (PAV) there is a fixed mapping of base and alias devices. With dynamic PAV this mapping can be changed so that an alias device is used with another base device. This patch enables the DASD device driver to tolerate dynamic PAV changes. Signed-off-by: Stefan Haberland Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f3cb31e495668eae568c584c666631e26c68bdea Author: Hendrik Brueckner Date: Mon May 17 10:00:09 2010 +0200 [S390] vdso: add missing vdso_install target Add missing vdso_install target to install the unstripped vdso images into $(MODLIB)/vdso/. These files are helpful when containing additional debugging information. Signed-off-by: Hendrik Brueckner Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a78f1c4c1dc4b9dedd17c46dd414f26c7bf1e503 Author: Christoph Egger Date: Mon May 17 10:00:08 2010 +0200 [S390] vdso: remove redundant check for CONFIG_64BIT This is a check for CONFIG_64BIT inside a block that is only active when CONFIG_64BIT is set. So the check is actually useless and potentially irritating. Signed-off-by: Christoph Egger Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 58ea91c05346f7c6336e6248b743aa9a8e1c19a9 Author: Martin Schwidefsky Date: Mon May 17 10:00:07 2010 +0200 [S390] avoid default_llseek in s390 drivers Use nonseekable_open for a couple of s390 device drivers. This avoids the use of default_llseek function which has a dependency on the BKL. Signed-off-by: Martin Schwidefsky commit f73a2b03c59b95a3ee8eebcc127350c77c950e87 Author: Heiko Carstens Date: Mon May 17 10:00:06 2010 +0200 [S390] vmcp: disallow modular build Change the tristate Kbuild option into a bool option so that the module is either builtin or not available at all. There have been too many cases where people were missing the 'vmcp' device node and unable to send z/VM CP commands. So let's make sure that on distros it will always be present. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 86f2552bbd0e17b19bb5e9881042533eaea553c7 Author: Martin Schwidefsky Date: Mon May 17 10:00:05 2010 +0200 [S390] add breaking event address for user space Copy the last breaking event address from the lowcore to a new field in the thread_struct on each system entry. Add a new ptrace request PTRACE_GET_LAST_BREAK and a new utrace regset REGSET_LAST_BREAK to query the last breaking event. This is useful for debugging wild branches in user space code. Signed-off-by: Martin Schwidefsky commit cd3b70f5d4d82f85d1e1d6e822f38ae098cf7c72 Author: Carsten Otte Date: Mon May 17 10:00:04 2010 +0200 [S390] virtualization aware cpu measurement Use the SPP instruction to set a tag on entry to / exit of the virtual machine context. This allows the cpu measurement facility to distinguish the samples from the host and the different guests. Signed-off-by: Carsten Otte commit 6377981faf1a4425b0531e577736ef03df97c8f6 Author: Martin Schwidefsky Date: Mon May 17 10:00:03 2010 +0200 [S390] idle time accounting vs. machine checks A machine check can interrupt the i/o and external interrupt handler anytime. If the machine check occurs while the interrupt handler is waking up from idle vtime_start_cpu can get executed a second time and the int_clock / async_enter_timer values in the lowcore get clobbered. This can confuse the cpu time accounting. To fix this problem two changes are needed. First the machine check handler has to use its own copies of int_clock and async_enter_timer, named mcck_clock and mcck_enter_timer. Second the nested execution of vtime_start_cpu has to be prevented. This is done in s390_idle_check by checking the wait bit in the program status word. Signed-off-by: Martin Schwidefsky commit 6a2df3a87276cdc08fd87070d09ea18d1fb9d622 Author: Martin Schwidefsky Date: Mon May 17 10:00:02 2010 +0200 [S390] improve irq tracing code in entry[64].S The system call path in entry[64].S is run with interrupts enabled. Remove the irq tracing check from the system call exit code. If a program check interrupted a context enabled for interrupts do a call to trace_irq_off_caller in the program check handler before branching to the system call exit code. Restructure the system call and io interrupt return code to avoid avoid the lpsw[e] to disable machine checks. Signed-off-by: Martin Schwidefsky commit 43d399d2ab7e96cb8d952d0ba4e9131587b7c8b9 Author: Martin Schwidefsky Date: Mon May 17 10:00:01 2010 +0200 [S390] cleanup sysc_work and io_work code Cleanup the #ifdef mess at io_work in entry[64].S and streamline the TIF work code of the system call and io exit path. Signed-off-by: Martin Schwidefsky commit 94038a99119c171aea27608f81c7ba359de98c4e Author: Martin Schwidefsky Date: Mon May 17 10:00:00 2010 +0200 [S390] More cleanup for struct _lowcore Remove cpu_id from lowcore and replace addr_t with __u64. Signed-off-by: Martin Schwidefsky commit a3685f00652af83f12b63e3b4ef48f29581ba48b Merge: b12f3cb 63b1f51 Author: Russell King Date: Mon May 17 08:49:25 2010 +0100 Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable commit 14894b9b8317d9a337bba55998fdef1c9b2dc63d Author: Jassi Brar Date: Mon May 17 10:35:29 2010 +0900 S3C: DMA: Change argument of s3c2410_dma_devconfig All other functions have the channel argument of type 'unsigned int' the s3c2410_dma_devconfig also accept the same value as argument but treat it as type 'int'. Remove this anomaly by make it 'unsigned int'. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 550a8b691ca67761bbf382d98fbd81d215f1d7f0 Author: Julia Lawall Date: Thu May 13 21:58:37 2010 +0200 ALSA: sound/pci/asihpi: Use kzalloc Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Signed-off-by: Takashi Iwai commit 3eaead579ebc09d4f4c050c9b6ce6d67337bcb20 Author: Wu Fengguang Date: Fri May 14 16:36:15 2010 +0800 ALSA: hdmi - dont fail on extra nodes The number of HDMI nodes is expected to go up in future. So don't fail hard on seeing extra converter/pin nodes. We can still operate safely on the nodes within MAX_HDMI_CVTS/MAX_HDMI_PINS. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit e48b00870f269541c28bec8d457904a04545d5e5 Author: Wu Fengguang Date: Fri May 14 16:36:14 2010 +0800 ALSA: intelhdmi - add id for the CougarPoint chipset Add id for Intel CougarPoint HDMI audio codec. CougarPoint provides 3 Audio Converters. Increase MAX_HDMI_CVTS/MAX_HDMI_PINS accordingly. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 41da2e0a01bf13986a561d8a16929d009eb9099c Author: Wu Fengguang Date: Fri May 14 16:36:13 2010 +0800 ALSA: intelhdmi - user friendly codec name Use the full chipset codename as codec name. They are more user friendly than the spec abbrs. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit e9abf85fe1fb0cd1da19ec231f2d6873e4af9fbd Author: Wu Fengguang Date: Fri May 14 16:36:12 2010 +0800 ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS This is necessary to support >=3 HDMI playback devices starting from the CougarPoint codec. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai commit 1be1d76b8a1f622fd3a64778dfe117053f2af1f2 Author: Dan Carpenter Date: Fri May 14 16:50:05 2010 +0200 ALSA: asihpi: incorrect range check The entity_type_to_size[] array has LAST_ENTITY_TYPE (11) number of elements, not LAST_ENTITY_ROLE (17). This only affects the debug output. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit 2448b14715bc83d75ed779452fe89285df4d772a Author: Dan Carpenter Date: Fri May 14 16:49:20 2010 +0200 ALSA: asihpi: testing the wrong variable There is a typo here. We want to test "*dst" not "dst". Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit b0fb75ad5c8ca205396d7a493c9be5a5da802747 Author: Dan Carpenter Date: Fri May 14 16:48:28 2010 +0200 ALSA: es1688: add pedantic range checks Smatch complains that if (dev == SNDRV_CARDS) we're one past the end of the array. That's unlikely to happen in real life, I suppose. Also smatch complains about "strcpy(card->shortname, pcm->name);" The "pcm->name" buffer is 80 characters and "card->shortname" is 32 characters. If you follow the call paths it turns out we never actually use more than 16 characters so it's not a problem. But anyway, let's make it easy for people auditing this in the future. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit fea24e28c663e62663097f0ed3b8ff1f9a87f15e Author: Jacob Pan Date: Fri May 14 14:41:20 2010 -0700 x86, mrst: add nop functions to x86_init mpparse functions Moorestown does not have BIOS provided MP tables, we can save some time by avoiding scaning of these tables. e.g. [ 0.000000] Scan SMP from c0000000 for 1024 bytes. [ 0.000000] Scan SMP from c009fc00 for 1024 bytes. [ 0.000000] Scan SMP from c00f0000 for 65536 bytes. [ 0.000000] Scan SMP from c00bfff0 for 1024 bytes. Searching EBDA with the base at 0x40E will also result in random pointer deferencing within 1MB. This can be a problem in Lincroft if the pointer hits VGA area and VGA mode is not enabled. Signed-off-by: Jacob Pan LKML-Reference: <1273873281-17489-8-git-send-email-jacob.jun.pan@linux.intel.com> Acked-by: Thomas Gleixner Signed-off-by: H. Peter Anvin commit e4af4268a34d8cd28c46a03161fc017cbd2db887 Author: Jacob Pan Date: Fri May 14 14:41:14 2010 -0700 x86, mrst, pci: return 0 for non-present pci bars Moorestown PCI code has special handling of devices with fixed BARs. In case of BAR sizing writes, we need to update the fake PCI MMCFG space with real size decode value. When a BAR is not present, we need to return 0 instead of ~0. ~0 will be treated as device error per bugzilla 12006. Signed-off-by: Jacob Pan LKML-Reference: <1273873281-17489-2-git-send-email-jacob.jun.pan@linux.intel.com> Acked-by: Jesse Barnes Acked-by: Thomas Gleixner Signed-off-by: H. Peter Anvin commit 6811d58fc148c393f80a9f5a9db49d7e75cdc546 Merge: c4949f0 c02db8c Author: David S. Miller Date: Sun May 16 22:26:58 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: include/linux/if_link.h commit f64cacc3194f49c7371e2ce61c22de62b8652dc7 Author: Thomas Abraham Date: Mon May 17 09:39:03 2010 +0900 ARM: S5PV210: Add sclk clocks of type 'struct clksrc_clk' clock Add sclk clocks of type 'struct clksrc_clk' clock. The 'group2' of clock clock sources is also added. This patch also changes the the 'id' member value of the uclk1 clock for instance instance 0 since there are 4 instances of the uclk1 clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 4583487c43358070ef1bd43dd1cbaf2dd42e4db7 Author: Thomas Abraham Date: Mon May 17 09:39:00 2010 +0900 ARM: S5PV210: Add sclk_audio and sclk_spdif clocks. Add the sclk_audio(0/1/2) clocks and sclk_spdif clock of type 'struct clksrc_clk' clock. Also, add clk_pcmcdclk(0/1/2) clocks of type 'struct clk' clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 9e20614bb9403102033b60ce7d8fceb5becdb71c Author: Thomas Abraham Date: Mon May 17 09:38:57 2010 +0900 ARM: S5PV210: Add sclk_dac, sclk_mixer and sclk_hdmi clocks Add sclk_dac, sclk_mixer and sclk_hdmi clocks. These clocks are of type 'struct clksrc_clk' and so have a corresponding clock list. These clocks are also added to the list of clocks to be registered at boot time. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 2cf4c2e6301f19e08b7090c024b312f6e2c0f230 Author: Thomas Abraham Date: Mon May 17 09:38:55 2010 +0900 ARM: S5PV210: Add new system clocks This patch adds the following system clocks. 1. clk_sclk_hdmiphy 2. clk_sclk_usbphy0 3. clk_sclk_usbphy1 4. sclk_dmc (dram memory controller clock) 5. sclk_onenand Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit f445dbd5af7863dd7dce4685e39980419d4144eb Author: Thomas Abraham Date: Mon May 17 09:38:52 2010 +0900 ARM: S5PV210: Add support for VPLL This patch adds the following. 1. Adds 'clk_sclk_hdmi27m' clock to represent the HDMI 27MHz clock. 2. Adds 'clk_vpllsrc; clock of type clksrc_clk to represent the input clock for VPLL. 3. Adds 'clk_sclk_vpll' clock of type clksrc_clk to represent the output of the MUX_VPLL mux. 4. Add clk_sclk_hdmi27m, clk_vpllsrc and clk_sclk_vpll to the list of clocks to be registered. 5. Adds boot time print of 'clk_sclk_vpll' clock rate. 6. Adds 'clk_fout_vpll' clock to plat-s5p such that it is reusable on other s5p platforms. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit f44cf78b6b475116a4d3c98576f8697dd4ca7e79 Author: Thomas Abraham Date: Mon May 17 09:38:50 2010 +0900 ARM: S5PV210: Remove usage of clk_p66 and add clk_pclk_psys clock The clk_p83 clock, which is the PCLK clock for PSYS domain, is of type 'struct clk' whereas on S5PV210, this clock is suitable to be of type clksrc_clk clock (since it has a clock divider). So this patch replaces the 'struct clk' type clock to 'struct clksrc_clk' type clock for the PCLK PSYS clock. This patch modifies the following. 1. Removes definitions and usage of 'clk_p66' clock. 2. Adds 'clk_pclk_psys' clock which is of type 'struct clksrc_clk'. 3. Replaces all usage of clk_p66 with clk_pclk_psys clock. 4. Adds clk_pclk_psys into list of clocks to be registered. 5. Removes the sys_clks array since it is no longer required. Also the registration of clocks in sys_clks is also removed. 6. Remove the 'GET_DIV' as it is no longer required. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 58772cd34479ca50e90eea25288d2021dd2e6ff6 Author: Thomas Abraham Date: Mon May 17 09:38:48 2010 +0900 ARM: S5PV210: Remove usage of clk_p83 and add clk_pclk_dsys clock\ The clk_p83 clock, which is the PCLK clock for DSYS domain, is of type 'struct clk' whereas on S5PV210, this clock is suitable to be of type clksrc_clk clock (since it has a clock divider). So this patch replaces the 'struct clk' type clock to 'struct clksrc_clk' type clock for the PCLK DSYS clock. This patch modifies the following. 1. Remove definitions and usage of 'clk_p83' clock. 2. Adds 'clk_pclk_dsys' clock which is of type 'struct clksrc_clk'. 3. Replace all usage of clk_p83 with clk_pclk_dsys clock. 4. Adds clk_pclk_dsys into list of clocks to be registered. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 664f5b2065da188821fe5aa998c6351e8c042d98 Author: Thomas Abraham Date: Mon May 17 09:38:44 2010 +0900 ARM: S5PV210: Fix clk_get_rate issue with the clk_h100 clock The clk_h100 clock represents the IMEM clock for the MSYS domain. This clock rate of this clock is always half of the hclk_msys clock. There is an issue when getting the clock rate of the clk_h100 clock (clock get_rate hclk_h100 always returns clock rate that is equal to the hclk_msys clock rate). This patch modifies the following. 1. Moves the definition of the clk_h100 clock into the 'init_clocks' list with the appropriate parent, ctrlbit, enable and ops fields. 2. The name of the clock is changed from 'clk_h100' to 'hclk_imem' to represent more clearly that is represents the IMEM clock in the MSYS domain. 3. The function to get the clock rate of the hclk_imem clock is added. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 6ed91a202b3843d2fec51f00c31e65313ca00906 Author: Thomas Abraham Date: Mon May 17 09:38:42 2010 +0900 ARM: S5PV210: Remove usage of clk_p100 and add clk_pclk_msys clock The clk_p100 clock, which is the PCLK clock for MSYS domain, is of type 'struct clk' whereas on S5PV210, this clock is suitable to be of type clksrc_clk clock (since it has a choice of clock source and a pre-divider). So this patch replaces the 'struct clk' type clock to 'struct clksrc_clk' type clock for the PCLK MSYS clock. This patch modifies the following. 1. Remove definitions and usage of 'clk_p100' clock. 2. Adds 'clk_pclk_msys' clock which is of type 'struct clksrc_clk'. 3. Replace all usage of clk_p100 with clk_pclk_msys clock. 4. Adds clk_pclk_msys into list of clocks to be registered. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit acfa245fc7777bc1935c70a8951ff699952921c5 Author: Thomas Abraham Date: Mon May 17 09:38:40 2010 +0900 ARM: S5PV210: Remove usage of clk_h133 and add clk_hclk_psys clock The clk_h133 clock, which is the HCLK clock for PSYS domain, is of type 'struct clk' whereas on S5PV210, this clock is suitable to be of type clksrc_clk clock (since it has a choice of clock source and a pre-divider). So this patch replaces the 'struct clk' type clock to 'struct clksrc_clk' type clock for the HCLK PSYS clock. This patch modifies the following. 1. Remove definitions and usage of 'clk_h133' clock. 2. Adds 'clk_hclk_psys' clock which is of type 'struct clksrc_clk'. 3. Replace all usage of clk_h133 with clk_hclk_psys clock. 4. Adds clk_hclk_psys into list of clocks to be registered. 5. Removes the clock rate calculation of hclk133 and replaces it with code that derives the HCLK PSYS clock rate from the clk_hclk_psys clock. 6. Modify printing of the system clock rates. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 0fe967a1ca8845ac227d3cab51e3520ddb310932 Author: Thomas Abraham Date: Mon May 17 09:38:37 2010 +0900 ARM: S5PV210: Remove usage of clk_h166 and add clk_hclk_dsys clock The clk_h166 clock, which is the HCLK clock for DSYS domain, is of type 'struct clk' whereas on S5PV210, this clock is suitable to be of type clksrc_clk clock (since it has a choice of clock source and a pre-divider). So this patch replaces the 'struct clk' type clock to 'struct clksrc_clk' type clock for the HCLK DSYS clock. This patch modifies the following. 1. Remove definitions and usage of 'clk_h166' clock. 2. Adds 'clk_sclk_a2m' clock which is one of possible parent clock sources for the DSYS HCLK clock. 3. Adds 'clk_hclk_dsys' clock which is of type 'struct clksrc_clk'. 4. Replace all usage of clk_h166 with clk_hclk_dsys clock. 5. Adds clk_sclk_a2m and clk_hclk_dsys into list of clocks to be registered. 6. Removes the clock rate calculation of hclk166 and replaces it with code that derives the HCLK DSYS clock rate from the clk_hclk_dsys clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit af76a201c63fd7566bab8892f3b8c82e66a264d0 Author: Thomas Abraham Date: Mon May 17 09:38:34 2010 +0900 ARM: S5PV210: Remove usage of clk_h200 clock and add clk_hclk_msys clock The clk_h200 represents the HCLK for the MSYS domain. This clock is of type 'struct clk' but on V210, it is more suitable to be of type 'struct clksrc_clk' (since it is a divided version of the armclk). The replacement clock is renamed as clk_hclk_msys to indicate that it represents the HCLK for MSYS domain. This patch modifies the following. 1. Removes the usage of the clk_h200 clock. 2. Adds the new clock 'clk_hclk_msys'. 3. Adds clk_hclk_msys to the list of sysclks to be registered. 4. Modifies the hclk_msys clock rate calculation procedure to be based on the new clk_hclk_msys clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 374e0bf5f9e3b6055a943a838605e411b50c2838 Author: Thomas Abraham Date: Mon May 17 09:38:31 2010 +0900 ARM: S5PV210: Add armclk of clksrc_clk clock type This patch modifies the following. 1. Adds arm clock 'clk_armclk' of type clksrc_clk clock type. 2. Adds arm clock to the list of system clocks 'sysclks' for registering it along with other system clocks. 3. Modifies the armclk clock rate calculation procedure to be based on the new clk_armclk clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit c62ec6a9aaabd5d0512e9d091d82940efefa4fa6 Author: Thomas Abraham Date: Mon May 17 09:38:28 2010 +0900 ARM: S5PV210: Rearrange assignment of clock for fout apll/mpll/epll clocks The assignment of clock rates for fout apll/mpll/epll is moved further up in the s5pv210_setup_clocks function because the subsequent patches require the clock rate of fout clocks to be setup. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit eb1ef1ed06a168cf548419ba6e99f34c8169cffe Author: Thomas Abraham Date: Mon May 17 09:38:12 2010 +0900 ARM: S5PV210: Register apll/mpll/epll clksrc_clk clocks This patch modifies the following. 1. Registers the mout_apll clksrc_clk clock. 2. The mout_mpll and mout_epll clocks were registered as 'struct clk' types and then their parents were setup using the s3c_set_clksrc function. This patch reduces the two steps into one by registering the mout_mpll and mout_epll clocks using the s3c_register_clksrc function. 3. As per point 2 above, the init_parents array is no longer required. So the mout clocks are now put together in a new array named 'sysclks'. The sysclks array will list the system level clocks and more clocks will be added to it in the subsequent patches. 4. The clks array is left empty because of the movement of mpll and epll clocks into the sysclks array. It is not deleted since subsequent patches will add clocks into this array. Signed-off-by: Thomas Abraham samsung.com> Signed-off-by: Kukjin Kim samsung.com> Signed-off-by: Ben Dooks commit 59cda520881a1caf4332d6b03634c96fba361591 Author: Thomas Abraham Date: Mon May 17 09:38:01 2010 +0900 ARM: S5PV210: Rearrange the system clock definitions The system clock definitions are currently defined below the peripheral clock definitions in the V210 clock code. For the V210 clock updates that follow this patch, it is required that the system clock definitions such as the mout_apll and mout_mpll be defined prior to the device clock definitions. This patch re-arranges the system clock defintions for the clock updates that follow this patch. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 99df95a22f7cfcf85405d4edc07c2d953542f0dd Author: Frederic Weisbecker Date: Tue Apr 13 22:46:36 2010 +0200 sunrpc: Include missing smp_lock.h Now that cache_ioctl_procfs() calls the bkl explicitly, we need to include the relevant header as well. This fixes the following build error: net/sunrpc/cache.c: In function 'cache_ioctl_procfs': net/sunrpc/cache.c:1355: error: implicit declaration of function 'lock_kernel' net/sunrpc/cache.c:1359: error: implicit declaration of function 'unlock_kernel' Reported-by: Stephen Rothwell Signed-off-by: Frederic Weisbecker commit c2f980500a81006173daf3048284b28832858616 Author: Frederic Weisbecker Date: Tue Mar 30 07:32:50 2010 +0200 procfs: Kill the bkl in ioctl There are no more users of procfs that implement the ioctl callback. Drop the bkl from this path and warn on any use of this callback. Signed-off-by: Frederic Weisbecker Cc: Arnd Bergmann Cc: Thomas Gleixner Cc: Andrew Morton Cc: Ingo Molnar Cc: John Kacur Cc: KAMEZAWA Hiroyuki Cc: Al Viro commit d79b6f4de5db0103ceb4734e42ad101d836d61d9 Author: Frederic Weisbecker Date: Tue Mar 30 07:27:50 2010 +0200 procfs: Push down the bkl from ioctl Push down the bkl from procfs's ioctl main handler to its users. Only three procfs users implement an ioctl (non unlocked) handler. Turn them into unlocked_ioctl and push down the Devil inside. v2: PDE(inode)->data doesn't need to be under bkl v3: And don't forget to git-add the result v4: Use wrappers to pushdown instead of an invasive and error prone handlers surgery. Signed-off-by: Frederic Weisbecker Acked-by: Arnd Bergmann Cc: Thomas Gleixner Cc: Andrew Morton Cc: Ingo Molnar Cc: John Kacur Cc: KAMEZAWA Hiroyuki Cc: Al Viro Cc: Alexey Dobriyan commit a9a4ab747e2d45bf08fddbc1568f080091486af9 Author: Arnaldo Carvalho de Melo Date: Sun May 16 21:04:27 2010 -0300 perf tui: Add help window to show key associations Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a308f3a868185d4f804fe71d0400e2b058c6d9af Author: Arnaldo Carvalho de Melo Date: Sun May 16 20:29:38 2010 -0300 perf tui: Make <- exit menus too In fact it is now added to the hot key list when newt_form__new is used, allowing us to remove the explicit assignment in all its users. The visible change is that <- will exit the menu that pops up when -> is pressed (and Enter when callchains are not being used). Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c80901f2755c582e3096e6708028a8daca59e6e2 Author: Tetsuo Handa Date: Fri May 14 12:01:26 2010 +0900 LSM: Add __init to fixup function. register_security() became __init function. So do verify() and security_fixup_ops(). Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 7762fbfffdbce8191f5236d5053b290035d3d749 Author: Tetsuo Handa Date: Mon May 10 17:30:26 2010 +0900 TOMOYO: Add pathname grouping support. This patch adds pathname grouping support, which is useful for grouping pathnames that cannot be represented using /\{dir\}/ pattern. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit ba0c1709f4946a5ca1a678f4318ed72c0d409b3c Author: Mimi Zohar Date: Tue May 4 18:16:30 2010 -0400 ima: remove ACPI dependency The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI. This patch prereq's 'TPM: ACPI/PNP dependency removal' http://lkml.org/lkml/2010/5/4/378. Signed-off-by: Mimi Zohar Reported-by: Jean-Christophe Dubois Acked-by: Serge Hallyn Tested-by: Serge Hallyn Signed-off-by: James Morris commit 7f2ab000c6f2ae46070807a3bf645c45d8639460 Author: Rajiv Andrade Date: Thu May 13 17:37:54 2010 -0300 TPM: ACPI/PNP dependency removal This patch pushes the ACPI dependency into the device driver code itself. Now, even without ACPI/PNP enabled, the device can be registered using the TIS specified memory space. This will however result in the lack of access to the BIOS event log, being the only implication of such ACPI removal. Signed-off-by: Rajiv Andrade Acked-by: Mimi Zohar Signed-off-by: James Morris commit b3139bbc52762268769e7af842aade0e64372433 Author: Julia Lawall Date: Fri May 14 21:30:30 2010 +0200 security/selinux/ss: Use kstrdup Use kstrdup when the goal of an allocation is copy a string into the allocated region. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to; expression flag,E1,E2; statement S; @@ - to = kmalloc(strlen(from) + 1,flag); + to = kstrdup(from, flag); ... when != \(from = E1 \| to = E1 \) if (to==NULL || ...) S ... when != \(from = E2 \| to = E2 \) - strcpy(to, from); // Signed-off-by: Julia Lawall Acked-by: Eric Paris Signed-off-by: James Morris commit 25f3a5a2854dce8b8413fd24cc9d5b9e3632be54 Author: Mark Gross Date: Mon May 17 00:21:03 2010 +0200 PM: PM QOS update fix This update handles a use case where pm_qos update requests need to silently fail if the update is being sent to a handle that is NULL. The problem was that the original pm_qos silently fails when a request update is passed to a parameter that has not been added to the list yet. This update restores that behavior. Signed-off-by: markgross Signed-off-by: Rafael J. Wysocki commit c4949f074332a64baeb2ead6ab9319ca37642f96 Author: Frank Blaschka Date: Tue May 11 19:34:47 2010 +0000 qeth: synchronize configuration interface Synchronize access to the drivers configuration interface. Also do not allow configuration changes during online/offline transition. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 65a1f898efac136aeea65509e61ac6cdecd4f6bf Author: Ursula Braun Date: Tue May 11 19:34:46 2010 +0000 qeth: new message if OLM limit is reached z/OS may activate Optimized Latency Mode (OLM) for a connection through an OSA Express3 adapter, which reduces the number of allowed concurrent connections, if adapter is used in shared mode. Create a meaningful message, if activation of an OSA-connection fails due to an active OLM-connection on the shared OSA-adapter. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit f6b85b6c42ccc20316a25f6ccbe7a984c5a1304d Author: Frank Blaschka Date: Tue May 11 19:34:45 2010 +0000 qeth: exploit HW TX checksumming OSA supports HW TX checksumming in layer 3 mode. Enable this feature and remove software fallback used for TSO. Cleanup checksum bits to indicate OSA can do checksumming only for IPv4 TCP and UDP. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd Author: Eric Dumazet Date: Mon May 10 04:51:02 2010 +0000 net: congestion notifications are not dropped packets vlan/macvlan start_xmit() can inform caller of congestion with NET_XMIT_CN return value. This doesnt mean packet was dropped. Increment normal stat counters instead of tx_dropped. Signed-off-by: Eric Dumazet Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit a465419b1febb603821f924805529cff89cafeed Author: Eric Dumazet Date: Sun May 16 00:36:33 2010 -0700 net: Introduce sk_route_nocaps TCP-MD5 sessions have intermittent failures, when route cache is invalidated. ip_queue_xmit() has to find a new route, calls sk_setup_caps(sk, &rt->u.dst), destroying the sk->sk_route_caps &= ~NETIF_F_GSO_MASK that MD5 desperately try to make all over its way (from tcp_transmit_skb() for example) So we send few bad packets, and everything is fine when tcp_transmit_skb() is called again for this socket. Since ip_queue_xmit() is at a lower level than TCP-MD5, I chose to use a socket field, sk_route_nocaps, containing bits to mask on sk_route_caps. Reported-by: Bhaskar Dutta Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 3b098e2d7c693796cc4dffb07caa249fc0f70771 Author: Eric Dumazet Date: Sat May 15 23:57:10 2010 -0700 net: Consistent skb timestamping With RPS inclusion, skb timestamping is not consistent in RX path. If netif_receive_skb() is used, its deferred after RPS dispatch. If netif_rx() is used, its done before RPS dispatch. This can give strange tcpdump timestamps results. I think timestamping should be done as soon as possible in the receive path, to get meaningful values (ie timestamps taken at the time packet was delivered by NIC driver to our stack), even if NAPI already can defer timestamping a bit (RPS can help to reduce the gap) Tom Herbert prefer to sample timestamps after RPS dispatch. In case sampling is expensive (HPET/acpi_pm on x86), this makes sense. Let admins switch from one mode to another, using a new sysctl, /proc/sys/net/core/netdev_tstamp_prequeue Its default value (1), means timestamps are taken as soon as possible, before backlog queueing, giving accurate timestamps. Setting a 0 value permits to sample timestamps when processing backlog, after RPS dispatch, to lower the load of the pre-RPS cpu. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a1aa3483041bd3691c7f029272ccef4ce70bd957 Author: Timo Teras Date: Sat May 15 23:49:26 2010 -0700 xfrm: fix policy unreferencing on larval drop I mistakenly had the error path to use num_pols to decide how many policies we need to drop (cruft from earlier patch set version which did not handle socket policies right). This is wrong since normally we do not keep explicit references (instead we hold reference to the cache entry which holds references to policies). drop_pols is set to num_pols if we are holding the references, so use that. Otherwise we eventually BUG_ON inside xfrm_policy_destroy due to premature policy deletion. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit a14462f1bd4d3962994f518459102000438665aa Author: Jiri Pirko Date: Thu May 6 01:33:53 2010 +0000 net: adjust handle_macvlan to pass port struct to hook Now there's null check here and also again in the hook. Looking at bridge bits which are simmilar, port structure is rcu_dereferenced right away in handle_bridge and passed to hook. Looks nicer. Signed-off-by: Jiri Pirko Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 10fc51b9953112ade61e33ff2f6f005f005a2361 Author: FUJITA Tomonori Date: Tue Apr 27 14:57:04 2010 +0000 skge: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit e3826f1e946e7d2354943232f1457be1455a29e2 Author: Amerigo Wang Date: Wed May 5 00:27:06 2010 +0000 net: reserve ports for applications using fixed port numbers (Dropped the infiniband part, because Tetsuo modified the related code, I will send a separate patch for it once this is accepted.) This patch introduces /proc/sys/net/ipv4/ip_local_reserved_ports which allows users to reserve ports for third-party applications. The reserved ports will not be used by automatic port assignments (e.g. when calling connect() or bind() with port number 0). Explicit port allocation behavior is unchanged. Signed-off-by: Octavian Purdila Signed-off-by: WANG Cong Cc: Neil Horman Cc: Eric Dumazet Cc: Eric W. Biederman Signed-off-by: David S. Miller commit 9f977fb7ae9ddf565b4800854212fb9a1ed6c2ea Author: Octavian Purdila Date: Wed May 5 00:26:55 2010 +0000 sysctl: add proc_do_large_bitmap The new function can be used to read/write large bitmaps via /proc. A comma separated range format is used for compact output and input (e.g. 1,3-4,10-10). Writing into the file will first reset the bitmap then update it based on the given input. Signed-off-by: Octavian Purdila Signed-off-by: WANG Cong Cc: Eric W. Biederman Signed-off-by: David S. Miller commit 00b7c3395aec3df43de5bd02a3c5a099ca51169f Author: Amerigo Wang Date: Wed May 5 00:26:45 2010 +0000 sysctl: refactor integer handling proc code (Based on Octavian's work, and I modified a lot.) As we are about to add another integer handling proc function a little bit of cleanup is in order: add a few helper functions to improve code readability and decrease code duplication. In the process a bug is also fixed: if the user specifies a number with more then 20 digits it will be interpreted as two integers (e.g. 10000...13 will be interpreted as 100.... and 13). Behavior for EFAULT handling was changed as well. Previous to this patch, when an EFAULT error occurred in the middle of a write operation, although some of the elements were set, that was not acknowledged to the user (by shorting the write and returning the number of bytes accepted). EFAULT is now treated just like any other errors by acknowledging the amount of bytes accepted. Signed-off-by: Octavian Purdila Signed-off-by: WANG Cong Cc: Eric W. Biederman Signed-off-by: David S. Miller commit 1cdc5abf40c561982d2f7b06bcff17f9496309a5 Merge: e0f4375 0fb0a4f Author: David S. Miller Date: Sat May 15 23:14:16 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax commit e0f43752a942b7be1bc06b9fd74e20ae337c1cca Author: Simon Arlott Date: Mon May 10 09:31:11 2010 +0000 bridge: update sysfs link names if port device names have changed Links for each port are created in sysfs using the device name, but this could be changed after being added to the bridge. As well as being unable to remove interfaces after this occurs (because userspace tools don't recognise the new name, and the kernel won't recognise the old name), adding another interface with the old name to the bridge will cause an error trying to create the sysfs link. This fixes the problem by listening for NETDEV_CHANGENAME notifications and renaming the link. https://bugzilla.kernel.org/show_bug.cgi?id=12743 Signed-off-by: Simon Arlott Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 28a16c97963d3bc36a2c192859f6d8025ef2967a Author: stephen hemminger Date: Mon May 10 09:31:09 2010 +0000 bridge: change console message interface Use one set of macro's for all bridge messages. Note: can't use netdev_XXX macro's because bridge is purely virtual and has no device parent. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit cfb478da70f2213520866c84cb0aea0d7c0e1148 Author: stephen hemminger Date: Mon May 10 09:31:08 2010 +0000 bridge: netpoll cleanup Move code around so that the ifdef for NETPOLL_CONTROLLER don't have to show up in main code path. The control functions should be in helpers that are only compiled if needed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c17b274dc2aa538b68c1f02b01a3c4e124b435ba Author: Ben Hutchings Date: Sat May 15 23:03:29 2010 -0700 rndis_host: Poll status channel before control channel Some RNDIS devices don't respond on the control channel until polled on the status channel. In particular, this was reported to be the case for the 2Wire HomePortal 1000SW. This is roughly based on a patch by John Carr which is reported to be needed for use with some Windows Mobile devices and which is currently applied by Mandriva. Reported-by: Mark Glassberg Signed-off-by: Ben Hutchings Tested-by: Mark Glassberg Signed-off-by: David S. Miller commit ffebedb7ab3f7964a70a1771547b26af38a189d2 Merge: e749444 bc1db9a 5d7220e 617c9a7 be4c9ba d414371 9fda1ac 6fa8f71 9893e74 3a2baff 53978b4 Author: Roland Dreier Date: Sat May 15 20:06:01 2010 -0700 Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', 'masked-atomics', 'misc', 'mthca' and 'nes' into for-next commit 9893e742a0d942dda2277e9f3e19b726900adf27 Author: Julia Lawall Date: Sat May 15 23:22:38 2010 +0200 IB/core: Use kmemdup() instead of kmalloc()+memcpy() Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // Signed-off-by: Julia Lawall Signed-off-by: Roland Dreier commit 9d192e118a094087494997ea1c8a2faf39af38c5 Author: Arnaldo Carvalho de Melo Date: Sat May 15 21:15:01 2010 -0300 perf newt: Add single key shortcuts for zoom into DSO and threads 'D'/'d' for zooming into the DSO in the current highlighted hist entry, 'T'/'t' for zooming into the current thread. Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 29351db6a05e7e42be457569428425520a18beec Author: Arnaldo Carvalho de Melo Date: Sat May 15 21:06:58 2010 -0300 perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed ESC still asks for confirmation. Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c1ec5fefd9cd9ccb020966a49a3c7f44b25d9e84 Author: Arnaldo Carvalho de Melo Date: Sat May 15 20:45:31 2010 -0300 perf newt: Fix the 'A'/'a' shortcut for annotate Reported-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 605539034f208d365f76af8e2152cb25f702367d Author: Arnaldo Carvalho de Melo Date: Sat May 15 20:40:34 2010 -0300 perf newt: Make <- exit the ui_browser Right now that means that pressing the left arrow willl make the symbol annotation window to exit back to the main symbol histogram browser. This is another improvement on the UI fastpath, i.e. just the arrows and enter are enough for most browsing. Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8c0b742ca7a7d21de0ddc87eda6ef0b282e4de18 Author: Kirill A. Shutemov Date: Sat May 15 09:57:06 2010 +0100 ARM: 6134/1: Handle instruction cache maintenance fault properly Between "clean D line..." and "invalidate I line" operations in v7_coherent_user_range(), the memory page may get swapped out. And the fault on "invalidate I line" could not be properly handled causing the oops. In ARMv6 "external abort on linefetch" replaced by "instruction cache maintenance fault". Let's handle it as translation fault. It fixes the issue. I'm not sure if it's reasonable to check arch version in run-time. Let's do it in compile time for now. Reviewed-by: Catalin Marinas Signed-off-by: Siarhei Siamashka Signed-off-by: Kirill A. Shutemov Signed-off-by: Russell King commit 49aea0fd95495538230e19f58e217fb06ffdbfeb Author: Russell King Date: Sat May 15 10:40:21 2010 +0100 ARM: nwfpe: allow debugging output to be configured at runtime Enabling CONFIG_USER_DEBUG allows NWFPE to complain about every FP exception, which with some programs can cause the kernel message log to fill with NWFPE debug, swamping out other messages. This change allows NWFPE debugging to be configured at run time. Signed-off-by: Russell King commit 8e2a43f5f5e1255879064924917fb1a6e5be7cb3 Author: Russell King Date: Sat May 15 10:18:05 2010 +0100 ARM: rename mach_cpu_disable() to platform_cpu_disable() Consistently name all SMP platform related functions. Signed-off-by: Russell King commit 75070612c49c0bb976bb9221d051b20316ad1bc7 Author: Jassi Brar Date: Fri May 14 15:18:54 2010 +0100 ARM: 6132/1: PL330: Add common core driver PL330 is a configurable DMA controller PrimeCell device. The register map of the device is well defined. The configuration of a particular implementation can be read from the six configuration registers CR0-4,Dn. This patch implements a driver for the specification:- http://infocenter.arm.com/help/topic/com.arm.doc.ddi0424a/DDI0424A_dmac_pl330_r0p0_trm.pdf The exported interface should be sufficient to implement a driver for any DMA API. Signed-off-by: Jassi Brar Signed-off-by: Russell King commit 64039be8226b9f6c80c704d94ac9891eee4a274c Author: Jason McMullan Date: Wed May 5 18:59:37 2010 +0100 ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310 The L310 cache controller's interface is almost identical to the L210. One major difference is that the PL310 can have up to 16 ways. This change uses the cache's part ID and the Associativity bits in the AUX_CTRL register to determine the number of ways. Also, this version prints out the CACHE_ID and AUX_CTRL registers. Acked-by: Will Deacon Acked-by: Acked-by: Catalin Marinas Signed-off-by: Jason S. McMullan Signed-off-by: Russell King commit a2227120eead4ea7d2ea04d8ce0947f1dd23dedf Author: Russell King Date: Thu Mar 25 18:56:05 2010 +0000 ARM: Move memory mapping into mmu.c Acked-by: Tony Lindgren Signed-off-by: Russell King commit ceb683d3bc36f213aeef0c5d79e6fbb1e16bd459 Author: Russell King Date: Thu Mar 25 18:47:20 2010 +0000 ARM: Ensure meminfo is sorted prior to sanity_check_meminfo Acked-by: Tony Lindgren Signed-off-by: Russell King commit 6262c92f51ffb074800d5a340ee16bc06758e037 Author: Russell King Date: Thu Mar 25 17:06:19 2010 +0000 ARM: Remove useless linux/bootmem.h includes These files include linux/bootmem.h without using anything from this file; remove the unnecessary include. Acked-by: Tony Lindgren Signed-off-by: Russell King commit b7072c63c1b0611042ba6ecf0152a33c7b806e67 Author: Alexey Dobriyan Date: Sun May 2 12:40:35 2010 +0300 ARM: convert /proc/cpu/aligment to seq_file Convert code away from ->read_proc/->write_proc interfaces. Switch to proc_create()/proc_create_data() which makes addition of proc entries reliable wrt NULL ->proc_fops, NULL ->data and so on. Problem with ->read_proc et al is described here commit 786d7e1612f0b0adb6046f19b906609e4fe8b1ba "Fix rmmod/read/write races in /proc entries" This patch is part of an effort to remove the old simple procfs PAGE_SIZE buffer interface. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 4d736b5e1cffb716bfbad669ce6aedf454779373 Author: FUJITA Tomonori Date: Sun Apr 4 23:25:52 2010 +0900 arm: use asm-generic/scatterlist.h Signed-off-by: FUJITA Tomonori Signed-off-by: Russell King commit 7ebaa2838a751125c113072486334d7b4e63f9ad Merge: 1ff3d7d 3e1bbdc3 Author: Ingo Molnar Date: Sat May 15 08:39:09 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 1ff3d7d79204612ebe2e611d2592f8898908ca00 Author: Cyrill Gorcunov Date: Fri May 14 23:08:15 2010 +0400 x86, perf: P4 PMU - fix counters management logic Jaswinder reported this #GP: | | Message from syslogd@ht at May 14 09:39:32 ... | kernel:[ 314.908612] EIP: [] | x86_perf_event_set_period+0x19d/0x1b2 SS:ESP 0068:edac3d70 | Ming has narrowed it down to a comparision issue between arguments with different sizes and signs. As result event index reached a wrong value which in turn led to a GP fault. At the same time it was found that p4_next_cntr has broken logic and should return the counter index only if it was not yet borrowed for another event. Reported-by: Jaswinder Singh Rajput Reported-by: Lin Ming Bisected-by: Lin Ming Tested-by: Jaswinder Singh Rajput Signed-off-by: Cyrill Gorcunov CC: Peter Zijlstra CC: Frederic Weisbecker LKML-Reference: <20100514190815.GG13509@lenovo> Signed-off-by: Ingo Molnar commit c7a8209f766961eea4cfc6f22d2d6e06ef63546c Author: Tejun Heo Date: Mon May 10 21:41:29 2010 +0200 libata-sff: kill unused prototype and make ata_dev_select() static ata_irq_on() was renamed to ata_sff_irq_on() and exported a while ago but prototype for the original function lingered in drivers/ata/libata.h. Kill it. Also, ata_dev_select() is only used inside drivers/ata/libata-sff.c. Make it static. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2a7adff09ac3dd3d1facaf92b4a8cc1b92d370b6 Author: Tejun Heo Date: Mon May 10 21:41:28 2010 +0200 libata-sff: update bmdma host bus error handling * Clearing IRQ from ata_sff_error_handler() is necessary only when the port is gonna be thawed before performing EH actions and some controllers don't like being accessed after certain failure modes until they're reset. Clear IRQ iff the port is being thawed. * When the controller succesfully indicated bus error, the point of thawing doesn't matter. Move thawing inside bmdma part of EH. This is a bit ugly but will ease code reorganization later. * Remove the unneeded ata_sff_sync(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1b959c412bbf38ce0fa658183f72027ca8331ee3 Author: Tejun Heo Date: Mon May 10 21:41:27 2010 +0200 sata_mv: remove unnecessary initialization sata_mv initializes unused ioports fields including bmdma_addr to NULL. As later changes will conditionalize BMDMA, this makes sata_mv unnecessarily dependent on BMDMA. Remove the unnecessary initialization. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 6f79146041853abf551c3d70d05c2e08e1e9c255 Author: Tejun Heo Date: Mon May 10 21:41:26 2010 +0200 sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF sata_inic162x no longer uses SFF interface. Move it out of CONFIG_ATA_SFF. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 904924b020c794133607536b346aae268584d0af Author: Tejun Heo Date: Mon May 10 21:41:25 2010 +0200 pata_sch: use ata_pci_sff_init_one() pata_sch is standard SFF. No reason to open code init. Use ata_pci_sff_init_one() instead. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c4acf99bdebb84b21cf2d12521f990bbfe5d5500 Author: Alan Cox Date: Wed May 5 10:25:58 2010 +0100 pata_sil680: Do our own exec_command posting Use our own mmio area to avoid PCI posting. This avoids the rather slow paranoid implementation in the default handler. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 978c066691a49a205673672a55685305663a2554 Author: Alan Cox Date: Wed May 5 10:24:57 2010 +0100 libata: Remove excess delay in the tf_load path We don't need to stall and wait after loading the task file and before issuing a command, so don't do it. This shows up on profiles and is not needed. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 95cc2c70c139936a2142bcd583da8af6f9d88efb Author: Tejun Heo Date: Fri May 14 11:48:50 2010 +0200 sata_nv: use ata_pci_sff_activate_host() instead of ata_host_activate() sata_nv was incorrectly using ata_host_activate() instead of ata_pci_sff_activate_host() leading to IRQ assignment failure in legacy mode. Fix it. Signed-off-by: Tejun Heo Cc: Robert Hancock Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit 3e1bbdc3a721f4b1ed44f4554402a8dbc60fa97f Author: Arnaldo Carvalho de Melo Date: Fri May 14 20:05:21 2010 -0300 perf newt: Make <- zoom out filters After we use the filters to zoom into DSOs or threads, we can use <- (left arrow) to zoom out from the last filter applied. It is still possible to zoom out of order by using the popup menu. With this we now have the zoom out operation on the browsing fast path, by allowing fast navigation using just the four arrors and the enter key to expand collapse callchains. Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 15ddb4aec54422ead137b03ea4e9b3f5db3f7cc2 Author: Pavel Emelyanov Date: Fri May 14 15:33:36 2010 +0400 NFSD: don't report compiled-out versions as present The /proc/fs/nfsd/versions file calls nfsd_vers() to check whether the particular nfsd version is present/available. The problem is that once I turn off e.g. NFSD-V4 this call returns -1 which is true from the callers POV which is wrong. The proposal is to report false in that case. The bug has existed since 6658d3a7bbfd1768 "[PATCH] knfsd: remove nfsd_versbits as intermediate storage for desired versions". Signed-off-by: Pavel Emelyanov Cc: stable@kernel.org Acked-by: NeilBrown Signed-off-by: J. Bruce Fields commit 3842e835490cdf17013b30a788f6311bdcfd0571 Author: Sebastian Andrzej Siewior Date: Sun Mar 21 22:52:23 2010 +0100 libata: don't flush dcache on slab pages page_mapping() check this via VM_BUG_ON(PageSlab(page)) so we bug here with the according debuging turned on. Future TODO: replace this with a flush_dcache_page_for_pio() API Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Jeff Garzik Cc: stable@kernel.org commit 276a47a93dbfe5d35261451925020f65cdbfcce8 Author: Sergei Shtylyov Date: Sat May 8 22:27:18 2010 +0400 pata_cmd640: don't read CFR pointlessly cmd640_hardware_init() reads CFR but doesn't use the value read... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit e42a542ba9cca594897176020445023c54d903d6 Author: Sergei Shtylyov Date: Fri May 7 22:49:02 2010 +0400 libata: make sff_irq_on() method optional Now, with the introduction of the sff_set_devctl() method, we can use it in sff_irq_on() method too -- that way its implementations in 'pata_bf54x' and 'pata_scc' become virtually identical to ata_sff_irq_on(). The sff_irq_on() method now becomes quite superfluous, and the only reason not to remove it completely is the existence of the 'pata_octeon_cf' driver which implements it as an empty function. Just make the method optional then, with ata_sff_irq_on() becoming generic taskfile-bound function, still global for the 'pata_bf54x' driver to be able to call it from its thaw() and postreset() methods. While at it, make the sff_irq_on() method and ata_sff_irq_on() return 'void' as the result is always ignored anyway. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 41dec29bcb05eb8ec396f70ce791c6e3e4ce4712 Author: Sergei Shtylyov Date: Fri May 7 22:47:50 2010 +0400 libata: introduce sff_set_devctl() method The set of libata's taskfile access methods is clearly incomplete as it lacks a method to write to the device control register -- which forces drivers like 'pata_bf54x' and 'pata_scc' to implement more "high level" (and more weighty) methods like freeze() and postreset(). So, introduce the optional sff_set_devctl() method which the drivers only have to implement if the standard iowrite8() can't be used (just like the existing sff_check_altstatus() method) and make use of it in the freeze() and postreset() method implementations (I could also have used it in softreset() method but it also reads other taskfile registers without using tf_read() making that quite pointless); this makes freeze() method implementations in the 'pata_bf54x' and 'pata_scc' methods virtually identical to ata_sff_freeze(), so we can get rid of them completely. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 55787183ade44c4f826f581a068f52a1a80c6a2e Author: Jeff Garzik Date: Fri May 14 17:23:37 2010 -0400 ahci_platform: properly set up EM messaging Signed-off-by: Jeff Garzik commit c06231661e4fb5f2f50c73ff33702937a11764cf Author: Harry Zhang Date: Fri Apr 23 17:28:38 2010 +0800 ahci: add "em_buffer" attribute for AHCI hosts Add "em_buffer" attribute for SATA AHCI hosts to provide a way for userland to access AHCI EM (enclosure management) buffer directly if the host supports EM. AHCI driver should support SGPIO EM messages. However the SATA/AHCI specs did not define the SGPIO message format filled in EM buffer. Different HW vendors may have different definitions. The mainly purpose of this attribute is to solve this issue by allowing HW vendors to provide userland drivers and tools for their SGPIO initiators. Signed-off-by: Harry Zhang Signed-off-by: Jeff Garzik commit 008dbd61ebee3e647f63bbe8315192e1331cd75f Author: Harry Zhang Date: Fri Apr 23 17:27:19 2010 +0800 ahci: EM message type auto detect Detect enclosure management message type automatically at driver initialization, instead of using module parameter "ahci_em_messages". Signed-off-by: Harry Zhang Signed-off-by: Jeff Garzik commit ec86c81dfcc52e313920621b1d1e92343a842afe Author: Sergei Shtylyov Date: Sat Apr 24 20:29:58 2010 +0400 pata_scc: kill useless check in scc_postreset() The device control register exists and its address is set by scc_setup_ports(), hence the check is useless... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit fe6005b81e142c36f066b81ca85f80022c4ac979 Author: Sergei Shtylyov Date: Sat Apr 24 20:29:45 2010 +0400 pata_scc: make scc_wait_after_reset() static ... since, of course, it's not used outside this driver. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 9990b6f32b5d35e76b4c2a0dd9469f96350c4d9d Author: Akinobu Mita Date: Mon Apr 12 21:11:41 2010 +0900 libata: use __ratelimit Use __ratelimit() instead of its own private rate limit implementation. Signed-off-by: Akinobu Mita Cc: Jeff Garzik Cc: linux-ide@vger.kernel.org Signed-off-by: Jeff Garzik commit b48d58f55aa1d2d0d12378e45663842d4021916e Author: Tejun Heo Date: Fri Apr 9 19:46:38 2010 +0900 libata: use longer 0xff wait if parallel scan is enabled There are some SATA devices which take relatively long to get out of 0xff status after reset. In libata, this timeout is determined by ATA_TMOUT_FF_WAIT. Quantum GoVault is the worst requring about 2s for reliable detection. However, because 2s 0xff timeout can introduce rather long spurious delay during boot, libata has been compromising at the next longest timeout of 800ms for HHD424020F7SV00 iVDR drive. Now that parallel scan is in place for common drivers, libata can afford 2s 0xff timeout. Use 2s 0xff timeout if parallel scan is enabled. Please note that the chance of spurious wait is pretty slim w/ working SCR access so this will only affect SATA controllers w/o SCR access which isn't too common these days. Please read the following thread for more information on the GoVault drive. http://thread.gmane.org/gmane.linux.ide/14545/focus=14663 Signed-off-by: Tejun Heo Cc: Gary Hade Signed-off-by: Jeff Garzik commit 294440887b32c58d220fb54b73b7a58079b78f20 Author: Sergei Shtylyov Date: Thu Apr 22 20:03:35 2010 +0400 libata-sff: kill unused ata_bus_reset() ... since I see no callers of it. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 4f2c774856708bccecb74c0e6296e9e2c9136ee1 Author: Grant Grundler Date: Wed Apr 14 18:43:32 2010 -0700 [libata] Disable R_OK (Early ACK) on SII 3726 PMP In 2009, While running "cache read" performance test of drives behind SII PMP we encountered a "all 5 drives" timeout on more than 30% of the machines under test. This patch reduces the rate by a factor of about 70. Low enough that we didn't care to further investigate the issue. Performance impact with any sort of "normal" use was ~2%+ CPU and less than 1% throughput degradation. Worst case impact (cached read) was 6% IOPS reduction. This is with NCQ off (q=1) but I believe FIS based switching enabled in the SATA driver. The patch disables "Early ACK" in the 3726 port multiplier. "Early ACK" is issued when device sends a FIS to the host (via PMP) and the PMP sends an ACK immediately back to the device - well before the host gets the response. Under worst case IOPs load (cached read test) and more than 2 PMPs connected to a 4-port SATA controller, I suspect the time to service all of the PMPs is exceeding the PMPs ability to keep track of outstanding FIS it owes the Host. Reducing the number of PMPs to 2 (or 1) reduces the frequency by several orders of magnitude. Kudos to Gwendal for initial debugging of this issue. [Any errors in the description are mine, not his.] Patch is currently in production on Google servers. Signed-off-by: Grant Grundler Signed-off-by: Gwendal Grignou Acked-by: Tejun Heo Signed-off-by: Jeff Garzik commit fbaf666b854c04b2d8ebca17114ee409ddea08b5 Author: Tejun Heo Date: Tue Mar 30 02:52:43 2010 +0900 libata: 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 Cc: Stephen Rothwell Cc: Jeff Garzik Signed-off-by: Jeff Garzik commit 83f2b9630c5875ee872c11d98a0e26888514c1b3 Author: Tejun Heo Date: Tue Mar 30 10:28:32 2010 +0900 ahci: implement AHCI_HFLAG_NO_FPDMA_AA and update NV quirks It turns out different generations of MCPs have differing quirks. * MCP 65-73 : FPDMA AA broken, lies about PMP support, forgets to report NCQ * MCP 77-79 : FPDMA AA broken, lies about PMP support * MCP 89 : FPDMA AA broken Instead of turngin off FPDMA AA on all NVIDIAs, implement HFLAG_NO_FPDMA_AA, define additional board IDs and apply necessary quirks. This fixes bko#15481 and the list of quirks is verified by Peer Chen. http://bugzilla.kernel.org/show_bug.cgi?id=15481 Signed-off-by: Tejun Heo Cc: Peer Chen Signed-off-by: Jeff Garzik commit ec569af8584e977a3474c197da53ae2ba5823caf Author: Roman Fietze Date: Fri Mar 5 08:27:39 2010 +0100 pata_mpc52xx: reduce code size by simple change of constant data types I've prepared a totally simple patch that, if I did it and measured it correctly, reduces the text size as of the ppc-6xx-size command of pata-mpc52xx by more than 10%, by reducing the rodata size from 0x4a4 to 0x17e bytes. This is simply done by changing the data types of the ATA timing constants. If you are interested at all, and it's worth the trouble, here the details: ppc-6xx-size: text data bss dec hex filename old: 6532 1068 0 7600 1db0 pata-mpc52xx.o new: 5718 1068 0 6786 1a82 pata-mpc52xx.o The (assembler) code itself doesn't really change very much. I double checked the final results inside mpc52xx-ata-apply-timings() and they match. The driver is still working fine of course. Signed-off-by: Roman Fietze Signed-off-by: Jeff Garzik commit 441577efa0dc9ae40fb72c602896fc76a87c0a3a Author: Tejun Heo Date: Mon Mar 29 10:32:39 2010 +0900 ahci: clean up board IDs ahci over time has grown a number of board IDs and it's a bit of mess right now. Clean it up such that, * board_id_* now live in a separate enum board_ids and numbers are assigned automatically. * Board IDs assigned to features are separated from the ones assigned to specific implementations and both are ordered alphabetically. * For NV MCPs, define per-generation alias board_ids and assign matching aliases in the pci id table. This makes mcp_linux, 67-73 use board_ahci_mcp65 instead of board_ahci_yesncq. Both are identical in content. * Kill now unused board_ahci_nopmp and board_ahci_yesncq. This patch doesn't cause any functional change but will make future changes to board_ids and quirks much less painful. Signed-off-by: Tejun Heo Cc: Peer Chen Signed-off-by: Jeff Garzik commit 96d60303fd3336893a93565d58c4f1805a327061 Author: Matthew Garrett Date: Sun Mar 28 00:37:21 2010 -0400 ahci: Turn off DMA engines when there's no device attached According to section 10.3.1 of the AHCI spec, PxCMD.ST must not be set unless there's a device attached. Following this saves us a measurable quantity of power and does not impair hotplug support. Based on a patch by Kristen Carlson Accardi. Signed-off-by: Matthew Garrett Cc: Kristen Carlson Accardi Signed-off-by: Jeff Garzik commit 1c2a49f61785ebbcbfb481a2aab659020f0457f7 Author: Anton Vorontsov Date: Thu Mar 4 20:06:06 2010 +0300 ahci: Add platform driver This can be used for AHCI-compatible interfaces implemented inside System-On-Chip solutions, or AHCI devices connected via localbus. Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 365cfa1ed5a36f9bcb9f64c9f0f52155af2e9fef Author: Anton Vorontsov Date: Sun Mar 28 00:22:14 2010 -0400 ahci: Move generic code into libahci This patch should contain no functional changes, just moves code around. Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 0cbb0e774b0ea0547ec1b9e795637e309327ae27 Author: Anton Vorontsov Date: Wed Mar 3 20:17:45 2010 +0300 ahci: Introduce ahci_set_em_messages() Factor out some ahci_em_messages handling code from ahci_init_one(). We would like to reuse it for non-PCI devices. Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 439fcaec10cef14a08557623d6f5fa240aaf3e2b Author: Anton Vorontsov Date: Wed Mar 3 20:17:43 2010 +0300 ahci: Factor out PCI specifics from ahci_print_info() Introduce ahci_pci_print_info() that now handles PCI stuff. Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 781d655083f8fb0a343bb694e83b96f04e934b4f Author: Anton Vorontsov Date: Wed Mar 3 20:17:42 2010 +0300 ahci: Factor out PCI specifics from ahci_init_controller() Move PCI stuff into ahci_pci_init_controller(). Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 97cfbfe60018ffa9198cf78848a9abc4b8d316cc Author: Anton Vorontsov Date: Wed Mar 3 20:17:40 2010 +0300 ahci: Get rid of pci_dev argument in ahci_port_init() To make the function bus-independand we have to get rid of "struct pci_dev *", so let's pass just "struct devce *". Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 3303040d8ba2dc0090ff172627df44d284c893e7 Author: Anton Vorontsov Date: Wed Mar 3 20:17:39 2010 +0300 ahci: Factor out PCI specifics from ahci_reset_controller() Move PCI stuff into ahci_pci_reset_controller(). Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 1d5133587366ee0cbd0be8f10b57a2636b628f9b Author: Anton Vorontsov Date: Wed Mar 3 20:17:37 2010 +0300 ahci: Get rid of pci_dev argument in ahci_save_initial_config() To make the function generic we have to get rid of "struct pci_dev *", so let's pass just a "struct devce *". Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 394d6e535f15c6f2d3c7fe2e228ee595acf0648c Author: Anton Vorontsov Date: Wed Mar 3 20:17:36 2010 +0300 ahci: Factor out PCI specifics from ahci_save_initial_config() Make ahci_save_initial_config() a bit more generic by introducing force_port_map and mask_port_map arguments. Move PCI stuff into ahci_pci_save_initial_config(). Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit d89933497d2698c01ab25e2644807509ada43a7d Author: Anton Vorontsov Date: Wed Mar 3 20:17:34 2010 +0300 ahci: Get rid of host->iomap usage Currently the driver uses host->iomap to store all the iomapped BARs of a PCI device (while AHCI devices actually use just a single memory window). We're going to teach AHCI to work with non-PCI buses, so there are two options to make this work: 1. "fake" host->iomap array for non-PCI devices, and place the needed address at iomap[AHCI_PCI_BAR]; 2. Get rid of host->iomap usage, instead introduce a private mmio field. This patch implements the second option. Signed-off-by: Anton Vorontsov Signed-off-by: Jeff Garzik commit 83827f6a891e20de7468b1181f2ae8a3cc72587b Author: Randy Dunlap Date: Fri May 14 13:52:30 2010 -0700 netfilter: xt_TEE depends on NF_CONNTRACK Fix xt_TEE build for the case of NF_CONNTRACK=m and NETFILTER_XT_TARGET_TEE=y: xt_TEE.c:(.text+0x6df5c): undefined reference to `nf_conntrack_untracked' 4x Built with all 4 m/y combinations. Signed-off-by: Randy Dunlap Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit b12f3cbd7a9a869eae1eb108da02526b132ba80b Merge: 74b8721 57475b1 Author: Russell King Date: Fri May 14 20:09:46 2010 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable commit 126e216a8730532dfb685205309275f87e3d133e Author: Trond Myklebust Date: Thu May 13 12:55:38 2010 -0400 SUNRPC: Don't spam gssd with upcall requests when the kerberos key expired Now that the rpc.gssd daemon can explicitly tell us that the key expired, we should cache that information to avoid spamming gssd. Signed-off-by: Trond Myklebust commit 9bb0b8136a7d5b50c5807af3bf12b758fb257814 Author: Trond Myklebust Date: Thu May 13 12:51:50 2010 -0400 SUNRPC: Reorder the struct rpc_task fields This improves the packing of the rpc_task, and ensures that on 64-bit platforms the size reduces to 216 bytes. Signed-off-by: Trond Myklebust commit d72b6cec8d42eb7c2a249b613abf2c2b7a6eeb47 Author: Trond Myklebust Date: Thu May 13 12:51:50 2010 -0400 SUNRPC: Remove the 'tk_magic' debugging field It has not triggered in almost a decade. Time to get rid of it... Signed-off-by: Trond Myklebust commit d60dbb20a74c2cfa142be0a34dac3c6547ea086c Author: Trond Myklebust Date: Thu May 13 12:51:49 2010 -0400 SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst It seems strange to maintain stats for bytes_sent in one structure, and bytes received in another. Try to assemble all the RPC request-related stats in struct rpc_rqst Signed-off-by: Trond Myklebust commit 9c7e7e23371e629dbb3b341610a418cdf1c19d91 Author: Trond Myklebust Date: Thu May 13 12:51:06 2010 -0400 NFS: Don't call iput() in nfs_access_cache_shrinker iput() can potentially attempt to allocate memory, so we should avoid calling it in a memory shrinker. Instead, rely on the fact that iput() will call nfs_access_zap_cache(). Signed-off-by: Trond Myklebust commit 1a81bb8a1fa62ccb9b2411ac10ce702ca4ed302a Author: Trond Myklebust Date: Thu May 13 12:51:06 2010 -0400 NFS: Clean up nfs_access_zap_cache() Signed-off-by: Trond Myklebust commit 61d5eb2985b3b1d69fd53d7dc9789037c27f8d91 Author: Trond Myklebust Date: Thu May 13 12:51:06 2010 -0400 NFS: Don't run nfs_access_cache_shrinker() when the mask is GFP_NOFS Both iput() and put_rpccred() might allocate memory under certain circumstances, so make sure that we don't recurse and deadlock... Signed-off-by: Trond Myklebust commit 20673406534176ead9b984a84b662928110f77b1 Author: Trond Myklebust Date: Thu May 13 12:51:06 2010 -0400 SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter Signed-off-by: Trond Myklebust commit 93a05e65c090dda9cbd79d0cf57b65c4dbd8da55 Author: Trond Myklebust Date: Thu May 13 12:51:06 2010 -0400 SUNRPC: Ensure memory shrinker doesn't waste time in rpcauth_prune_expired() The 'cred_unused' list, that is traversed by rpcauth_cache_shrinker is ordered by time. If we hit a credential that is under the 60 second garbage collection moratorium, we should exit because we know at that point that all successive credentials are subject to the same moratorium... Signed-off-by: Trond Myklebust commit d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f Author: Trond Myklebust Date: Thu May 13 12:51:03 2010 -0400 SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS Under some circumstances, put_rpccred() can end up allocating memory, so check the gfp_mask to prevent deadlocks. Signed-off-by: Trond Myklebust commit 93870d76fee22e887aa6e7e1fc904dbeca976928 Author: Trond Myklebust Date: Thu May 13 12:51:03 2010 -0400 NFS: Read requests can use GFP_KERNEL. There is no danger of deadlock should the allocation trigger page writeback. Signed-off-by: Trond Myklebust commit 18eb884282bbaf99700ba5b60ded782807d52408 Author: Trond Myklebust Date: Thu May 13 12:51:02 2010 -0400 NFS: Clean up nfs_create_request() There is no point in looping if we're out of memory. Signed-off-by: Trond Myklebust commit 1f4c86c0be9064ab4eebd9e67c84606c1cfeec4b Author: Trond Myklebust Date: Thu May 13 12:51:02 2010 -0400 NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls Again, we can deadlock if the memory reclaim triggers a writeback that requires a rpcsec_gss credential lookup. Signed-off-by: Trond Myklebust commit 8535b2be5181fc3019e4150567ef53210fe3b04f Author: Trond Myklebust Date: Thu May 13 12:51:01 2010 -0400 NFSv4: Don't use GFP_KERNEL allocations in state recovery We do not want to have the state recovery thread kick off and wait for a memory reclaim, since that may deadlock when the writebacks end up waiting for the state recovery thread to complete. The safe thing is therefore to use GFP_NOFS in all open, close, delegation return, lock, etc. operations that may be called by the state recovery thread. Signed-off-by: Trond Myklebust commit 712a4338669d7d57f952244abb608e6ac07e39da Author: Trond Myklebust Date: Wed May 12 17:50:23 2010 -0400 SUNRPC: Fix xs_setup_bc_tcp() It is a BUG for anybody to call this function without setting args->bc_xprt. Trying to return an error value is just wrong, since the user cannot fix this: it is a programming error, not a user error. Signed-off-by: Trond Myklebust commit ff8399709e41bf72b4cb145612a0f9a9f7283c83 Author: Chuck Lever Date: Fri May 7 13:34:47 2010 -0400 SUNRPC: Replace jiffies-based metrics with ktime-based metrics Currently RPC performance metrics that tabulate elapsed time use jiffies time values. This is problematic on systems that use slow jiffies (for instance 100HZ systems built for paravirtualized environments). It is also a problem for computing precise latency statistics for advanced network transports, such as InfiniBand, that can have round-trip latencies significanly faster than a single clock tick. For the RPC client, adopt the high resolution time stamp mechanism already used by the network layer and blktrace: ktime. We use ktime format time stamps for all internal computations, and convert to milliseconds for presentation. As a result, we need only addition operations in the performance critical paths; multiply/divide is required only for presentation. We could report RTT metrics in microseconds. In fact the mountstats format is versioned to accomodate exactly this kind of interface improvement. For now, however, we'll stay with millisecond precision for presentation to maintain backwards compatibility with the handful of currently deployed user space tools. At a later point, we'll move to an API such as BDI_STATS where a finer timestamp precision can be reported. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit f56916b97fe2031761ca611f0a342efd913afb33 Author: Chuck Lever Date: Fri May 7 13:34:37 2010 -0400 ktime: introduce ktime_to_ms() To report ktime statistics to user space in milliseconds, a new helper is required. When considering how to do this conversion, I didn't immediately see why the extra step of converting ktime to a timeval was needed. To make that more clear, introduce a couple of large comments. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit bbc72cea58f671665b6362be0d4e391813ac0eee Author: Chuck Lever Date: Fri May 7 13:34:27 2010 -0400 SUNRPC: RPC metrics and RTT estimator should use same RTT value Compute an RPC request's RTT once, and use that value both for reporting RPC metrics, and for adjusting the RTT context used by the RPC client's RTT estimator algorithm. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 9bc4e3ca46e4eb9cb434de4175c6041d00bbdca3 Author: Chuck Lever Date: Fri May 7 13:34:17 2010 -0400 NFS: Calldata for nfs4_renew_done() I'm about to change task->tk_start from a jiffies value to a ktime_t value in order to make RPC RTT reporting more precise. Recently (commit dc96aef9) nfs4_renew_done() started to reference task->tk_start so that a jiffies value no longer had to be passed from nfs4_proc_async_renew(). This allowed the calldata to point to an nfs_client instead. Changing task->tk_start to a ktime_t value makes it effectively useless for renew timestamps, so we need to restore the pre-dc96aef9 logic that provided a jiffies "start" timestamp to nfs4_renew_done(). Both an nfs_client pointer and a timestamp need to be passed to nfs4_renew_done(), so create a new nfs_renewdata structure that contains both, resembling what is already done for delegreturn, lock, and unlock. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit dfe52c0419b8324bacd69bd28aae77e2d6ee0379 Author: Chuck Lever Date: Fri May 7 13:34:08 2010 -0400 NFS: Squelch compiler warning in nfs_add_server_stats() Clean up: fs/nfs/iostat.h: In function ‘nfs_add_server_stats’: fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions Commit fce22848 replaced the open-coded per-cpu logic in several functions in fs/nfs/iostat.h with a single invocation of this_cpu_ptr(). This macro assumes its second argument is signed, not unsigned. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit a6d5ff64bae02438d914f088672cab1916153954 Author: Chuck Lever Date: Fri May 7 13:33:58 2010 -0400 NFS: Clean up fscache_uniq mount option Clean up: fscache_uniq takes a string, so it should be included with the other string mount option definitions, by convention. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 0f15c53d5b1829c10dd901f37b8263aa25ecf864 Author: Chuck Lever Date: Fri May 7 13:33:48 2010 -0400 NFS: Squelch compiler warning Seen with -Wextra: /home/cel/linux/fs/nfs/fscache.c: In function ‘__nfs_readpages_from_fscache’: /home/cel/linux/fs/nfs/fscache.c:479: warning: comparison between signed and unsigned integer expressions The comparison implicitly converts "int" to "unsigned", making it safe. But there's no need for the implicit type conversions here, and the dfprintk() already uses a "%u" formatter for "npages." Better to reduce confusion. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 9605a069f83d999e60cd57dc8010708fe08291c0 Author: Chuck Lever Date: Fri May 7 13:33:30 2010 -0400 SUNRPC: Trivial cleanups in include/linux/sunrpc/xdr.h Clean up: Update the documenting comment, and fix some minor white space issues. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit bb8b27e504c0f0463535fea31b42bcaa393c3fb0 Author: Trond Myklebust Date: Fri Apr 16 16:43:06 2010 -0400 NFSv4: Clean up the NFSv4 setclientid operation Reviewed-by: Chuck Lever Signed-off-by: Trond Myklebust commit d7cf8dd01289b3c64057e38d34c2857f6633d52c Author: Trond Myklebust Date: Fri Apr 16 16:42:46 2010 -0400 NFSv4: Allow attribute caching with 'noac' mounts if client holds a delegation If the server has given us a delegation on a file, we _know_ that we can cache the attribute information even when the user has specified 'noac'. Reviewed-by: Chuck Lever Signed-off-by: Trond Myklebust commit a8ce4a8f37fef0a09a1e920c2e09f67a80426c7e Author: Trond Myklebust Date: Fri Apr 16 16:42:12 2010 -0400 SUNRPC: Fail over more quickly on connect errors We should not allow soft tasks to wait for longer than the major timeout period when waiting for a reconnect to occur. Remove the field xprt->connect_timeout since it has been obsoleted by xprt->reestablish_timeout. Signed-off-by: Trond Myklebust commit 0b9e79431377df452348e78262dd5a3dc359eeef Author: Trond Myklebust Date: Fri Apr 16 16:41:57 2010 -0400 SUNRPC: Move the test for XPRT_CONNECTING into xprt_connect() This fixes a bug with setting xprt->stat.connect_start. Reviewed-by: Chuck Lever Signed-off-by: Trond Myklebust commit 19445b99b6d66af661c586c052de23110731a502 Author: Trond Myklebust Date: Fri Apr 16 16:41:10 2010 -0400 SUNRPC: Cleanup - make rpc_new_task() call rpc_release_calldata on failure Also have it return an ERR_PTR(-ENOMEM) instead of a null pointer. Reviewed-by: Chuck Lever Signed-off-by: Trond Myklebust commit ee5ebe851ed60206f150d3f189416f9c63245b66 Author: Trond Myklebust Date: Fri Apr 16 16:37:01 2010 -0400 SUNRPC: Clean up xprt_release() Reviewed-by: Chuck Lever Signed-off-by: Trond Myklebust commit fd86dfd2637db1aef9ebf96ba41aeedb87521e78 Author: Trond Myklebust Date: Mon Apr 19 19:26:23 2010 -0400 NFSv4: Fix up the documentation for nfs_do_refmount Signed-off-by: Trond Myklebust commit 1b4c6065b903390067c1b49bd616db5994c0d51c Author: Trond Myklebust Date: Mon Apr 19 19:14:28 2010 -0400 NFS: Replace nfsroot on-stack filehandle Signed-off-by: Trond Myklebust commit b157b06ca24514ef4b766cabb8e852c950040923 Author: Trond Myklebust Date: Mon Apr 19 19:05:48 2010 -0400 NFS: Cleanup file handle allocations in fs/nfs/super.c Use the new helper functions instead of open coding. Signed-off-by: Trond Myklebust commit ce587e07ba2e25b5c9d286849885b82676661f3e Author: Trond Myklebust Date: Fri Apr 16 16:22:52 2010 -0400 NFS: Prevent the mount code from looping forever on broken exports Keep a global count of how many referrals that the current task has traversed on a path lookup. Return ELOOP if the count exceeds MAX_NESTED_LINKS. Signed-off-by: Trond Myklebust commit 6e94d62993cb79397856f3330577917ca79cffa2 Author: Trond Myklebust Date: Fri Apr 16 16:22:52 2010 -0400 NFS: Reduce stack footprint of nfs3_proc_getacl() and nfs3_proc_setacl() Signed-off-by: Trond Myklebust commit ca7e9a0df263493bbdf76f47fd9e9ac48ad6f331 Author: Trond Myklebust Date: Fri Apr 16 16:22:52 2010 -0400 NFS: Reduce stack footprint of nfs_statfs() Signed-off-by: Trond Myklebust commit 987f8dfc9862f2c7b59594089793dedeebf0cf5e Author: Trond Myklebust Date: Fri Apr 16 16:22:52 2010 -0400 NFS: Reduce stack footprint of nfs_setattr() Signed-off-by: Trond Myklebust commit 0ab64e0e147e45c07e33d344401cf898a6c181c0 Author: Trond Myklebust Date: Fri Apr 16 16:22:51 2010 -0400 NFS: Reduce stack footprint of nfs4_proc_create() Move the O_EXCL open handling into _nfs4_do_open() where it belongs. Doing so also allows us to reuse the struct fattr from the opendata. Signed-off-by: Trond Myklebust commit 23a306120fcb2879ed2b814716c1cb2a8eb74f72 Author: Trond Myklebust Date: Fri Apr 16 16:22:51 2010 -0400 NFS: Reduce the stack footprint of nfs_proc_symlink() Signed-off-by: Trond Myklebust commit eb872f0c8e5c9801da05d5c2a6e402af8e27160e Author: Trond Myklebust Date: Fri Apr 16 16:22:51 2010 -0400 NFS: Reduce the stack footprint of nfs_proc_create Signed-off-by: Trond Myklebust commit 39967ddf19ff98b6e0d7b43fe60bcbf2c254c478 Author: Trond Myklebust Date: Fri Apr 16 16:22:50 2010 -0400 NFS: Reduce the stack footprint of nfs_rmdir Signed-off-by: Trond Myklebust commit d346890bea062d697e24fb4e34591428021ad011 Author: Trond Myklebust Date: Fri Apr 16 16:22:50 2010 -0400 NFS: Reduce stack footprint of nfs_proc_remove() Signed-off-by: Trond Myklebust commit 3b14d6542d7efbec614277d1cd7d6f5b5a2be9ca Author: Trond Myklebust Date: Fri Apr 16 16:22:50 2010 -0400 NFS: Reduce stack footprint of nfs3_proc_readlink() Signed-off-by: Trond Myklebust commit 136f2627c932da5835e67e464e191d8c43c3f3fd Author: Trond Myklebust Date: Fri Apr 16 16:22:49 2010 -0400 NFS: Reduce the stack footprint of nfs_link() Signed-off-by: Trond Myklebust commit aa49b4cf7dbf45438563f0ff6a2d23a68b70a7b9 Author: Trond Myklebust Date: Fri Apr 16 16:22:49 2010 -0400 NFS: Reduce stack footprint of nfs_readdir() Signed-off-by: Trond Myklebust commit 011fff7239eb90e33e7bebba48bf596fced06eb9 Author: Trond Myklebust Date: Fri Apr 16 16:22:49 2010 -0400 NFS: Reduce stack footprint of nfs3_proc_rename() and nfs4_proc_rename() Signed-off-by: Trond Myklebust commit a3cba2aad9c0a63279716d377efbf37c176ed400 Author: Trond Myklebust Date: Fri Apr 16 16:22:49 2010 -0400 NFS: Reduce stack footprint of nfs_revalidate_inode() Signed-off-by: Trond Myklebust commit c407d41a1612aa487f5a9cb5338ed7dc60fe1da2 Author: Trond Myklebust Date: Fri Apr 16 16:22:48 2010 -0400 NFSv4: Reduce stack footprint of nfs4_proc_access() and nfs3_proc_access() Signed-off-by: Trond Myklebust commit 4f727296d2428b60138793a0a1207a4085eacf99 Author: Trond Myklebust Date: Fri Apr 16 16:22:48 2010 -0400 NFSv4: Reduce the stack footprint of nfs4_remote_referral_get_sb Signed-off-by: Trond Myklebust commit 8bac9db9cf85f2518cb523bb1d69c481975c1f9a Author: Trond Myklebust Date: Fri Apr 16 16:22:48 2010 -0400 NFSv4: Reduce stack footprint of nfs4_get_root() Signed-off-by: Trond Myklebust commit 04ffdbe2e69beb0f1745f921871fbe0f97dc4697 Author: Trond Myklebust Date: Fri Apr 16 16:22:48 2010 -0400 NFS: Reduce the stack footprint of nfs_follow_remote_path() Signed-off-by: Trond Myklebust commit e1fb4d05d5a3265f1f6769bee034175f91ecc2dd Author: Trond Myklebust Date: Fri Apr 16 16:22:47 2010 -0400 NFS: Reduce the stack footprint of nfs_lookup Signed-off-by: Trond Myklebust commit 364d015e5208e4669a4ae9fab2ab104ff26bc159 Author: Trond Myklebust Date: Fri Apr 16 16:22:46 2010 -0400 NFSv4: Reduce the stack footprint of try_location() Signed-off-by: Trond Myklebust commit fbca779a8d240d82ef1439247033fd491f81547c Author: Trond Myklebust Date: Fri Apr 16 16:22:46 2010 -0400 NFS: Reduce the stack footprint of nfs_create_server Signed-off-by: Trond Myklebust commit a4d7f16806e98cee752006d3a8c10067a7c2aa6b Author: Trond Myklebust Date: Fri Apr 16 16:22:46 2010 -0400 NFS: Reduce the stack footprint of nfs_follow_mountpoint() Signed-off-by: Trond Myklebust commit 815409d22df870ea0b0d86f2a3bf33c35bcef55c Author: Trond Myklebust Date: Fri Apr 16 16:22:46 2010 -0400 NFSv4: Eliminate nfs4_path_walk() All we really want is the ability to retrieve the root file handle. We no longer need the ability to walk down the path, since that is now done in nfs_follow_remote_path(). Signed-off-by: Trond Myklebust commit 2d36bfde8565b315e624302d12da5a7c9d195522 Author: Trond Myklebust Date: Fri Apr 16 16:22:45 2010 -0400 NFS: Add helper functions for allocating filehandles and fattr structs NFS Filehandles and struct fattr are really too large to be allocated on the stack. This patch adds in a couple of helper functions to allocate them dynamically instead. Signed-off-by: Trond Myklebust commit fc54a0c65fc8cae6b0355512f0b619c1515e7d7f Author: Trond Myklebust Date: Thu Apr 8 14:25:20 2010 -0400 gss_krb5: Advertise rc4-hmac enctype support in the rpcsec_gss/krb5 upcall Update the upcall info indicating which Kerberos enctypes the kernel supports Signed-off-by: Trond Myklebust commit fffdaef2eb4a7333952e55cf97f1fc0fcc35f981 Author: Kevin Coffman Date: Wed Mar 17 13:03:06 2010 -0400 gss_krb5: Add support for rc4-hmac encryption Add necessary changes to add kernel support for the rc4-hmac Kerberos encryption type used by Microsoft and described in rfc4757. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 5af46547ec451918f3ba51efe59b317d33adf701 Author: Kevin Coffman Date: Wed Mar 17 13:03:05 2010 -0400 gss_krb5: Use confounder length in wrap code All encryption types use a confounder at the beginning of the wrap token. In all encryption types except arcfour-hmac, the confounder is the same as the blocksize. arcfour-hmac has a blocksize of one, but uses an eight byte confounder. Add an entry to the crypto framework definitions for the confounder length and change the wrap/unwrap code to use the confounder length rather than assuming it is always the blocksize. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 1dbd9029f3024d058da1cf6c6658c28aac2e4e1c Author: Kevin Coffman Date: Wed Mar 17 13:03:04 2010 -0400 gssd_krb5: More arcfour-hmac support For the arcfour-hmac support, the make_seq_num and get_seq_num functions need access to the kerberos context structure. This will be used in a later patch. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit fc263a917afad3bda7b823a6edc803a40e7f6015 Author: Kevin Coffman Date: Wed Mar 17 13:03:03 2010 -0400 gss_krb5: Save the raw session key in the context This is needed for deriving arcfour-hmac keys "on the fly" using the sequence number or checksu Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 8b23707612cffdba694dcd18aa8a018918aa86dc Author: Kevin Coffman Date: Wed Mar 17 13:03:02 2010 -0400 gssd_krb5: arcfour-hmac support For arcfour-hmac support, the make_checksum function needs a usage field to correctly calculate the checksum differently for MIC and WRAP tokens. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit bf6d359c508cf83401c942262a9749752598394d Author: Trond Myklebust Date: Thu Apr 8 14:23:06 2010 -0400 gss_krb5: Advertise AES enctype support in the rpcsec_gss/krb5 upcall Update upcall info indicating which Kerberos enctypes the kernel supports Signed-off-by: Trond Myklebust commit 934a95aa1c9c6ad77838800b79c306e982437605 Author: Kevin Coffman Date: Wed Mar 17 13:03:00 2010 -0400 gss_krb5: add remaining pieces to enable AES encryption support Add the remaining pieces to enable support for Kerberos AES encryption types. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit de9c17eb4a912c9028f7b470eb80815144883b26 Author: Kevin Coffman Date: Wed Mar 17 13:02:59 2010 -0400 gss_krb5: add support for new token formats in rfc4121 This is a step toward support for AES encryption types which are required to use the new token formats defined in rfc4121. Signed-off-by: Kevin Coffman [SteveD: Fixed a typo in gss_verify_mic_v2()] Signed-off-by: Steve Dickson [Trond: Got rid of the TEST_ROTATE/TEST_EXTRA_COUNT crap] Signed-off-by: Trond Myklebust commit c43abaedaff92a7bcbfe04b593164bb5faba3078 Author: Kevin Coffman Date: Wed Mar 17 13:02:58 2010 -0400 xdr: Add an export for the helper function write_bytes_to_xdr_buf() Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 4018bf3eec5ff6bf1234a602a4e72518757a7f55 Author: Trond Myklebust Date: Thu Apr 8 14:21:12 2010 -0400 gss_krb5: Advertise triple-des enctype support in the rpcsec_gss/krb5 upcall Update the upcall info indicating which Kerberos enctypes the kernel supports. Signed-off-by: Trond Myklebust commit 958142e97e04d6c266ae093739bbbbd03afcd497 Author: Kevin Coffman Date: Wed Mar 17 13:02:55 2010 -0400 gss_krb5: add support for triple-des encryption Add the final pieces to support the triple-des encryption type. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 683ac6656cb05b6e83593770ffc049eee4a4d119 Author: Trond Myklebust Date: Thu Apr 8 14:09:58 2010 -0400 gss_krb5: Add upcall info indicating supported kerberos enctypes The text based upcall now indicates which Kerberos encryption types are supported by the kernel rpcsecgss code. This is used by gssd to determine which encryption types it should attempt to negotiate when creating a context with a server. The server principal's database and keytab encryption types are what limits what it should negotiate. Therefore, its keytab should be created with only the enctypes listed by this file. Currently we support des-cbc-crc, des-cbc-md4 and des-cbc-md5 Signed-off-by: Trond Myklebust commit 47d84807762966c3611c38adecec6ea703ddda7a Author: Kevin Coffman Date: Wed Mar 17 13:02:54 2010 -0400 gss_krb5: handle new context format from gssd For encryption types other than DES, gssd sends down context information in a new format. This new format includes the information needed to support the new Kerberos GSS-API tokens defined in rfc4121. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 4891f2d008e4343eedea39ba1fe74864f1d32be0 Author: Kevin Coffman Date: Wed Mar 17 13:02:53 2010 -0400 gss_krb5: import functionality to derive keys into the kernel Import the code to derive Kerberos keys from a base key into the kernel. This will allow us to change the format of the context information sent down from gssd to include only a single key. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit e1f6c07b1160ef28e8754d12e6c03288dd9d5ca8 Author: Kevin Coffman Date: Wed Mar 17 13:02:52 2010 -0400 gss_krb5: add ability to have a keyed checksum (hmac) Encryption types besides DES may use a keyed checksum (hmac). Modify the make_checksum() function to allow for a key and take care of enctype-specific processing such as truncating the resulting hash. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 81d4a4333a1dfd6070f046265d928bb4c79aff88 Author: Kevin Coffman Date: Wed Mar 17 13:02:51 2010 -0400 gss_krb5: introduce encryption type framework Add enctype framework and change functions to use the generic values from it rather than the values hard-coded for des. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit a8cc1cb7d7a12b0e2855832d10cfbfaffebfad6c Author: Kevin Coffman Date: Wed Mar 17 13:02:50 2010 -0400 gss_krb5: prepare for new context format Prepare for new context format by splitting out the old "v1" context processing function Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 1ac3719a2214c545c7e19d34e272a148ca9a24f1 Author: Kevin Coffman Date: Wed Mar 17 13:02:49 2010 -0400 gss_krb5: split up functions in preparation of adding new enctypes Add encryption type to the krb5 context structure and use it to switch to the correct functions depending on the encryption type. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 54ec3d462f3c2a3fe48a7bd592160bee31360087 Author: J. Bruce Fields Date: Wed Mar 17 13:02:48 2010 -0400 gss_krb5: Don't expect blocksize to always be 8 when calculating padding Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 7561042fb7870be0b4ee57efddce68bda8968abf Author: Kevin Coffman Date: Wed Mar 17 13:02:47 2010 -0400 gss_krb5: Added and improved code comments Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 725f2865d4df31ac0768b13ae763beadc4bb8ce9 Author: Kevin Coffman Date: Wed Mar 17 13:02:46 2010 -0400 gss_krb5: Introduce encryption type framework Make the client and server code consistent regarding the extra buffer space made available for the auth code when wrapping data. Add some comments/documentation about the available buffer space in the xdr_buf head and tail when gss_wrap is called. Add a compile-time check to make sure we are not exceeding the available buffer space. Add a central function to shift head data. Signed-off-by: Kevin Coffman Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit c82ee828aa20487d254a5225d256cd422acee459 Author: Arnaldo Carvalho de Melo Date: Fri May 14 14:19:35 2010 -0300 perf report: Report number of events, not samples Number of samples is meaningless after we switched to auto-freq, so report the number of events, i.e. not the sum of the different periods, but the number PERF_RECORD_SAMPLE emitted by the kernel. While doing this I noticed that naming "count" to the sum of all the event periods can be confusing, so rename it to .period, just like in struct sample.data, so that we become more consistent. This helps with the next step, that was to record in struct hist_entry the number of sample events for each instance, we need that because we use it to generate the number of events when applying filters to the tree of hist entries like it is being done in the TUI report browser. Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ade275c4b6db98ae7b197cc7c6bdd73567a975c2 Merge: 5f65f15 508ff9d Author: Steve French Date: Fri May 14 17:11:48 2010 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 commit cee75ac7ecc27084accdb9d9d6fde65a09f047ae Author: Arnaldo Carvalho de Melo Date: Fri May 14 13:16:55 2010 -0300 perf hist: Clarify events_stats fields usage The events_stats.total field is too generic, rename it to .total_period, and also add a comment explaining that it is the sum of all the .period fields in samples, that is needed because we use auto-freq to avoid sampling artifacts. Ditto for events_stats.lost, that is the sum of all lost_event.lost fields, i.e. the number of events the kernel dropped. Looking at the users, builtin-sched.c can make use of these fields and stop doing it again. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 Author: Jonathan Corbet Date: Wed May 12 14:23:48 2010 -0600 Add a document describing the padata interface This originally appeared as http://lwn.net/Articles/382257/. Cc: Steffen Klassert Signed-off-by: Jonathan Corbet commit 5f65f150fbc580ccfd57e5528e1fc905aaaef65c Merge: baa4563 6a251b0 Author: Steve French Date: Fri May 14 15:15:28 2010 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 7db82437cfcac4bdfe79a6323eb554fdfa271623 Author: Wolfram Sang Date: Fri May 14 15:40:45 2010 +0200 vlynq: make whole Kconfig-menu dependant on architecture This removes an empty menu for most platforms. Signed-off-by: Wolfram Sang Acked-by: Florian Fainelli Signed-off-by: Jiri Kosina commit c8446b9bdabcb0caa61bb341bd73c58f7104b503 Author: Arnaldo Carvalho de Melo Date: Fri May 14 10:36:42 2010 -0300 perf hist: Make event__totals per hists This is one more thing that started global but are more useful per hist or per session. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 752ec2f2d97da34abffa1abff81c96183a895b28 Author: Jorge Eduardo Candelaria Date: Wed May 12 12:18:40 2010 -0500 ARM: McBSP: Add support for omap4 in McBSP driver McBSP module in OMAP4 needs to be able to set its tx/rx threshold and enable the transmitter/receiver when starting an audio stream. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Acked-by: Tony Lindgren Signed-off-by: Liam Girdwood commit 9319b9da35179e11aa9c15d80062d63b36a0517f Author: Jorge Eduardo Candelaria Date: Wed May 12 12:18:39 2010 -0500 ARM: McBSP: Fix request for irq in OMAP4 In OMAP4, there is only one irq line for TX and RX paths. Use the correct irq line to avoid errors at runtime. Also, request irq line only once (instead of requesting for TX and RX). Signed-off-by: Jorge Eduardo Candelaria Acked-by: Jarkko Nikula Acked-by: Mark Brown Acked-by: Tony Lindgren Signed-off-by: Liam Girdwood commit d98508a121e8f4b1ccf876fea463fa0afddc4e19 Author: Sergey Lapin Date: Thu May 13 19:48:16 2010 +0400 OMAP: McBSP: Add 32-bit mode support This patchs should allow to use 32-bit samples on e.g. TLV320AIC3x codec, or others. Signed-off-by: Sergey Lapin Acked-by: Mark Brown Acked-by: Peter Ujfalusi Signed-off-by: Liam Girdwood commit 6df900e96c70208a931968da99f24cc982de116e Author: Sucheta Chakraborty Date: Thu May 13 03:07:50 2010 +0000 qlcnic: add idc debug registers When ever driver changes the device state, it should write pci-func number and timestamp in debug registers. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit a5e463d0b1c123873d6f0c6cdd234041c87b7c80 Author: Sucheta Chakraborty Date: Thu May 13 03:07:49 2010 +0000 qlcnic: support quisce mode Device can go to quiescent state, during which drivers should refrain from using the device. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b3a2464941e32ca58059cba68012105e35ce84af Author: Sucheta Chakraborty Date: Thu May 13 03:07:48 2010 +0000 qlcnic: check device class pci-func class can be other than ethernet in Qlogic CNA device. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 96f8118c25ea812335986d96a68441c2bcb01fe0 Author: Sucheta Chakraborty Date: Thu May 13 03:07:47 2010 +0000 qlcnic: check IDC version Warn user if IDC version mismatch with different class of drivers. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 251a84c9272b88eac4888d610c44c821b277c6c9 Author: Amit Kumar Salecha Date: Thu May 13 03:07:46 2010 +0000 qlcnic: cleanup unused code LRO ring, cut-thru mode and specific fw version are not valid to Qlogic CNA device. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 1bb09fb9c9333c97dc58524b05d4ee35b02b4216 Author: Amit Kumar Salecha Date: Fri May 14 03:07:46 2010 -0700 qlcnic: cleanup dma mask setting Device support 64 bit dma mask. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 6edae7a4848ae5b363dcc7d8ee4f3f7a34e31e36 Author: Amit Kumar Salecha Date: Thu May 13 03:07:44 2010 +0000 qlcnic: fix caching window register o Window register is not per pci-func, so caching can result in expected result. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit deffab05308f783482d11c1bb52f24afa94cd632 Author: Amit Kumar Salecha Date: Thu May 13 03:07:43 2010 +0000 qlcnic: remove obsolete register MSI_MODE, CAPABILITIES_FW and SCRATCHPAD registers are obsolete. Driver should not use them. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 2372a5f1c869fd1e4dc11fb41600197fcce1121c Author: Amit Kumar Salecha Date: Thu May 13 03:07:42 2010 +0000 qlcnic: fix context cleanup Before going for recovery, every pci-func should check fw state, irrespective of device state. This to avoid unnecssary sending of command for ctx destroy. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit e0a67e2dd9aa01a59cd91a7b39a6af1282bbc214 Author: stephen hemminger Date: Thu May 13 06:12:53 2010 +0000 sky2: version 1.28 Version 1.28 Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3403aca2320274dc5c617dc2f0cc358771a51be9 Author: Mike McCormack Date: Thu May 13 06:12:52 2010 +0000 sky2: Avoid allocating memory in sky2_resume Allocating memory can fail, and since we have the memory we need in sky2_resume when sky2_suspend is called, just stop the hardware without freeing the memory it's using. This avoids the possibility of failing because we can't allocate memory in sky2_resume(), and allows sharing code with sky2_restart(). Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit d72ff8fa7f8b344382963721f842256825c4660b Author: Mike McCormack Date: Thu May 13 06:12:51 2010 +0000 sky2: Refactor down/up code out of sky2_restart() Code to bring down all sky2 interfaces and bring it up again can be reused in sky2_suspend and sky2_resume. Factor the code to bring the interfaces down into sky2_all_down and the up code into sky2_all_up. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 93135a3be0d909fabca9c4329177f71ae71b6847 Author: Mike McCormack Date: Thu May 13 06:12:50 2010 +0000 sky2: Shut off interrupts before NAPI Interrupts should be masked, then synchronized, and finally NAPI should be disabled. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit df01093bb08916f434ebedde4610805d4105d05f Author: Mike McCormack Date: Thu May 13 06:12:49 2010 +0000 sky2: Avoid race in sky2_change_mtu netif_stop_queue does not ensure all in-progress transmits are complete, so use netif_tx_disable() instead. Secondly, make sure NAPI polls are disabled before stopping the tx queue, otherwise sky2_status_intr might trigger a TX queue wakeup between when we stop the queue and NAPI is disabled. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 37652522faa0877dc6d0dbb6b999bdccc07f0e89 Author: Mike McCormack Date: Thu May 13 06:12:48 2010 +0000 sky2: Restore multicast after restart Multicast settings will be lost on reset, so restore them. Signed-off-by: Mike McCormack Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 57bf6eef2f43ae810504753208b3a2c0bb2e4765 Author: Joe Perches Date: Thu May 13 15:26:17 2010 +0000 ixgb and e1000: Use new function for copybreak tests There appears to be an off-by-1 defect in the maximum packet size copied when copybreak is speified in these modules. The copybreak module params are specified as: "Maximum size of packet that is copied to a new buffer on receive" The tests are changed from "< copybreak" to "<= copybreak" and moved into new static functions for readability. Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 621b99b6f6a8ae69ca9b69dec0fec3a68f774bb7 Author: Jesse Brandeburg Date: Thu May 13 15:25:56 2010 +0000 e1000: cleanup unused parameters During the cleanup pass after the removal of e1000e hardware from e1000 some parameters were missed. Remove them because it is just dead code. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2a2ec45ddeedaddb9ff8cb98eab7d4f85f44df4a Author: Jesse Brandeburg Date: Thu May 13 15:25:33 2010 +0000 e1000: fix WARN_ON with mac-vlan When adding more than 14 mac-vlan adapters on e1000 the driver would fire a WARN_ON when adding the 15th. The WARN_ON in this case is completely un-necessary, as the code below the WARN_ON is directly handling the value the WARN_ON triggered on. CC: Jiri Pirko Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0ddc9324b1a842afd77e8e86698b1d1d2ffed022 Author: Andreas Dilger Date: Fri May 14 11:13:27 2010 +0200 add descriptive comment for TIF_MEMDIE task flag declaration. Signed-off-by: Andreas Dilger Acked-by: KOSAKI Motohiro Signed-off-by: Jiri Kosina commit 6858d49833b8c2aae74adcb593065797409d376e Author: Arce, Abraham Date: Thu May 13 15:05:47 2010 -0500 EEPROM: max6875: Header file cleanup Change max6875.c header file to format as in conventions Signed-off-by: Abraham Arce Acked-by: Wolfram Sang Signed-off-by: Jiri Kosina commit 654087faf8ad0695d6b384465e3380a1d8de1cb2 Author: Arce, Abraham Date: Thu May 13 15:05:02 2010 -0500 EEPROM: 93cx6: Header file cleanup Change eeprom_93cx6.c header file to format as in conventions Signed-off-by: Abraham Arce Acked-by: Wolfram Sang Signed-off-by: Jiri Kosina commit 110f42290f812aa578a03b39a3c3156f89b97ba0 Author: Arce, Abraham Date: Thu May 13 15:04:30 2010 -0500 EEPROM: Header file cleanup Change eeprom.c header file to format as in conventions Signed-off-by: Abraham Arce Acked-by: Jean Delvare Acked-by: Wolfram Sang Signed-off-by: Jiri Kosina commit a4b770972b8f819e408d7cc3ae9637e15bff62f6 Author: Joe Perches Date: Fri May 14 00:19:28 2010 -0700 drivers/net: Remove unnecessary returns from void function()s This patch removes from drivers/net/ all the unnecessary return; statements that precede the last closing brace of void functions. It does not remove the returns that are immediately preceded by a label as gcc doesn't like that. It also does not remove null void functions with return. Done via: $ grep -rP --include=*.[ch] -l "return;\n}" net/ | \ xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }' with some cleanups by hand. Compile tested x86 allmodconfig only. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 9e565292270a2d55524be38835104c564ac8f795 Author: Roland McGrath Date: Thu May 13 21:43:03 2010 -0700 x86: Use .cfi_sections for assembly code The newer assemblers support the .cfi_sections directive so we can put the CFI from .S files into the .debug_frame section that is preserved in unstripped vmlinux and in separate debuginfo, rather than the .eh_frame section that is now discarded by vmlinux.lds.S. Signed-off-by: Roland McGrath LKML-Reference: <20100514044303.A6FE7400BE@magilla.sf.frob.com> Signed-off-by: H. Peter Anvin commit 21ce849ba5cc178740c6532ba3dded852296ad91 Author: Mallikarjuna R Chilakala Date: Thu May 13 17:33:41 2010 +0000 ixgbe: Refactor common code between 82598 & 82599 to accommodate new hardware Some of the following MAC functions are moved from 82598 & 82599 specific hardware files to common.[ch] to accommodate new silicon changes. Also fixed some white space issues * get_san_mac_addr, check_link, set_vmdq, clear_vmdq, clear_vfta, * set_vfta, fc_enable, init_uta_tables Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e8171aaad7ec335b8cbd71f56eb08b545f0c404f Author: Mallikarjuna R Chilakala Date: Thu May 13 17:33:21 2010 +0000 ixgbe: Use bool flag to see if the packet unmapping is delayed in HWRSC We can't use zero magic "bad" value to check if IXGBE_RSC_CB(skb)->dma is valid. It is only valid in x86/arm/m68k/alpha architectures and in spark, powerPC and other architectures it should be ~0. As per Benjamin Herrenschmidt feedback use a bool flag to decide if the packet unmapping is delayed in hardware RSC till EOP is reached Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e433ea1fb03c10debf101019668b83abed041c24 Author: Emil Tantilov Date: Thu May 13 17:33:00 2010 +0000 ixgbe: fix setting of promisc mode when using mac-vlans Introduce uc_set_promisc flag to fix enabling of promisc mode when exceeding the number of supported RAR entries. Issue discovered by Ben Greear when using mac-vlans. Reported-by: Ben Greear Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 835879a8848e9de93d38cdae99bda18d08545586 Author: Jassi Brar Date: Tue Mar 9 15:10:34 2010 +0900 ARM: S3C6410: Declare IISv4 audio-bus clock Declare 'audio-bus' clock for IISv4 controller of S3C6410. Even though the name is same as that for IISv3, the id is set to -1(just one instance of the controller is available) which helps always fetch the correct clock. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 1aede2ea50a56a83dd95e7d1139a948212be2446 Author: Jassi Brar Date: Tue Mar 9 15:10:33 2010 +0900 ARM: S3C6410: Declare possible sources of audio-bus2 Declare possible sources of CLKAUDIO[2]/audio-bus for IISv4 controller. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit bc8eb1e2fa23ff433531c8b631f76302843f52e6 Author: Jassi Brar Date: Tue Mar 9 15:10:32 2010 +0900 ARM: S3C6410: Declare IISCDCLK_V4 Clock Declare the source of clock provided at Xi2sCDCLK2 pin for IISv4 controller. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit df3c6b08d01581052040611f2dced989b83244c9 Author: Jassi Brar Date: Tue Mar 9 15:10:31 2010 +0900 ARM: S3C6410: Define clk_src2 register Define S3C6410 specific register - CLK_SRC2 Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 7b52161d14fa8a22a2387f4aa2fb7b854587830d Author: Daniel Walker Date: Thu May 6 12:44:57 2010 -0700 msm: 7x30 Kconfig and makefile changes Enables basic boot support for the MSM7x30 SURF development board. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 37a298fb6ad5134e52cff5a114a44c47fff51d77 Author: Gregory Bean Date: Fri Apr 30 22:22:07 2010 -0700 msm: clock support for the MSM7x30 CPU. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 41f04b17b6409026fda01942628496ec7dca2f06 Author: Daniel Walker Date: Thu May 6 14:18:06 2010 -0700 msm: physical offset for MSM7X30 The MSM7x30 does not have a separate bank of memory for shared memory communication with the radio CPU. Set the kernel base address 2MB in, to use this first 2MB for this purpose. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit c83b2bf66a40cd9bb3af3f6e28d36babb6748d73 Author: Daniel Walker Date: Tue May 4 15:26:13 2010 -0700 msm: io: add io support for 7x30 Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 1ed8d58fcba4cda3e492f085d217c76ba6e8cb14 Author: Daniel Walker Date: Wed May 5 07:49:05 2010 -0700 msm: Add extern for 7x30 clock list. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 2f2a74e637b7ea4a52a7aea82f2a1835749d3a35 Author: Daniel Walker Date: Tue May 4 11:29:54 2010 -0700 msm: dma: add 7x30 security domain abstraction The MSM SOC's DMA controller contains several security domains. On the MSM7x00, only security domain 3 is accessible to our CPU. The 7x30, however, uses security domain 2. Fix up the register definition macros to select this appropriately, based on configured target. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 90e37c57bab2876c50fe479d26e228c9aa871556 Author: Daniel Walker Date: Wed May 12 14:24:15 2010 -0700 msm: update basic board layout for MSM7x30 Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 10932767d215d35acc7facd01b2bb3d77dbc0f4b Author: Daniel Walker Date: Wed May 12 12:02:25 2010 -0700 msm: add devices-msm7x30.c This adds a clock list, and common resource structures for MSM7x30. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 184d252acd155da1c9112831543c99f301b3cc64 Author: Daniel Walker Date: Wed May 5 07:08:13 2010 -0700 msm: add msm_iomap-7x30.h for MSM7x30 support Add a header describing the io regions for MSM7x30. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 1b54b39eafa234da53d6739d877bae9c710017a4 Author: Daniel Walker Date: Wed May 5 06:53:23 2010 -0700 msm: irqs: add irqs-7x30.h for MSM7x30 support Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 4ad15e6f56983e6df7cdca499ba89188b65f8e4e Author: Daniel Walker Date: Thu May 6 13:54:17 2010 -0700 msm: 8x50 Kconfig changes Enable CONFIG_ARCH_QSD8X50. This is the first SOC with the Scorpion processor. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 81d658ac64000758c198c6b31fed505ec284e165 Author: Daniel Walker Date: Thu May 6 14:16:04 2010 -0700 msm: physical offset for QSD8x50 Support different RAM base addresses used by Qualcomm SOCs, with QSD8x50 as the first addtional one. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit cf62ffae2550102557c0848ab63a771e032fcfd3 Author: Daniel Walker Date: Tue May 4 15:12:27 2010 -0700 msm: io: add io support for 8x50 Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit acb241cb61945d9943e89da51e33bf4b71104164 Author: Daniel Walker Date: Wed May 5 07:48:32 2010 -0700 msm: add extern for 8x50 clock list. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 62a6cc578cb2b1cdbaaf764ca245ad64da800235 Author: Daniel Walker Date: Wed May 5 07:27:16 2010 -0700 msm: add devices-qsd8x50.c This adds a clock list, and common resource structures for QSD8x50. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit d1c0d43d40a625345634d2b08325fb9e8be41534 Author: Daniel Walker Date: Wed May 5 07:17:31 2010 -0700 msm: update basic board layout for QSD8x50 Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit eb61bf85595f7ebb789ca71e590773ff3aa0c10f Author: Daniel Walker Date: Wed May 5 07:03:55 2010 -0700 msm: add msm_iomap-8x50.h for QSD8x50 support Add a header describing the io regions for QSD8x50. Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit e502c3777fb97453fb95c1479cac20ef58f53709 Author: Daniel Walker Date: Wed May 5 06:45:20 2010 -0700 msm: irqs: add irqs-8x50.h for QSD8x50 support Signed-off-by: Daniel Walker Signed-off-by: David Brown Signed-off-by: Gregory Bean Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 83a2c0e4bd9065cbd7a179abfaace2f55b742302 Author: Daniel Walker Date: Thu May 13 15:39:52 2010 -0700 msm: timer: allow MSM_DGT_BASE to be overriden Some SoC need to redefine MSM_DGT_BASE from it's default. This allows it to be defined in a header to override the default value. Signed-off-by: Daniel Walker commit f9f3d3131879b0bb137084f4ca8ba67d2120b003 Author: Gregory Bean Date: Fri Apr 30 22:06:50 2010 -0700 msm: add Qualcomm 7x30 interrupt controller driver. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 1de238e0eb5181bdeb842d7ea8edebd52c2a9c3a Author: Gregory Bean Date: Fri Apr 30 22:15:16 2010 -0700 msm: add tlmm support for gpio. GPIO support for Qualcomm SOCs requires interaction with the radio (baseband processor). This API allows the different boards to enable GPIO through the radio processor in a generic way. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 5e96da5d5074eae3b94d4abadfc114febb6e2a51 Author: Daniel Walker Date: Wed May 12 13:43:28 2010 -0700 msm: generalize clock support. The 'PCOM' method of clock control (commands issued to the radio CPU) is shared across several (but not all) Qualcomm SOCs. Generalize this clock mechanism so these other SOCs can be added. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit ec4d79255c684a74ade2f2394b9f9a669cee0036 Author: Gregory Bean Date: Fri Apr 30 21:59:38 2010 -0700 msm: add sirc interrupt controller driver. Scorpion-based SOCs from Qualcomm use a different interrupt controller 'sirc'. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit d2e753bf935bb67fcddfd64017d2b302d6e2330d Author: Gregory Bean Date: Fri Apr 30 21:33:38 2010 -0700 msm: generialize iomap to support multiple SOCs. msm_iomap.h is specific to the MSM7x00 series devices. Generalize this in preparation to support more devices. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 8f90c7b60d487866841bfa2fd51792873e54a3a5 Author: Gregory Bean Date: Fri Apr 30 21:33:38 2010 -0700 msm: generialize IRQ to support multiple SOCs. irqs.h is specific to the MSM7x00 series devices. Generalize this in preparation to support more devices. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit 0a8cff388a3841ec2e6c71d1f3c2535b24811c7d Author: Gregory Bean Date: Fri Apr 30 21:21:24 2010 -0700 msm: generalization to support multiple SOCs. devices.c is specific to the MSM7x00 series of SOCs. Rename appropriately in preparation to support more devices. Signed-off-by: Gregory Bean Signed-off-by: David Brown Signed-off-by: Daniel Walker Signed-off-by: Abhijeet Dharmapurikar Signed-off-by: Stepan Moskovchenko commit baa456331738b4e76a92318b62b354377a30ad80 Merge: aa3e557 4462dc0 Author: Steve French Date: Thu May 13 22:19:32 2010 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: fs/cifs/inode.c commit e7874c996b8591f59d78efa519031dab5b58723b Merge: 4a6346d 736d58e Author: David S. Miller Date: Thu May 13 14:14:10 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 5d2be7cb198a0a6bc6088d3806fb7261b184ad89 Author: Kirill Smelkov Date: Thu May 13 14:39:25 2010 +0400 perf trace scripts: Fix typos in perf-trace-python.txt option option -> option special special -> special Signed-off-by: Kirill Smelkov Cc: Tom Zanussi LKML-Reference: <1273747165-17242-1-git-send-email-kirr@mns.spb.ru> Signed-off-by: Arnaldo Carvalho de Melo commit 2e6cdf996ba43ce0b090ffbf754f83e17362cd69 Author: Stephane Eranian Date: Wed May 12 10:40:01 2010 +0200 perf tools: change event inheritance logic in stat and record By default, event inheritance across fork and pthread_create was on but the -i option of stat and record, which enabled inheritance, led to believe it was off by default. This patch fixes this logic by inverting the meaning of the -i option. By default inheritance is on whether you attach to a process (-p), a thread (-t) or start a process. If you pass -i, then you turn off inheritance. Turning off inheritance if you don't need it, helps limit perf resource usage as well. The patch also fixes perf stat -t xxxx and perf record -t xxxx which did not start the counters. Acked-by: Frederic Weisbecker Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <4bea9d2f.d60ce30a.0b5b.08e1@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 8a0ecfb8b47dc765fdf460913231876bbc95385e Author: Frederic Weisbecker Date: Thu May 13 19:47:16 2010 +0200 perf hist: Fix missing getline declaration hist.c needs to include util.h so that it gets stdio.h inclusion with __GNU_SOURCE defined. Fixes: util/hist.c: In function ‘hist_entry__parse_objdump_line’: util/hist.c:931: erreur: implicit declaration of function ‘getline’ util/hist.c:931: erreur: nested extern declaration of ‘getline’ Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras LKML-Reference: <1273772836-11533-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo commit 8769e1c7177fd9f6981042bcc6c2851c99a4a7e7 Author: Frederic Weisbecker Date: Thu May 13 19:22:58 2010 +0200 perf hist: Fix hists__browse no-newt case Fix mistake in a parameter type of the no-newt hists__browse() version. Fixes: builtin-report.c: In function ‘__cmd_report’: builtin-report.c:314: erreur: incompatible type for argument 1 of ‘hists__browse’ Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras LKML-Reference: <1273771378-8577-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo commit 7735227e76e1660e448ec66c30e7bfd06f7cd9b7 Author: Thomas Koeller Date: Tue May 11 17:06:49 2010 +0200 DM365: Added more PINMUX configurations for AEMIF More complete AEMIF support for boards. Signed-off-by: Thomas Koeller Signed-off-by: Kevin Hilman commit 0efe2b7442caaf087e56ae9b68fa5f61f4761fa8 Author: Thomas Koeller Date: Tue May 11 17:06:48 2010 +0200 DM365: Make CLKOUTx available Added PINMUX configurations for the CLKOUT0 .. CLKOUT2 functions, for boards that want to use these clocks. Signed-off-by: Thomas Koeller Signed-off-by: Kevin Hilman commit 2168e76d6ba061fcc95095a3f54ceef8588cbb90 Author: Thomas Koeller Date: Tue May 11 17:06:47 2010 +0200 DM365: Added PINMUX definitions for GPIO30..32 Board code may want to use them. Signed-off-by: Thomas Koeller Signed-off-by: Kevin Hilman commit bcd6a1c695c8b404bfde22b276186ac52a20291b Author: Cyril Chemparathy Date: Fri May 7 17:06:39 2010 -0400 Davinci: iotable based ioremap() interception This patch allows for a more flexible ioremap() interception based on iotable contents. With this patch, the ioremap() interception code can properly translate addresses only after davinci_soc_info has been initialized. Consequently, in soc-specific init functions, davinci_common_init() has to happen before any ioremap() attempts. The da8xx init sequence has been suitably modified to meet this restriction. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 779b0d53ca41873d59225eb776c5d4493a0abd0f Author: Cyril Chemparathy Date: Fri May 7 17:06:38 2010 -0400 Davinci: pinmux - use ioremap() This patch modifies the pinmux implementation so as to ioremap() the pinmux register area on first use. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit bd808947040ba53b2b0e52dde598a9414fb27bba Author: Cyril Chemparathy Date: Fri May 7 17:06:37 2010 -0400 Davinci: aintc/cpintc - use ioremap() This patch implements the following: - interrupt initialization uses ioremap() instead of passing a virtual address via davinci_soc_info. - machine definitions directly point to cp_intc_init() or davinci_irq_init() - davinci_intc_type and davinci_intc_base now get initialized in controller specific init functions instead of davinci_common_init() - minor fix in davinci_irq_init() to use intc_irq_num instead of DAVINCI_N_AINTC_IRQ Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit e4c822c7e98cdda78b10a696b030fc20b22dcab4 Author: Cyril Chemparathy Date: Fri May 7 17:06:36 2010 -0400 Davinci: psc - use ioremap() This patch modifies the psc and clock control code to use ioremap()ed registers. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 1bcd38ad2de4c1cd30387c588dfb28d637d4111d Author: Cyril Chemparathy Date: Fri May 7 17:06:35 2010 -0400 Davinci: timer - use ioremap() This patch eliminates IO_ADDRESS() usage for Davinci timer definitions. The timer code has correspondingly been modified to ioremap() MMRs instead. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 3347db8392486a1b52aab980cc445cf505c36d45 Author: Cyril Chemparathy Date: Fri May 7 17:06:34 2010 -0400 Davinci: jtag_id - use ioremap() This patch replaces the jtag id base info in davinci_soc_info with a physical address which is then ioremap()ed within common code. This patch (in combination with a similar change for PSC) will allow us to eliminate the SYSCFG nastiness in DA8xx code. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit db6db5d8474b16811566e0e919d060e2856d5ad9 Author: Cyril Chemparathy Date: Fri May 7 17:06:33 2010 -0400 Davinci: da8xx: rtc - use ioremap This patch modifies the RTC unlock code to use ioremap() maps instead of IO_ADDRESS() translation. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit b8d44293952e4b32b8595d924a377351f3cd1565 Author: Cyril Chemparathy Date: Fri May 7 17:06:32 2010 -0400 Davinci: gpio - use ioremap() This patch modifies the gpio_base definition in davinci_soc_info to be a physical address, which is then ioremap()ed by the gpio initialization function. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit a6374f53405b719c767c6318fe052a6d8f32cd89 Author: Sekhar Nori Date: Mon May 10 12:41:19 2010 +0530 davinci: edma: fix coding style issue related to breaking lines In the edma driver, most of the long lines in 'if condition' are broken after the logical operator '&&' except two instances. This patch fixes that to bring consistency across the file. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit d78a9494fe8b63e2ec1e2284e45a8d709c4d02c0 Author: Sekhar Nori Date: Mon May 10 12:41:18 2010 +0530 davinci: edma: use BIT() wherever possible This patch replaces occurences of (1 << x) with BIT(x) as it makes for much better reading. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 4dc6ec00f6347b72312fa41dfc587d5302b05544 Author: J. Bruce Fields Date: Mon Apr 19 15:11:28 2010 -0400 nfsd4: implement reclaim_complete This is a mandatory operation. Also, here (not in open) is where we should be committing the reboot recovery information. Signed-off-by: J. Bruce Fields commit ab707e156593ff7fffd615757332dbff6616836a Author: Benny Halevy Date: Wed May 12 00:14:06 2010 +0300 nfsd4: nfsd4_destroy_session must set callback client under the state lock nfsd4_set_callback_client must be called under the state lock to atomically set or unset the callback client and shutting down the previous one. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit d76829889ac4250a18cfcc1a606bb256bb9c570c Author: Benny Halevy Date: Wed May 12 00:13:54 2010 +0300 nfsd4: keep a reference count on client while in use Get a refcount on the client on SEQUENCE, Release the refcount and renew the client when all respective compounds completed. Do not expire the client by the laundromat while in use. If the client was expired via another path, free it when the compounds complete and the refcount reaches 0. Note that unhash_client_locked must call list_del_init on cl_lru as it may be called twice for the same client (once from nfs4_laundromat and then from expire_client) Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 07cd4909a6c0c275ef42fd27748226975919e336 Author: Benny Halevy Date: Wed May 12 00:13:41 2010 +0300 nfsd4: mark_client_expired Mark the client as expired under the client_lock so it won't be renewed when an nfsv4.1 session is done, after it was explicitly expired during processing of the compound. Do not renew a client mark as expired (in particular, it is not on the lru list anymore) Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 46583e2597af649f134462d2f2c1be5e6689198d Author: Benny Halevy Date: Wed May 12 00:13:29 2010 +0300 nfsd4: introduce nfs4_client.cl_refcount Currently just initialize the cl_refcount to 1 and decrement in expire_client(), conditionally freeing the client when the refcount reaches 0. To be used later by nfsv4.1 compounds to keep the client from timing out while in use. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 736d58e3a2245ac2779fe0f278f8735bcf33ca8d Author: Joe Perches Date: Thu May 13 15:16:27 2010 +0200 netfilter: remove unnecessary returns from void function()s This patch removes from net/ netfilter files all the unnecessary return; statements that precede the last closing brace of void functions. It does not remove the returns that are immediately preceded by a label as gcc doesn't like that. Done via: $ grep -rP --include=*.[ch] -l "return;\n}" net/ | \ xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }' Signed-off-by: Joe Perches [Patrick: changed to keep return statements in otherwise empty function bodies] Signed-off-by: Patrick McHardy commit 654d0fbdc8fe1041918741ed5b6abc8ad6b4c1d8 Author: Stephen Hemminger Date: Thu May 13 15:02:08 2010 +0200 netfilter: cleanup printk messages Make sure all printk messages have a severity level. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit af5676039a9479e6ff42c6aab9fac1149ac9597f Author: Stephen Hemminger Date: Thu May 13 15:00:20 2010 +0200 netfilter: change NF_ASSERT to WARN_ON Change netfilter asserts to standard WARN_ON. This has the benefit of backtrace info and also causes netfilter errors to show up on kerneloops.org. Signed-off-by: Stephen Hemminger Signed-off-by: Patrick McHardy commit e94c67436efa22af7d8b7d19c885863246042543 Author: Bart De Schuymer Date: Thu May 13 14:55:34 2010 +0200 netfilter: bridge-netfilter: fix crash in br_nf_forward_finish() [ 4593.956206] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 [ 4593.956219] IP: [] br_nf_forward_finish+0x154/0x170 [bridge] [ 4593.956232] PGD 195ece067 PUD 1ba005067 PMD 0 [ 4593.956241] Oops: 0000 [#1] SMP [ 4593.956248] last sysfs file: /sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:08/ATK0110:00/hwmon/hwmon0/temp2_label [ 4593.956253] CPU 3 ... [ 4593.956380] Pid: 29512, comm: kvm Not tainted 2.6.34-rc7-net #195 P6T DELUXE/System Product Name [ 4593.956384] RIP: 0010:[] [] br_nf_forward_finish+0x154/0x170 [bridge] [ 4593.956395] RSP: 0018:ffff880001e63b78 EFLAGS: 00010246 [ 4593.956399] RAX: 0000000000000608 RBX: ffff880057181700 RCX: ffff8801b813d000 [ 4593.956402] RDX: 0000000000000000 RSI: 0000000000000002 RDI: ffff880057181700 [ 4593.956406] RBP: ffff880001e63ba8 R08: ffff8801b9d97000 R09: ffffffffa0335650 [ 4593.956410] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8801b813d000 [ 4593.956413] R13: ffffffff81ab3940 R14: ffff880057181700 R15: 0000000000000002 [ 4593.956418] FS: 00007fc40d380710(0000) GS:ffff880001e60000(0000) knlGS:0000000000000000 [ 4593.956422] CS: 0010 DS: 002b ES: 002b CR0: 000000008005003b [ 4593.956426] CR2: 0000000000000018 CR3: 00000001ba1d7000 CR4: 00000000000026e0 [ 4593.956429] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 4593.956433] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 4593.956437] Process kvm (pid: 29512, threadinfo ffff8801ba566000, task ffff8801b8003870) [ 4593.956441] Stack: [ 4593.956443] 0000000100000020 ffff880001e63ba0 ffff880001e63ba0 ffff880057181700 [ 4593.956451] <0> ffffffffa0335650 ffffffff81ab3940 ffff880001e63bd8 ffffffffa03350e6 [ 4593.956462] <0> ffff880001e63c40 000000000000024d ffff880057181700 0000000080000000 [ 4593.956474] Call Trace: [ 4593.956478] [ 4593.956488] [] ? br_nf_forward_finish+0x0/0x170 [bridge] [ 4593.956496] [] NF_HOOK_THRESH+0x56/0x60 [bridge] [ 4593.956504] [] br_nf_forward_arp+0x112/0x120 [bridge] [ 4593.956511] [] nf_iterate+0x64/0xa0 [ 4593.956519] [] ? br_forward_finish+0x0/0x60 [bridge] [ 4593.956524] [] nf_hook_slow+0x6c/0x100 [ 4593.956531] [] ? br_forward_finish+0x0/0x60 [bridge] [ 4593.956538] [] ? __br_forward+0x0/0xc0 [bridge] [ 4593.956545] [] __br_forward+0x6d/0xc0 [bridge] [ 4593.956550] [] ? skb_clone+0x3e/0x70 [ 4593.956557] [] deliver_clone+0x32/0x60 [bridge] [ 4593.956564] [] br_flood+0xa6/0xe0 [bridge] [ 4593.956571] [] ? __br_forward+0x0/0xc0 [bridge] Don't call nf_bridge_update_protocol() for ARP traffic as skb->nf_bridge isn't used in the ARP case. Reported-by: Stephen Hemminger Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit 2a847513cdecd517f7efc06296c539c3a936cf98 Author: Linus Walleij Date: Fri May 7 10:03:02 2010 +0100 ARM: 6107/1: plat-nomadik: use the MTU clocksrc for sched_clock This provides some serious scheduling for the Nomadik family by introducing a sched_clock() using the MTU clock source in the same manner as e.g. OMAP or U300. This type of solutions has been discussed at no end in the past, however we need this resolution for making measurements and using HRTimers. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 4fec9978822a66b25f5645eb20c115034a18cfd1 Author: Mika Westerberg Date: Tue May 11 15:34:54 2010 +0100 ARM: 6124/1: ep93xx: SPI driver platform support code This patch adds platform side support code for the EP93xx SPI driver. This includes clock, resources and muxing. There is a new function: ep93xx_register_spi() which can be used by board support code to register new SPI devices for the board. This patch depends on patch 5998/1 ep93xx: added chip revision reading function Cc: Ryan Mallon Cc: David Brownell Cc: Grant Likely Signed-off-by: Mika Westerberg Acked-by: H Hartley Sweeten Acked-by: Martin Guy Signed-off-by: Russell King commit a71ba09655d197f22938fffa6f5d210ff5134f98 Author: Paul Mundt Date: Thu May 13 18:42:25 2010 +0900 sh: fixup the docbook paths for clock framework shuffling. Now that the definitions have been consolidated in an alternate header, update the template accordingly. Signed-off-by: Paul Mundt commit b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7 Merge: 209791b 06fe53b Author: Paul Mundt Date: Thu May 13 18:02:28 2010 +0900 Merge branch 'sh/driver-core' commit 06fe53beb636294587d8e94ef83c06cef07c21fd Author: Paul Mundt Date: Thu May 13 17:56:56 2010 +0900 driver core: Early dev_name() depends on slab_is_available(). The early dev_name() setup needs to do an allocation which can only be satisfied under slab_is_available() conditions. Some of the early platform drivers may be initialized before this point, and those still need to contend themselves with an empty dev_name. This fixes up a regression with the SH earlyprintk which was bailing out prior to hitting the early probe path due to not being able to satisfy the early allocation. Other early platform drivers (such as the early timers) that need to match the dev name are sufficiently late that allocations are already possible. Signed-off-by: Paul Mundt commit 74b8721099992b76d3faff78cb8a5d13c65c3529 Merge: 4bddaf6 baffe16 Author: Russell King Date: Thu May 13 09:56:24 2010 +0100 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit 209791b2cc3cdaf0f6ff49c25db975f8bbf573dd Merge: ef4ed97 4b478ee Author: Paul Mundt Date: Thu May 13 17:48:13 2010 +0900 Merge branch 'sh/highmem' commit ef4ed97d6bd91aa41907181e80a7feaf2721719a Merge: c5eb5b3 2182325 Author: Paul Mundt Date: Thu May 13 17:48:05 2010 +0900 Merge branch 'sh/lmb' Conflicts: arch/sh/kernel/setup.c commit c5eb5b372e7ea18a5eeb6b5192a6369967cb1afe Merge: 15f2a79 f5ca6d4 Author: Paul Mundt Date: Thu May 13 17:45:44 2010 +0900 Merge branch 'sh/clkfwk' commit f5ca6d4cbd49dbb6e179a71fa610eb321a3e9951 Author: Guennadi Liakhovetski Date: Tue May 4 14:15:09 2010 +0000 sh: simplify WARN usage in SH clock driver Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 03c5ecd13cfe308a521e40e6dec6059314f3341b Author: Kuninori Morimoto Date: Thu May 13 01:08:37 2010 +0000 sh: Check return value of clk_get on ms7724 Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 103058536300f80ec54f2a8c9209d066925416fd Author: Kuninori Morimoto Date: Thu May 13 01:08:33 2010 +0000 sh: Check return value of clk_get on ecovec24 Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit fa676ca3944e4459ea3d133eabc923c8ab5d2576 Author: Magnus Damm Date: Tue May 11 13:29:34 2010 +0000 sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c Move the CPG helpers to drivers/sh/clk-cpg.c V2. This to allow SH-Mobile ARM to share the code with SH. All functions except the legacy CPG stuff is moved. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8b5ee113e1b97097e992a0301d0cac2530b31fc2 Author: Magnus Damm Date: Tue May 11 13:29:25 2010 +0000 sh: move sh clock.c contents to drivers/sh/clk. This patch is V2 of the SH clock framework move from arch/sh/kernel/cpu/clock.c to drivers/sh/clk.c. All code except the following functions are moved: clk_init(), clk_get() and clk_put(). The init function is still kept in clock.c since it depends on the SH-specific machvec implementation. The symbols clk_get() and clk_put() already exist in the common ARM clkdev code, those symbols are left in the SH tree to avoid duplicating them for SH-Mobile ARM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d28bdf05f72238d626c8d06b61049f6df8d78e70 Author: Magnus Damm Date: Tue May 11 13:29:17 2010 +0000 sh: move sh asm/clock.h contents to linux/sh_clk.h V2 This patch is V2 of the clock framework move from arch/sh/include/asm/clock.h to include/linux/sh_clk.h and updates the include paths for files that will be shared between SH and SH-Mobile ARM. The file asm/clock.h is still kept in this version, this to depend on as few files as possible at this point. We keep SH specific stuff in there. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 441c2440aba2efd8d0f48a5e3357deec92283d62 Author: Magnus Damm Date: Tue May 11 09:37:12 2010 +0000 sh: remove unused clock lookup Now when all clocks are registered using clkdev, get rid of the special SH-specific clock lookup. Also ditch the unused module ref counting code. This patch syncs the SH behaviour with ARM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 67bbabbc8680f53c7b8780d991f655c5cbb88700 Author: Magnus Damm Date: Tue May 11 09:37:05 2010 +0000 sh: switch boards to clkdev This patch converts the remaining board clocks to use clkdev for lookup if needed. The unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 9c352bcab7f28e472b06c91d57210b93e08f0fbb Author: Magnus Damm Date: Tue May 11 09:36:57 2010 +0000 sh: switch sh4-202 to clkdev This patch converts the remaining sh4-202 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 38803d7626c3903dea98d23dfe012e98975503f3 Author: Magnus Damm Date: Tue May 11 09:36:48 2010 +0000 sh: switch shx3 to clkdev This patch converts the remaining shx3 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f0e7f90223108e32f6b28393e4ab892209922e0b Author: Magnus Damm Date: Tue May 11 09:36:40 2010 +0000 sh: switch sh7757 to clkdev This patch converts the remaining sh7757 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d6a94217fb4b4d193d6064c524df22f97bd49136 Author: Magnus Damm Date: Tue May 11 09:36:32 2010 +0000 sh: switch sh7763 to clkdev This patch converts the remaining sh7763 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 29497ec42c7c3a42682e5538ca7f96cd9a00fcbb Author: Magnus Damm Date: Tue May 11 09:36:24 2010 +0000 sh: switch sh7780 to clkdev This patch converts the remaining sh7780 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2cf79bea43491722a23b63a6f4e54d3804c10ed6 Author: Magnus Damm Date: Tue May 11 09:36:16 2010 +0000 sh: switch sh7786 to clkdev This patch converts the remaining sh7786 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4a81fe625efc8b9122eb4473dab31fa90e07a381 Author: Magnus Damm Date: Tue May 11 09:36:03 2010 +0000 sh: switch sh7785 to clkdev This patch converts the remaining sh7785 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 59aa69d9c20b1ee15fa26aa6631b555aaef91323 Author: Magnus Damm Date: Tue May 11 09:35:55 2010 +0000 sh: switch sh7366 to clkdev This patch converts the remaining sh7366 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8249a3113094b826c5010d27c8cf07a395be2abc Author: Magnus Damm Date: Tue May 11 09:35:45 2010 +0000 sh: switch sh7343 to clkdev This patch converts the remaining sh7343 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 925bb17b725ba84159bac9defebac0cb46e01e4f Author: Magnus Damm Date: Tue May 11 09:35:38 2010 +0000 sh: switch sh7722 to clkdev This patch converts the remaining sh7722 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 00522ac3b11f52cce6358516dd8695a588082a73 Author: Magnus Damm Date: Tue May 11 09:35:27 2010 +0000 sh: switch sh7723 to clkdev This patch converts the remaining sh7723 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b3f9f630d35f7eeec49221690991e834d7b27e05 Author: Magnus Damm Date: Tue May 11 09:35:19 2010 +0000 sh: switch sh7724 to clkdev This patch converts the remaining sh7724 clocks to use clkdev for lookup. The now unused name and id from struct clk are also removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 53041f020b31dd83aa4d0bdc78015bee58b1afe8 Author: Magnus Damm Date: Tue May 11 09:35:11 2010 +0000 sh: switch legacy clocks to clkdev This patch converts the legacy clocks to register using clkdev. Also the clock name is removed. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 914ebf0bbb24696cd7eecee8942efecca5653126 Author: Magnus Damm Date: Tue May 11 07:06:13 2010 +0000 sh: get rid of div4 clock name Remove the name parameter from SH_CLK_DIV4() and adjust the processor specific code. The lookup happens using clkdev so the name is unused. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1fe3d19883b1f6a243b03456a47e0fdc9629bea6 Author: Magnus Damm Date: Tue May 11 07:06:05 2010 +0000 sh: sh7786 div4 clkdev lookup Add sh7786 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 956f7f442afce6df3fa2b3e77a40ecdb7fc4c9fc Author: Magnus Damm Date: Tue May 11 07:05:58 2010 +0000 sh: sh7785 div4 clkdev lookup Add sh7785 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 40956e7569c4d03da69748e333dded74a608af56 Author: Magnus Damm Date: Tue May 11 07:05:50 2010 +0000 sh: sh7366 div4 clkdev lookup Add sh7366 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f8ef178c88cc21b16e81dab09d1def220e9eb49e Author: Magnus Damm Date: Tue May 11 07:05:42 2010 +0000 sh: sh7343 div4 clkdev lookup Add sh7343 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1c4cde2e6d3bcd48635f2f68ca8f03290b5cf2e7 Author: Magnus Damm Date: Tue May 11 07:05:32 2010 +0000 sh: sh7724 div4 clkdev lookup Add sh7724 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3f6623497eee32161b0558c02963fa793988b6a0 Author: Magnus Damm Date: Tue May 11 07:05:25 2010 +0000 sh: sh7723 div4 clkdev lookup Add sh7723 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit a3e9f2b72fbcb7c4266f4b7ef1814bb8806c1fac Author: Magnus Damm Date: Tue May 11 07:05:17 2010 +0000 sh: sh7722 div4 clkdev lookup Add sh7722 DIV4 clocks to the clkdev lookup list. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d40db0c4a63c3af44fd31a7c47cc4a11a44befc7 Author: Magnus Damm Date: Tue May 11 07:05:09 2010 +0000 sh: div4 reparent workaround Update the div4 set_parent() callback to use the flags instead of name to determine parent index. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c77a9c3edee079fe0411d98cfb9d872bc336ee32 Author: Magnus Damm Date: Tue May 11 05:00:47 2010 +0000 sh: get rid of mstp32 clock name and id Remove the name and the id from SH_CLK_MSTP32(). Now when lookups are handled by clkdev they are not needed anymore. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d8ef3ccc1c99ae51128b28aaed6e8afc43af71ff Author: Magnus Damm Date: Tue May 11 05:00:38 2010 +0000 sh: sh7786 mstp32 clkdev lookup Add sh7786 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8bc23d95a0cd639e8766e522e5b9cfd5345bd3e2 Author: Magnus Damm Date: Tue May 11 05:00:30 2010 +0000 sh: sh7786 mstp32 index rework This patch adds sh7786 MSTP enums for mstp_clks[] index. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit eb85dcaa3e386eb5f1b9b48f707088538a789d58 Author: Magnus Damm Date: Tue May 11 05:00:22 2010 +0000 sh: sh7785 mstp32 clkdev lookup Add sh7785 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5b10a27e9f0aa7282e3b8fd470e71201d6f5764c Author: Magnus Damm Date: Tue May 11 05:00:14 2010 +0000 sh: sh7785 mstp32 index rework This patch adds sh7785 MSTP enums for mstp_clks[] index. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b87cecef4ce4250c9bc44af04e60d71000d44581 Author: Magnus Damm Date: Tue May 11 05:00:06 2010 +0000 sh: sh7366 mstp32 clkdev lookup Add sh7366 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4780683a135abbe17f7867d295cd542cde5678b6 Author: Magnus Damm Date: Tue May 11 04:59:58 2010 +0000 sh: sh7366 mstp32 index rework This patch adds sh7366 MSTP enums for mstp_clks[] index. The MSTP bit for the SIU is removed as well since it is not included in the documentation. Most likely an old copy paste error from sh7722. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 25637f7ae0324c636bde172d9e92bc00d4f0121d Author: Magnus Damm Date: Tue May 11 04:59:50 2010 +0000 sh: sh7343 mstp32 clkdev lookup Add sh7343 MSTP clocks to the clkdev lookup table. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e8b96918a45732551b33764b0b526beac3866d58 Author: Magnus Damm Date: Tue May 11 04:59:43 2010 +0000 sh: sh7343 mstp32 index rework This patch adds sh7343 MSTP enums for mstp_clks[] index. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 720019908fd5a1bb442bb0a35a6027ba21864d25 Author: Cyrill Gorcunov Date: Wed May 12 21:42:42 2010 +0400 x86, perf: P4 PMU -- use hash for p4_get_escr_idx() Linear search over all p4 MSRs should be fine if only we would not use it in events scheduling routine which is pretty time critical. Lets use hashes. It should speed scheduling up significantly. v2: Steven proposed to use more gentle approach than issue BUG on error, so we use WARN_ONCE now Signed-off-by: Cyrill Gorcunov Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Lin Ming LKML-Reference: <20100512174242.GA5190@lenovo> Signed-off-by: Ingo Molnar commit 4a6346d4ea63b5e1390babf22f1cc0f113d8082b Author: Dimitris Michailidis Date: Mon May 10 15:58:09 2010 +0000 cxgb4: report GRO stats with ethtool -S Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit f1a051b93090ad920e88748023ab0dea3a6e2ad7 Author: Dimitris Michailidis Date: Mon May 10 15:58:08 2010 +0000 cxgb4: report the PCIe link speed Report the PCIe link speed (2.5 or 5 Gbps). Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit f8f5aafa960883bc3f1b8f85f1cf8199d0c85879 Author: Dimitris Michailidis Date: Mon May 10 15:58:07 2010 +0000 cxgb4: configure HW VLAN extraction through FW HW VLAN extraction needs to be configured through FW to work correctly in virtualization environments. Remove the direct register manipulation and rely on FW. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 10df0b9116e2039d5585a196753e5f36d7afcba2 Author: Bruce Allan Date: Mon May 10 15:02:52 2010 +0000 e1000e: add PCI device id to enable support for 82567V-4 Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e98cac447cc1cc418dff1d610a5c79c4f2bdec7f Author: Bruce Allan Date: Mon May 10 15:02:32 2010 +0000 e1000e: Fix/cleanup PHY reset code for ICHx/PCHx i) Fixes a bug where e1000_sw_lcd_config_ich8lan() was calling e1000_lan_init_done_ich8lan() to poll the STATUS.LAN_INIT_DONE bit to make sure the MAC had completed the PHY configuration. However, e1000_lan_init_done_ich8lan() had already been called in one of the two places where PHY reset occurs for ICHx/PCHx parts, which caused the second call to busy-wait for 150 msec because the LAN_INIT_DONE bit had already been checked and cleared. ii) Cleanup the two separate PHY reset code paths, i.e. the full-chip reset in e1000_reset_hw_ich8lan() and the PHY-only reset in e1000_phy_hw_reset_ich8lan(). There was duplicate code in both paths to be performed post-reset that are now combined into one new function - e1000_post_phy_reset_ich8lan(). This cleanup also included moving the clearing of the PHY Reset Asserted bit in the STATUS register (now done for all ICH/PCH parts) and the check for the indication from h/w that basic configuration has completed back to where it previously was in e1000_get_cfg_done_ich8lan(). iii) Corrected a few comments Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a305595b127fdbe7ab5ba458f7ee470a82a3b82c Author: Bruce Allan Date: Mon May 10 15:02:12 2010 +0000 e1000e: move settting of flow control refresh timer to link setup code The flow control refresh timer value needs to be saved off so that it can be programmed into the approrpiate register when applicable but without a reset, e.g. when changing flow control parameters via ethtool. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a65a4a0d51eaf9e5715dc24f8820c8689c3719a5 Author: Bruce Allan Date: Mon May 10 15:01:51 2010 +0000 e1000e: fix checks for manageability enabled and management pass-through The mac->arc_subsystem was being incorrectly used to flag whether or not manageability was enabled when it should only be used to state whether the ARC (Host interface) subsystem is available on a particular MAC _and_ only valid when any manageability is enabled. The ARC subsystem is currently only available on 80003es2lan and 82573 parts supported by the driver. A new flag, has_fwsm, is introduced to be used when checking if manageability is enabled but only on parts that acutally have an FWSM register. While the above parts have an FWSM register, there are other parts that have FWSM but do not have support for the ARC subsystem, namely 82571/2 and ICHx/PCH. And then there are parts that have manageability, but do not have either FWSM register or support for the ARC subsystem - these are 82574 and 82583. For 80003es2lan, 82571/2/3 and ICH/PCH parts, this patch makes no functional changes, it only corrects the usage of the manageability flags. For 82574 and 82583, it fixes the incorrect accesses of the non-existent FWSM register and ARC subsystem as well as corrects the check for management pass-through. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit eab50ffb222808b5053a82325be3e5d26faa08df Author: Bruce Allan Date: Mon May 10 15:01:30 2010 +0000 e1000e: Incorrect function pointer set for force_speed_duplex on 82577 The force_speed_duplex function pointer was incorrectly set. Instead of calling the 82577-specific version it was calling the m88 version which, among other incorrect things, reset the PHY causing autonegotiation to be re-enabled in the PHY resulting in the link defaulting to half-duplex. The 82577-specific force_speed_duplex function also had an issue where it disabled Auto-MDI-X which caused the link to not come up. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8b802a7e94c2ed9c6032a88b3ab9860c55cd6378 Author: Bruce Allan Date: Mon May 10 15:01:10 2010 +0000 e1000e: Cleanup e1000_sw_lcd_config_ich8lan() After every reset all ICH/PCH parts call this function which acquires the swflag, performs a workaround on applicable parts and releases the swflag. There is no reason for parts for which this workaround is not applicable to acquire and release the swflag so the function should just return without doing anything for these parts. This also provides for the indentation of most of the function contents to be shifted left cleaning up the code. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 757c530407a92fd460d557af59ba86920cf025cb Author: Bruce Allan Date: Mon May 10 15:00:50 2010 +0000 e1000e: Remove EN_MAC_ADDR_FILTER check from enable_mng_pass_thru check Patch addresses issues when manageability passthrough is enabled, but the MAC_ADDR_FILTER bit is not set in the MANC register. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9c5e209d4ba00eb09922f0f56136474372395c2b Author: Bruce Allan Date: Mon May 10 15:00:31 2010 +0000 e1000e: cleanup multiple common exit points ...in e1000_update_nvm_checksum_ich8lan(). Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 52a9b2319628e2cbbff7abc4f1092f4597c75a4f Author: Bruce Allan Date: Mon May 10 15:00:10 2010 +0000 e1000e: s/w initiated LSC MSI-X interrupts not generated; no transmit In MSI-X mode when an IMPI SoL session was active (i.e. the PHY reset was blocked), the LSC interrupt generated by s/w to start the watchdog which started the transmitter was not getting fired by the hardware because bit 24 (the 'other' cause bit) also needed to be set. Without an active SoL session, the PHY was reset which caused the h/w to fire the LSC interrupt. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cd791618c28f524598bcfa941d948b1126a2394a Author: Bruce Allan Date: Mon May 10 14:59:51 2010 +0000 e1000e: initialize manageability (IPMI) pass-through in 82574/82583 82574/82583 uses different registers/bits to setup manageability filters than all other parts supported by e1000e; set them accordingly for IPMI pass-through. Rename the function to better reflect what it does. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 11b08be830078c1cc4af484d0f85c3a010319c97 Author: Bruce Allan Date: Mon May 10 14:59:31 2010 +0000 e1000e: bad state after running ethtool diagnostics with AMT enabled When running ethtool online diagnostics with no open interface, there is a short period of time where the driver relinquishes control of the adapter during which time AMT (manageability firmware) can put the adapter into an unknown state resulting in such things as link test failure, hardware hang, reporting an incorrect link speed, etc. Resetting the adapter during an open() resolves this by putting the adapter into a quiescent state. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4fe4491fc5578019174d0f02d1ae740fce78deac Author: Bruce Allan Date: Mon May 10 14:59:10 2010 +0000 e1000e: use static params to save stack space (part 2) A couple stack cleanups missed in an earlier patch from Jesse. Signed-off-by: Bruce Allan Cc: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit bf47f4b0babe287f250dd720b41ecad9b8f7ac9b Merge: 0b9715e 5b285ca Author: David S. Miller Date: Wed May 12 23:30:45 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6 commit ad56b0797e67df5e04b2f1a1e02900145c5c16f2 Merge: 668eb65 b57f95a Author: Ingo Molnar Date: Thu May 13 08:11:26 2010 +0200 Merge commit 'v2.6.34-rc7' into tracing/core Merge reason: Update from -rc5 to -rc7. Signed-off-by: Ingo Molnar commit 0b9715e64f7d46a9620d4d5042a5e28f5595ed54 Author: Amit Kumar Salecha Date: Tue May 11 23:53:05 2010 +0000 netxen: handle queue manager access Check the access by tools for hardware queue engine and handle it separately than other block registers, otherwise incorrect data is returned. Support for only NX3031 based cards. Acked-by: Dhananjay Phadke Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 14e2cfbb79712f07962be027016868ba487c696b Author: Sucheta Chakraborty Date: Tue May 11 23:53:04 2010 +0000 netxen: to fix onchip memory access. Remove unnecessary remap of the region in bar 0 to access onhip memory for NX3031. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 215387a4b51f346418c285176f752ccf3609b6fb Author: Sucheta Chakraborty Date: Tue May 11 23:53:03 2010 +0000 netxen: remove unnecessary size checks NX3031 have 64bit on card memory. Fix the limit check to 64MB and remove unnecessary 128bit read/write check. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit f8e21f8fe2253e2ed5b9189b9dd5ff7e51af307c Author: Amit Kumar Salecha Date: Tue May 11 23:53:02 2010 +0000 netxen: fix register usage o For NX3031, MSI_MODE, CAPABILITIES_FW and SCRATCHPAD registers are obsolete. These register addresses can be used for different purpose. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 23461e835b3537dd395828b090fb1cb64a198f85 Author: Allan Stephens Date: Tue May 11 14:30:18 2010 +0000 tipc: Reduce footprint by un-inlining tipc_msg_* routines Convert tipc_msg_* inline routines that are more than one line into standard functions, thereby eliminating some repeated code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 3032cca4d5cf885cacc78fae27ddf0c56dbf9963 Author: Allan Stephens Date: Tue May 11 14:30:17 2010 +0000 tipc: Reduce footprint by un-inlining buf_acquire routine Convert buf_acquire inline routine that is more than one line into a standard function, thereby eliminating some repeated code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b274f4ab8e674db1757371a21e7217e0766cb574 Author: Allan Stephens Date: Tue May 11 14:30:16 2010 +0000 tipc: Reduce footprint by un-inlining bearer congestion routine Convert bearer congestion inline routine that is more than one line into a standard function, thereby eliminating some repeated code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 43608edc2dbe83057544cf76b765ecdf63d59e8c Author: Allan Stephens Date: Tue May 11 14:30:15 2010 +0000 tipc: Reduce footprint by un-inlining port list routines Converts port list inline routines that are more than one line into standard functions, thereby eliminating a significant amount of repeated code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 3e22e62b6204414cf31c414d5a91897e2b718135 Author: Allan Stephens Date: Tue May 11 14:30:14 2010 +0000 tipc: Reduce footprint by un-inlining nmap routines Converts nmap inline routines that are more than one line into standard functions, thereby eliminating a significant amount of repeated code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 80e0c33064bd71bd5791c79f28c59a1aee898993 Author: Allan Stephens Date: Tue May 11 14:30:13 2010 +0000 tipc: Reduce footprint by un-inlining address routines Convert address-related inline routines that are more than one line into standard functions, thereby eliminating a significant amount of repeated code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit c68ca7b72017f8f52e7aed0d2a6ecfaede133b6b Author: Allan Stephens Date: Tue May 11 14:30:12 2010 +0000 tipc: add tipc_ prefix to fcns targeted for un-inlining These functions have enough code in them such that they seem like sensible targets for un-inlining. Prior to doing that, this adds the tipc_ prefix to the functions, so that in the event of a panic dump or similar, the subsystem from which the functions come from is immediately clear. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 01fee256a675f6492fc6945bbb9b59640d8705d4 Author: Allan Stephens Date: Tue May 11 14:30:11 2010 +0000 tipc: Relocate trivial link status functions to header file Rather than live in link.c where they can only be used in that file alone, these helper routines are better served by being in link.h Relocated are the following: link_working_working link_working_unknown link_reset_unknown link_reset_reset link_blocked link_congested Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 15e979da7c9ddddd55d2eb81e962dbb2aac51ad1 Author: Allan Stephens Date: Tue May 11 14:30:10 2010 +0000 tipc: remove abstraction for link_max_pkt This is just a straight return of a field; there is no value in the abstraction of hiding it behind a function. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8e1c298c01d4596fa2837913e531a93a791a7bec Author: Allan Stephens Date: Tue May 11 14:30:09 2010 +0000 tipc: Update commenting in TIPC API Eliminate comments in TIPC's main API files that are either obsolete, incorrect, misleading, or unhelpful. It also adds in one new comment. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 107e7be628821dcb78c43adce0331e8ddb40eabd Author: Allan Stephens Date: Tue May 11 14:30:08 2010 +0000 tipc: Add support for "-s" configuration option Provide initial support for displaying overall TIPC status/statistics information at runtime. Currently, only version info for the TIPC kernel module is displayed. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 3aec9cc936217a30dbb45a9b6808a39571674e66 Author: Allan Stephens Date: Tue May 11 14:30:07 2010 +0000 tipc: Rename "multicast-link" to "broadcast-link" Make a cosmetic change to the name displayed for the broadcast link, to better reflect its true nature. Since TIPC utilizes this link to distribute name table information, in addition to multicast messages sent by user applications, the prior name "multicast-link" is no longer appropriate. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 9ccc2eb4e12a39bd8430952b76c56c6267018500 Author: Allan Stephens Date: Tue May 11 14:30:06 2010 +0000 tipc: Eliminate unnecessary initialization in native API send routines Eliminate a couple of instances where TIPC's native API send routines were doing pointless initialization of local variables. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 289464e4fc2ebdef20be5f6b58414136f75107e2 Author: Allan Stephens Date: Tue May 11 14:30:05 2010 +0000 tipc: Prune unused data structures from configuration service Eliminate some unused data structures in the TIPC configuration service that relate to the handling of link subscriptions, which were not supported when TIPC 1.5 was introduced. If and when support for link subscriptions is offered in TIPC, these elements may need to be re-introduced. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b82834e66aabb6e26c2b792a46d44bab346c46fb Author: Allan Stephens Date: Tue May 11 14:30:04 2010 +0000 tipc: Eliminate unused argument in print statement Eliminate an argument in a print statement that has no corresponding format specification. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit df4ef33716232077564024baf0e5f2c74a295dfd Author: Allan Stephens Date: Tue May 11 14:30:03 2010 +0000 tipc: Eliminate obsolete port's "congested_link" field Eliminate a field of the TIPC port structure that is populated, but never referenced. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b3b84d652da3aba06ec26c0570ca138d8c7f1b65 Author: Thomas Abraham Date: Thu May 13 09:27:54 2010 +0900 ARM: S5P6440: Add clocks of type 'struct clksrc_clk'. This patch adds the following. 1. Add new definitions of clock of type 'struct clksrc_clk'. 2. Add gate control function for GATE_SCLK1 which is required for new clock additions. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 39b7781b16614c65a53f275ff63440ea806230e2 Author: Thomas Abraham Date: Thu May 13 09:27:49 2010 +0900 ARM: S5P6440: Rename clkset_mmc_spi to clkset_group1 The clock source options avaialable in the clkset_mmc_spi are applicable to clocks such as sclk_post, sclk_dispcon and sclk_fimgvg. So this set is renamed as clkset_group1 to indicate that it can be used as clock sources for other clocks and not just for sclk_spi and sclk_mmc clocks. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 213907dc1b974019f5eb9c94a1c62b11a515564c Author: Thomas Abraham Date: Thu May 13 09:27:47 2010 +0900 ARM: S5P6440: Add clocks of type 'struct clk'. Add definitions of clocks of type 'struct clk'. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 697f8a9fe7835ba24f2da855c5de4ddbe27aa554 Author: Thomas Abraham Date: Thu May 13 09:27:29 2010 +0900 ARM: S5P6440: Remove usage of clk_p_low and add clk_pclk_low clock The pclk_low clock is of type 'struct clk' whereas on S5P6440, the pclk_low clock is more suitable to be of type 'struct clksrc_clk' (since pclk_low clock is a divided clock of hclk_low clock). This patch modifies the following. 1. Removes the definition and usage of clk_p_clk clock. 2. Adds the clk_pclk_low clock of type 'struct clksrc_clk' clock. 3. Adds clk_pclk_low to the list of system clocks. 4. The clock rate of pclk_low is derived from the clk_pclk_low clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 93ad94db5509ccac65a57f6fc599d61a61767efc Author: Thomas Abraham Date: Thu May 13 09:27:17 2010 +0900 ARM: S5P6440: Remove usage of clk_h_low and add clk_hclk_low clock The clk_h_low clock is of type 'struct clk' whereas on S5P6440, the hclk_low clock is more suitable to be of type 'struct clksrc_clk' (since hclk_low clock is derived from a choice of clock sources and then divided by a divisor). This patch modifies the following. 1. Removes the definition and usage of clk_h_clk clock. 2. Adds the clk_hclk_low clock of type 'struct clksrc_clk' clock. 3. Adds clk_hclk_low to the list of system clocks. 4. The clock rate of hclk_low is derived from the clk_hclk_low clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 47051461ab1cc8049e676902bf1972268bed4b9a Author: Thomas Abraham Date: Thu May 13 09:27:13 2010 +0900 ARM: S5P6440: Remove usage of clk_p and add clk_pclk clock The clk_p clock is of type 'struct clk' whereas on S5P6440, the pclk is more suitable to be of type 'struct clksrc_clk' (since pclk clock is divided version of hclk). This patch modifies the following. 1. Adds the 'clk_pclk' clock which is of type 'struct clksrc_clk'. 2. Adds clk_pclk into the list of sysclks. 3. The clock rate 'pclk' is modified to be derived from clk_pclk. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit e4f44f82691e927a2f5eb582793454e052b920c7 Author: Thomas Abraham Date: Thu May 13 09:27:09 2010 +0900 ARM: S5P6440: Remove usage of clk_h and add clk_hclk clock The clk_h clock is of type 'struct clk' whereas on S5P6440, the hclk is more suitable to be of type 'struct clksrc_clk' (since hclk clock is divided version of armclk) This patch modifies the following. 1. Adds the 'clk_hclk' clock which is of type 'struct clksrc_clk'. 2. Removes all references to the clk_h clock. 3. Addes clk_hclk into the list of sysclks. 4. The clock rate 'hclk' is modified to be derived from clk_hclk. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 9c72d016e2b556e7d8f739b21404f32333fbc5e4 Author: Thomas Abraham Date: Thu May 13 09:27:04 2010 +0900 ARM: S5P6440: Remove usage of clk_arm and add clk_armclk clock The clk_arm clock is of type 'struct clk' whereas on S5P6440, the arm clock is more suitable to be of type 'struct clksrc_clk' (since arm clock is divided version of apll clock). This patch modifies the following. 1. Removes the usage of clk_arm clock (defined in plat-s5p) and defines the new clock 'clk_armclk' of type 'struct clksrc_clk'. 2. Rearranges the assignment of clock rate for the fout_a/m/epll clocks. This will help in calculating the clock rate of fclk from clk_armclk clock and setup the clock rate for fout_m/epll for subsequent patches which depend on it. 3. Modifies the clock rate calculation of fclk to be based on the newly added clk_armclk clock. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 30d58349608c3a31dbea0cc9238f6d8edc21e299 Author: Thomas Abraham Date: Thu May 13 09:26:58 2010 +0900 ARM: S5P6440: Change dout_mpll clock type to clksrc_clk clock type. This patch modifies the following. 1. Modifies the dout_mpll clock type as clksrc_clk clock type. This modification allows the use of common clock code in managing the dout_mpll clock (which otherwise would need custom defined functions such as s5p6440_clk_doutmpll_get_rate). 2. s5p6440_clk_doutmpll_get_rate function is removed as it is no longer needed. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit fb0491146518c24b8ded5f9afa59b1df3749dea9 Author: Thomas Abraham Date: Thu May 13 09:26:49 2010 +0900 ARM: S5P6440: Register apll/mpll/epll mout clocks. This patch modifies the following. 1. Registers the mout_apll clksrc_clk clock. 2. The mout_mpll and mout_epll were registered as 'struct clk' types and then their parents were setup using the s3c_set_clksrc function. This patch reduces the two steps into one by registering the mout_mpll and mout_epll clocks using the s3c_register_clksrc function. 3. As per point 2 above, the init_parents array is no longer required. So the mout clocks are now put together in a new array named 'sysclks'. The sysclks array will list the system level clocks and more clocks will be added to it in the subsequent patches. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 9b7ce2b76265b3bf133aa1919e5022302981dff6 Author: Jan Engelhardt Date: Wed May 12 10:11:35 2010 +0000 netfilter: xtables: add missing depends for xt_TEE Aviod these link-time errors when IPV6=m, XT_TEE=y: net/built-in.o: In function `tee_tg_route6': xt_TEE.c:(.text+0x45ca5): undefined reference to `ip6_route_output' net/built-in.o: In function `tee_tg6': xt_TEE.c:(.text+0x45d79): undefined reference to `ip6_local_out' Signed-off-by: Jan Engelhardt Acked-by: Randy Dunlap Signed-off-by: David S. Miller commit fd76f148ebc67d662f71f00128c8ddb0538168c0 Author: Gertjan van Wingerde Date: Tue May 11 23:51:43 2010 +0200 rt2x00: In debugfs frame dumping allow the TX descriptor to be part of the skb. Preparation for futher cleanups in the area of properly maintaining the skb data without fiddling with the skb->data pointer. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 185e5f77f891d5bc7a0d8c8eb2b1edf6c317edab Author: Gertjan van Wingerde Date: Tue May 11 23:51:41 2010 +0200 rt2x00: Dump beacons under a different identifier than TX frames. This allows for specific identification of beacons in the debugfs frame stream. Preparation for later differences between dumped TX frames and dumped beacons. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 85b7a8b3871bde7885516fed2a1c8da699913318 Author: Gertjan van Wingerde Date: Tue May 11 23:51:40 2010 +0200 rt2x00: Simplify TXD handling of beacons. The handling of tx descriptors for beacons can be simplified by updating write_tx_desc implementations of each driver to write directly to the queue entry descriptor instead of to a provided memory area. This is also a preparation for further clean ups where descriptors are properly reserved in the skb instead of fiddling with the skb data pointer. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit e01f1ec35ff91c8a3f4a3e48a0c8ab476124b973 Author: Gertjan van Wingerde Date: Tue May 11 23:51:39 2010 +0200 rt2x00: Re-order tx descriptor writing code in drivers. Where possible, write the tx descriptor words from start to end, to follow a logical ordering of words. Where this is not possible (in rt2400pci, rt2500pci and rt61pci) add a comment as to why word 0 needs to be written last. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6b97cb04f2766513c57b57f8ac4b44915296230f Author: Gertjan van Wingerde Date: Tue May 11 23:51:38 2010 +0200 rt2x00: Fix beacon descriptor writing for rt61pci. The buffer address descriptor word is not part of the TXINFO structure needed for beacons. The current writing of that word for beacons is therefore an out-of-bounds write. Fix this by only writing the buffer address descriptor word for TX queues. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 878f7045d8ae24f5a9e3a8a7ee5c33d30c30a553 Author: Gertjan van Wingerde Date: Tue May 11 23:51:37 2010 +0200 rt2x00: Consistently name skb frame descriptor skbdesc. The skb frame descriptor is called everywhere skbdesc, except in one place in rt2x00debug_dump_frame. Change that occurence to have consistent naming. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2cb1ba153787e195c62eafc2e794b25509fdd26d Author: Steve Tanner Date: Tue May 11 14:34:16 2010 -0700 ar9170usb: add vendor and device ID for Qwest/Actiontec 802AIN Wireless N USB Network Adapter * add support for the Qwest/Actiontec 802AIN Wireless N USB Network Adapter. lsusb identifies the device as: "ID 1668:1200 Actiontec Electronics, Inc. [hex]" usb_modeswitch package and appropriate rules are required to switch the device from "ID 0ace:20ff ZyDas" Changes-licensed-under: GPL Signed-off-by: Steve Tanner Signed-off-by: John W. Linville commit aca8c6fa46aed6db36043cd2edbdc42fd20c3208 Author: Julia Lawall Date: Tue May 11 20:25:56 2010 +0200 drivers/net/wireless/hostap: Drop memory allocation cast Drop cast on the result of kmalloc and similar functions. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ type T; @@ - (T *) (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\| kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)) // Signed-off-by: Julia Lawall Signed-off-by: John W. Linville commit 058897a4e93a6fc6d331e2ef591b2d6571431265 Author: Abhijeet Kolekar Date: Tue May 11 11:22:11 2010 -0700 mac80211: fix paged defragmentation Paged RX skb patch broke the defragmentation. We need to read hdr again after linearization. It fixes following bug http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2194 Signed-off-by: Zhu, Yi Signed-off-by: Abhijeet Kolekar Signed-off-by: John W. Linville commit ffdc4cbe5b17c83af779f45de8536c6ece297e42 Author: Felix Fietkau Date: Tue May 11 17:23:03 2010 +0200 ath9k_hw: clean up EEPROM endian handling on AR9003 Remove the double swapping of the descriptor data structure, instead keep it little-endian (native format of the eeprom data), and byteswap on access. This allows sparse to verify endian access to the eeprom struct. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9bff0bc4012c7f079b297eb45b47780e3713f367 Author: Felix Fietkau Date: Tue May 11 17:23:02 2010 +0200 ath9k: add debugfs files for reading/writing registers Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1534069491c67619bfaeb25368a1249b669503c3 Author: Felix Fietkau Date: Tue May 11 17:23:01 2010 +0200 ath9k: add debugfs files for reading/writing the rx and tx chainmask Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c8a72c00c6a58186c35901c5fb15584ebc2a081d Author: Felix Fietkau Date: Tue May 11 17:23:00 2010 +0200 ath9k: use debugfs_remove_recursive() instead of keeping pointers to all entries Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8116daf2146d8fbc5d8d925984b3d4fd34dba1b4 Author: Sujith.Manoharan@atheros.com Date: Tue May 11 17:03:36 2010 +0530 ath9k_htc: Fix array overflow Use ENDPOINT_MAX instead of HST_ENDPOINT_MAX. This fixes a stack corruption issue. This is based on a patch sent by Dan Carpenter . Signed-off-by: Dan Carpenter Signed-off-by: Sujith Signed-off-by: John W. Linville commit d8c49ffb2e2a47b23fec7f469435e7b112e2e569 Author: Sujith.Manoharan@atheros.com Date: Tue May 11 16:24:43 2010 +0530 ath9k_htc: Fix target ready race condition The ready message from the target could be processed before the host HW init has completed. In this case, htc_process_target_rdy() would assume the target has timed out, when it hasn't. Fix this by checking if the target has sent the ready message properly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 47fce026d5de5d11e161da73208171e9c91b659a Author: Sujith.Manoharan@atheros.com Date: Tue May 11 16:24:41 2010 +0530 ath9k_htc: Reorder HTC initialization The HTC state has to be setup before initializing the target because the ready message could possibly come before the control endpoints in HTC have been identified. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1d8af8caccceab91ba65b7f659678b92093f9203 Author: Sujith.Manoharan@atheros.com Date: Tue May 11 16:24:40 2010 +0530 ath9k_htc: Allocate URBs properly The URBs have to be allocated before uploading the firmware to the target. This is needed to process the target ready message properly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 05a30f9cf2a57ebbb2b616b5394e06b893179f13 Author: Sujith.Manoharan@atheros.com Date: Tue May 11 16:24:38 2010 +0530 ath9k_htc: Lock sta_notify() callback Since ->sta_notify() can sleep, protect the callback with a mutex. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 9feaddc77b2a2ee460f39d1420f9675db972659e Author: Wey-Yi Guy Date: Wed May 5 20:34:02 2010 -0700 mac80211: check channel switch mode for future frames transmit Check the mode in channel switch ie for either 0 or 1 on transmission. A channel switch mode set to 1 means that the STA in a BSS to which the frame containing the element is addressed shall transmit no further frames within the BSS until the scheduled channel switch. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5ce6e438d5d9ed8ed775cd1e94f92002c8da2bad Author: Johannes Berg Date: Tue May 11 16:20:57 2010 +0200 mac80211: add offload channel switch support This adds support for offloading the channel switch operation to devices that support such, typically by having specific firmware API for it. The reasons for this could be that the firmware provides better timing or that regulatory enforcement done by the device requires special handling of CSAs. In order to allow drivers to specify the timing to the device, the new channel_switch callback will pass through the received frame's mactime, where available. Signed-off-by: Wey-Yi Guy Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b8d92c9c141ee3dc9b3537b1f0ffb4a54ea8d9b2 Author: Johannes Berg Date: Tue May 11 12:42:04 2010 +0200 mac80211: don't process work item with wrong frame When we process a frame, we currently just match it to the work struct by the MAC addresses, and not by the work type. This means that we can end up doing the work for an association request item when (for whatever reason) we receive another frame type, for example a probe response. Processing the wrong type of frame will lead to completely invalid data being processed, and will lead to various problems like thinking the association was successful even if the AP never sent an assocation response. Fix this by making each processing function check that it is invoked for the right work struct type only and continue processing otherwise (and drop frames that we didn't expect). This bug was uncovered during the debugging for https://bugzilla.kernel.org/show_bug.cgi?id=15862 but doesn't seem to be the cause for any of the various problems reported there. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9fda1ac5fa09c49e9148f85be14f55e2bb856c0f Author: Dan Carpenter Date: Thu May 6 16:22:21 2010 +0300 IB/iser: Fix error flow in iser_create_ib_conn_res() We shouldn't free things here because we free them later. The call tree looks like this: iser_connect() ==> initiating the connection establishment and later iser_cma_handler() => iser_route_handler() => iser_create_ib_conn_res() if we fail here, eventually iser_conn_release() is called, resulting in a double free. Signed-off-by: Dan Carpenter Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 39ff05dbbbdb082bbabf06206c56b3cd4ef73904 Author: Or Gerlitz Date: Wed May 5 17:31:44 2010 +0300 IB/iser: Enhance disconnection logic for multi-pathing The iser connection teardown flow isn't over until the underlying Connection Manager (e.g the IB CM) delivers a disconnected or timeout event through the RDMA-CM. When the remote (target) side isn't reachable, e.g when some HW e.g port/hca/switch isn't functioning or taken down administratively, the CM timeout flow is used and the event may be generated only after relatively long time -- on the order of tens of seconds. The current iser code exposes this possibly long delay to higher layers, specifically to the iscsid daemon and iscsi kernel stack. As a result, the iscsi stack doesn't respond well: this low-level CM delay is added to the fail-over time under HA schemes such as the one provided by DM multipath through the multipathd(8) service. This patch enhances the reference counting scheme on iser's IB connections so that the disconnect flow initiated by iscsid from user space (ep_disconnect) doesn't wait for the CM to deliver the disconnect/timeout event. (The connection teardown isn't done from iser's view point until the event is delivered) The iser ib (rdma) connection object is destroyed when its reference count reaches zero. When this happens on the RDMA-CM callback context, extra care is taken so that the RDMA-CM does the actual destroying of the associated ID, since doing it in the callback is prohibited. The reference count of iser ib connection normally reaches three, where the relations are 1. conn 2. conn 3. cma id With this patch, multipath fail-over time is about 30 seconds, while without this patch, multipath fail-over time is about 130 seconds. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit d265b9808272c9f25e1c36d3fb5ddb466efd90e9 Author: Or Gerlitz Date: Wed May 5 17:30:34 2010 +0300 IB/iser: Remove buggy back-pointer setting The iscsi connection object life cycle includes binding and unbinding (conn_stop) to/from the iscsi transport connection object. Since iscsi connection objects are recycled, at the time the transport connection (e.g iser's IB connection) is released, it is not valid to touch the iscsi connection tied to the transport back-pointer since it may already point to a different transport connection. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 2110f9bf37511df06220bb7e977f417baecf2950 Author: Or Gerlitz Date: Wed May 5 17:30:10 2010 +0300 IB/iser: Add asynchronous event handler Add handler to handle events such as port up and down. This is useful when testing high-availability schemes such as multi-pathing. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 29d3dedf22bc8272186a7e0d8a8243d88606b569 Author: Daniel Walker Date: Fri Apr 23 16:02:19 2010 -0700 arm: msm: video: add msm_fb.h Also drops the old mddi structure, which conflicts with the new file. Signed-off-by: Daniel Walker commit 869a2a09e40529f2f3614893c98b27a87a33eaa6 Author: Daniel Walker Date: Fri Apr 23 11:04:14 2010 -0700 arm: msm: smd: fix initcall prototype compiler warning This fixes the following warning, arch/arm/mach-msm/smd_debug.c:240: warning: initialization from incompatible pointer type Signed-off-by: Daniel Walker commit 42df2c99162d1da63f11d073059e9633bfec11d0 Author: Daniel Walker Date: Thu Apr 22 16:09:03 2010 -0700 arm: msm: trout: fix build failure without UART Without a debug uart selected you get this failure, arch/arm/mach-msm/board-trout.c:85: error: 'MSM_DEBUG_UART_PHYS' undeclared here (not in a function) arch/arm/mach-msm/board-trout.c:86: error: 'MSM_DEBUG_UART_BASE' undeclared here (not in a function) This just removes these lines in that case. Signed-off-by: Daniel Walker commit 3a9f346a95d4faa05f4eca6470f971244073e18e Author: Daniel Walker Date: Thu Apr 22 14:16:46 2010 -0700 arm: msm: smd: remove Kconfig menu option This removes the Kconfig menu option. SMD can still be selected but it's done inside the Kconfig file and not via the menu. Signed-off-by: Daniel Walker commit 0aec66d493c1476daa88ec56b1076e51f1ceff0b Author: Daniel Walker Date: Thu Mar 18 12:31:08 2010 -0700 arm: msm: smd: fix SMD modem processor sync condition When booting up we need to wait for the modem processor to partially boot. This is because the modem processor does resource allocation for us. If we don't wait the modem won't honor our requests and we end up crashing or in an unknown state. This change just formalizes the waiting process. Signed-off-by: Daniel Walker commit b13525c2637957a757709945fbc9bc8b1065d071 Author: Daniel Walker Date: Thu Mar 18 10:10:30 2010 -0700 arm: msm: smd: ifdef dsp irq handler This irq handler isn't used in all cases, so add the proper ifdef. This eliminates a compiler warning due to the function not getting used. Signed-off-by: Daniel Walker commit 3843ac3a5cd01824b5801209808e73fb9df7ee22 Author: Daniel Walker Date: Wed Mar 17 11:10:40 2010 -0700 arm: msm: smd: remove unneeded predefines This just removed some unneeded predefines. One needed a whole function moved down further. The others could just be deleted. No functional changes. Signed-off-by: Daniel Walker commit 74df1d07ee01b7276cba64160ea6dfe195de008f Author: Daniel Walker Date: Wed Mar 17 10:51:10 2010 -0700 arm: msm: smd: msm7x30 a2m clean up This moves the msm_a2m_int() function into the header, and does a small macro clean up to be more inline with Linux norms. No functional changes. Signed-off-by: Daniel Walker commit 1a86fbc167fdf8ac387a52d49782d7a5bc1d9ac9 Author: Daniel Walker Date: Wed Mar 17 09:58:29 2010 -0700 arm: msm: smd: convert unsigned addr to unsigned long "unsigned" translates to "unsigned int", but this value holds an address. We always want to use unsigned long for addresses since it will change size to fit the machine. This just convert the one address holder to unsigned long. Signed-off-by: Daniel Walker commit bf83de4037780b11b27f1e32e33c1e8e7e42602e Author: Daniel Walker Date: Tue Mar 16 16:29:44 2010 -0700 arm: msm: smd: use either package v3 or v4 not both This modifies SMD to use either the package v3 or package v4, but not both. The current code tries to allocate as v4 on all system which can produce a scary looking error message on boot up, smem_find(16, 40): wrong size 16424 smd_alloc_channel() cid=02 size=08192 'SMD_RPCCALL' With this error the code then falls back on the package v3 allocation method. This method is inefficient because it causes a slow down on some systems even when the allocation method can be determined at compile time. It also causes a kernel size increase that effects all system and is not needed. This change corrects the allocation to use one method or the other and not both. Signed-off-by: Daniel Walker commit 79848a2a7333eee6424b38c05b4ea4a0ce56eb47 Author: Daniel Walker Date: Tue Mar 16 15:20:07 2010 -0700 arm: msm: smd: checkpatch clean up of smd/proc_comm This cleans up coding style. There are no run time changes. Signed-off-by: Daniel Walker commit 93873bcbd16f7233dd5a20280af8e5394e702a8b Author: Dima Zavin Date: Fri Jan 8 18:30:03 2010 -0800 [ARM] msm: smd: Force the half_channel struct aligmnent to 4 Forcing the alignment prevents gcc from generating byte reads for word member variables. Lack of this caused issues when the app processor modified struct members and the modem saw a partial word write. Signed-off-by: Dima Zavin Signed-off-by: Daniel Walker commit b42dc44afca902d19f86d541cbb665f31b9149a0 Author: Dima Zavin Date: Fri Jan 29 11:43:42 2010 -0800 arm: msm: correctly signal the apps-to-modem irq in smd/proc_comm Signed-off-by: Dima Zavin Signed-off-by: Daniel Walker commit 636eb9cbaef7989ce7809a0d842bf78470a0a1f4 Author: Brian Swetland Date: Mon Dec 7 15:28:08 2009 -0800 msm: smd: provide atomic channel writes Some smd clients may write from multiple threads, in which case it's not safe to call smd_write without holding a lock. smd_write_atomic() provides the same functionality as smd_write() but obtains the smd lock first. Signed-off-by: Brian Swetland Signed-off-by: Daniel Walker commit 1207babdcdfe5501d1528c86b445a9d1045ecc01 Author: Iliyan Malchev Date: Sun Nov 15 18:16:43 2009 -0800 [ARM] msm: add /proc/last_radio_log when supported by the modem. Signed-off-by: Iliyan Malchev Signed-off-by: Daniel Walker commit 34f719b0c25cca6e11164f926fc798c25499aa96 Author: Brian Swetland Date: Fri Oct 30 16:22:05 2009 -0700 msm/qsd: smd: avoid race condition in smd channel allocation Don't mark a channel as allocated if we failed to allocate it (perhaps the modem updated one table but not the other, etc) Signed-off-by: Brian Swetland Signed-off-by: Daniel Walker commit 7632fba05197999fb0d24776b567682ebd62f62a Author: Haley Teng Date: Mon Oct 12 10:38:10 2009 -0700 [ARM] msm: smd: Update the correct fTAIL pointer after reading from fifo When we read data out of the sender's fifo, we need to advance the sender's tail pointer, not the receiver's. Signed-off-by: Haley Teng Acked-by: Dima Zavin Signed-off-by: Daniel Walker commit 37521a3181123dc4a9584cc4b8572c08ea0a8274 Author: Brian Swetland Date: Wed Jul 1 18:30:47 2009 -0700 [ARM] msm: smd: add support for DSP SMD channels - QSD8250 has a DSP that speaks SMD, in addition to the modem - handle a separate list of modem vs dsp channels - install dsp smd irq handler as necessary Signed-off-by: Brian Swetland Signed-off-by: Daniel Walker commit 03e00cd350c6636b5f2a9854609fea93a5c7b677 Author: Brian Swetland Date: Wed Jul 1 17:58:37 2009 -0700 [ARM] msm: cleanup smd, separate debugfs support - pull debug code into smd_debug.c - move necessary structures and defines into smd_private.h - fix some comment formatting, etc Signed-off-by: Brian Swetland Signed-off-by: Daniel Walker commit ec9d3d14ffa9454e6d51e5dd1889d6e9e0be5198 Author: Arve Hjønnevåg Date: Tue Jun 16 14:48:21 2009 -0700 [ARM] msm: Add 8k power collapse support to smd Signed-off-by: Arve Hjønnevåg Signed-off-by: Daniel Walker commit 283794100d2b1c1645b2949273aa4be29929812d Author: Arve Hjønnevåg Date: Wed May 20 16:52:36 2009 -0700 [ARM] msm: Add item argument to smsm_change_state and smsm_get_state The new protocol require writing to two state fields, and reading several fields. Signed-off-by: Arve Hjønnevåg Signed-off-by: Daniel Walker commit 5b0f5a3f6084397194a8b556cdca572ad8e14f05 Author: Brian Swetland Date: Sun Apr 26 18:38:49 2009 -0700 msm: smd: initial support for smd v2 - support both v2 and v1 style smd channels - support both v2 and v1 smsm shared state - update smsm state defines and smem item enum - prep work for dealing with smd to qdsp6 - simplify some smem access to minimize use of smem_alloc() at runtime Signed-off-by: Brian Swetland Signed-off-by: Daniel Walker commit 4d4fb2660ddd2d8131ebc3314e4c648fc0f4b8dd Author: Brian Swetland Date: Wed Jan 28 20:25:40 2009 -0800 [ARM] msm: smd: don't crash if the smd channel table doesn't exist Signed-off-by: Brian Swetland Signed-off-by: Daniel Walker commit 2eb44eb9c8026f3f548bfbc903156b6aea54ed24 Author: Brian Swetland Date: Mon Sep 29 16:00:48 2008 -0700 [ARM] msm: shared memory interface for baseband processor ipc This code provides the low level interface to the "shared memory state machine" (smsm), and the virtual serial channels (smd), used to communicate with the baseband processor. Higher level transports (rpc, ethernet, AT command channel, etc) ride on top of this. Signed-off-by: Brian Swetland commit 830d843b75338b94b7c769a2c3b59b04744a9323 Author: Dima Zavin Date: Fri May 22 20:21:50 2009 -0700 [ARM] msm: sdcc: Make slot status irq be a resource Also, convert all SDCC IRQ resources to be named. No longer pass status_irq in the platform_data Signed-off-by: Dima Zavin Signed-off-by: Daniel Walker commit 5d4f77ffefdcfbe9432db371126b74478964b4a0 Author: San Mehat Date: Mon Nov 10 16:30:27 2008 -0800 [ARM] msm: common: Add SDC device runtime registration Signed-off-by: San Mehat Signed-off-by: Daniel Walker commit c68af41d2dbfaa054e5dd15a4df699429ee8a0ad Author: Daniel Walker Date: Mon Mar 8 10:37:25 2010 -0800 MAINTAINERS: add MSM mailing list Just adds a mailing list to the MSM maintainer entry. Signed-off-by: Daniel Walker commit 1b802ff79f03356ebe38d8fbfeb7c13fc2f4f524 Author: Daniel Walker Date: Thu Mar 4 15:13:47 2010 -0800 arm: msm: add board file for Nexus One (ie. mahimahi) This adds a basic board file without Kconfig changes. Signed-off-by: Daniel Walker commit 1b70de32ac695b2faac93225aaee71a8df06c155 Author: Willie Ruan Date: Fri Jul 24 17:21:21 2009 -0700 [ARM] msm: add new vreg IDs for MSM7X30 Signed-off-by: Willie Ruan commit 0e44106de5adffc32e0a9294ed406f20d9a3f38d Author: Matt Wilson Date: Mon Jun 29 14:13:04 2009 -0500 arm: msm: add vreg reference count Support independent enable and disable by clients for common vreg. First enable switches on and last disable switches off. This change has no check for voltage level so clients must agree on level for common vreg. Signed-off-by: Matthew Wilson commit 4eab62519f8f58aa5f72787877c459925399d617 Author: Daniel Walker Date: Thu Mar 4 14:06:56 2010 -0800 arm: msm: warning fix in acpuclock.c Fixes the following warning, arch/arm/mach-msm/acpuclock-arm11.c:138: warning: 'freq_table' defined but not used when CONFIG_CPU_FREQ_TABLE is not enabled. Signed-off-by: Daniel Walker commit 4783de9bba3dd607e6aa4d0a7dd598d9094c044c Author: Steve Muckle Date: Fri Dec 12 19:33:55 2008 -0500 arm: msm: status for vreg Keep track of the success/failure of the last vreg proc comm command, and return that on debugfs reads. Signed-off-by: Steve Muckle commit 0c50b444b69f49e38d16b974993a626ad74c59a7 Author: Steve Muckle Date: Thu Mar 4 12:38:05 2010 -0800 arm: msm: return error pointer in vreg_get if vreg not found Signed-off-by: Steve Muckle commit 2012e49e8ad4ae432cf1667e945b0f335c3e6d38 Author: Daniel Walker Date: Wed Mar 3 09:34:27 2010 -0800 arm: msm: move board-dream.c to board-trout.c Move the naming of this board file back to the original Google naming. Signed-off-by: Daniel Walker commit 43b39f9f040fd49a094222f70857e3690ce653a3 Author: Daniel Walker Date: Wed Mar 3 08:54:11 2010 -0800 arm: msm: add cpu frequency controls This adds acpuclock-arm11.c from Google. This provides control over the cpu frequency for arm11 cpu's. This has shared authorship between Google, and Qualcomm. Most of it was written by Mike Chan at Google. Signed-off-by: Daniel Walker commit 9f68fcdb8f9b0f55830f58b02cecc5c26b0ba17b Author: Brian Swetland Date: Wed Aug 19 18:49:45 2009 -0700 msm: add dsb() syncronization to datamover driver Avoids problems on the scorpion core. Signed-off-by: Brian Swetland commit c5541079da3cd19626410d59455d3e0f34d65943 Author: Arve Hjønnevåg Date: Thu Jun 25 17:03:14 2009 -0700 [ARM] msm: dma: Enable dma clock while dma is active Signed-off-by: Arve Hjønnevåg commit a6407dd7b89f0de39d315eee64ad59dd68187b38 Author: Arve Hjønnevåg Date: Fri Apr 17 18:21:34 2009 -0700 [ARM] msm: dma: disable_irq -> disable_irq_nosync Signed-off-by: Arve Hjønnevåg commit 5f5d585167dadce1c895a860ae0be0dc6f48ee82 Author: Dima Zavin Date: Tue Sep 8 20:15:37 2009 -0700 [ARM] msm: Update list of proc_comm enums. Signed-off-by: Dima Zavin commit d6ada2577601576099934448a0391bb37296b3db Author: Arve Hjønnevåg Date: Sat Dec 1 18:05:26 2007 -0800 [ARM] msm: irq: fix lockdep issues Signed-off-by: Brian Swetland commit 36cf1b55b4caa188f2d070bb18a69ebe3c70580f Author: Arve Hjønnevåg Date: Tue Nov 18 14:58:08 2008 -0800 [ARM] msm: Add MSM_DEBUG_UART option. Signed-off-by: Arve Hjønnevåg commit 6bd631e17eaa0d045b259ff7a6625bfe96c15283 Author: Arve Hjønnevåg Date: Wed Oct 29 21:45:46 2008 -0700 [ARM] msm: halibut: Add memory configuration. commit a32d2feb80bb2d186d415ed8bb4997148add0bd1 Author: Daniel Walker Date: Thu Feb 25 11:38:39 2010 -0800 arm: msm: add board file for QSD8x50 SURF and FFA This adds a basic board file without Kconfig changes. Signed-off-by: Daniel Walker commit 8d747cdb3d4db7fd7a0740986567a50fb232931a Author: Daniel Walker Date: Thu Feb 25 11:37:43 2010 -0800 arm: msm: add board file for MSM7x30 SURF and FFA This adds a basic board file without Kconfig changes. Signed-off-by: Daniel Walker commit 2682fd3df51cf53b41a6aeba99b346cd846389c2 Author: Daniel Walker Date: Wed Feb 24 15:47:58 2010 -0800 arm: msm: add board file for MSM7x25/MSM7x27 SURF and FFA This adds a basic board file without Kconfig changes. Signed-off-by: Daniel Walker commit 614ad9814850ab618e76b4a2e272c0262ece7be0 Author: Daniel Walker Date: Wed Feb 24 15:44:51 2010 -0800 arm: msm: add board file for the HTC Sapphire device This adds a basic board file without Kconfig changes. Signed-off-by: Daniel Walker commit 308eb7add8adaca8088c28a3f7610069b70d1ad6 Author: Tejun Heo Date: Wed May 12 12:10:39 2010 +0200 ia64: add sparse annotation to __ia64_per_cpu_var() ia64 has its own optimized percpu accessor - __ia64_per_cpu_var(). Add percpu sparse annotations to it. Signed-off-by: Tejun Heo Reviewed-by: Christoph Lameter commit 4308ad801193f14ff42cb746da37cf07e35f0d08 Author: Peter P Waskiewicz Jr Date: Wed May 5 13:56:42 2010 -0700 genirq: Clear CPU mask in affinity_hint when none is provided When an interrupt is disabled and torn down, the CPU mask returned through affinity_hint right now is all CPUs. Also, for drivers that don't provide an affinity_hint mask, this can be misleading. There should be no hint at all, meaning an empty CPU mask. [ tglx: use zalloc_cpumask_var instead of clearing it under the lock ] Signed-off-by: Peter P Waskiewicz Jr Cc: davem@davemloft.net Cc: arjan@linux.jf.intel.com Cc: bhutchings@solarflare.com LKML-Reference: <20100505205638.5426.87189.stgit@ppwaskie-hc2.jf.intel.com> Signed-off-by: Thomas Gleixner commit 36aeff6146925025033e2bcd45fa1e9725bc4599 Author: Peter Ujfalusi Date: Wed May 12 10:35:36 2010 +0300 ASoC: TWL4030: Add control for digimic Left Right swap The codec has support for swapping the left and right channels in the digimic interface. New kcontrol to handle this bit. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 6cd82ffe0cd3836b32b29bd1436e5fd551957d54 Author: Maurus Cuelenaere Date: Tue May 4 13:12:32 2010 +0200 ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung Move HWMON platform definition from plat-s3c24xx to plat-samsung and adjust mach-bast to use the new s3c_hwmon_set_platdata(). This allows usage of dev-hwmon by other Samsung SoCs. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 278554bd6579206921f5d8a523649a7a57f8850d Merge: 5a147e8 cea0d76 Author: David S. Miller Date: Wed May 12 00:05:35 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c commit 975fc2d5f20b071576e7c9920c4f1a1eae80f88d Merge: 8e6d557 ef7b93a Author: Ingo Molnar Date: Wed May 12 08:14:29 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit aa3e5572c538d753dce11bf93532a75f95d22b40 Author: Steve French Date: Wed May 12 02:24:12 2010 +0000 [CIFS] drop quota operation stubs CIFS has stubs for XFS-style quotas without an actual implementation backing them, hidden behind a config option not visible in Kconfig. Remove these stubs for now as the quota operations will see some major changes and this code simply gets in the way. Signed-off-by: Christoph Hellwig Reviewed-by: Jeff Layton Signed-off-by: Jan Kara Signed-off-by: Steve French commit ef7b93a11904c6ba10604233d318d9e8ec88cddc Author: Arnaldo Carvalho de Melo Date: Tue May 11 23:18:06 2010 -0300 perf report: Librarize the annotation code and use it in the newt browser Now we don't anymore use popen to run 'perf annotate' for the selected symbol, instead we collect per address samplings when processing samples in 'perf report' if we're using the newt browser, then we use this data directly to do annotation. Done this way we can actually traverse the objdump_line objects directly, matching the addresses to the collected samples and colouring them appropriately using lower level slang routines. The new ui_browser class will be reused for the main, callchain aware, histogram browser, when it will be made generic and don't assume that the objects are always instances of the objdump_line class maintained using list_heads. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 0ad73cefa2ec509126af466718e0c3cb1ad8ae9b Author: Kukjin Kim Date: Tue May 11 09:56:37 2010 +0900 ARM: SAMSUNG: Remove static of S5P SoCs sysclass This patch removes static of s5p6440_sysclass, s5p6442_sysclass, and s5pv210_sysclass for defintion as extern. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit afdd225d0feea07f7fe6501771dbfddfda07b632 Author: Ben Dooks Date: Fri May 7 09:24:05 2010 +0900 ARM: SAMSUNG: Remove old email address for ben-linux@fluff.org The address ben@fluff.org is old, ben-linux@fluff.org has been in use for a long time, and we should fixup all the occasions of the older address to avoid confusion. Signed-off-by: Ben Dooks commit 84d38ac9abf0a5bc0044c9363acaad55a9a4be0d Author: Benny Halevy Date: Wed May 12 00:13:16 2010 +0300 nfsd4: refactor expire_client Separate out unhashing of the client and session. To be used later by the laundromat. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 36acb66bda512dd8159c3e1b40358c5219524868 Author: Benny Halevy Date: Wed May 12 00:13:04 2010 +0300 nfsd4: extend the client_lock to cover cl_lru To be used later on to hold a reference count on the client while in use by a nfsv4.1 compound. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 328efbab0f8ae1617448917906a12e5f568553b6 Author: Benny Halevy Date: Wed May 12 00:12:51 2010 +0300 nfsd4: use list_move in move_to_confirmed rather than list_del_init, list_add Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit be1fdf6c4386f56271d2f690b93ef686b769587c Author: Benny Halevy Date: Wed May 12 00:12:39 2010 +0300 nfsd4: fold release_session into expire_client and grab the client lock once for all the client's sessions. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 9089f1b4782ff52835059779fd37b7ad765a25c7 Author: Benny Halevy Date: Wed May 12 00:12:26 2010 +0300 nfsd4: rename sessionid_lock to client_lock In preparation to share the lock's scope to both client and session hash tables. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit c9775b4cc522e5f1b40b1366a993f0f05f600f39 Author: H. Peter Anvin Date: Tue May 11 17:49:54 2010 -0700 x86, fpu: Use static_cpu_has() to implement use_xsave() use_xsave() is now just a special case of static_cpu_has(), so use static_cpu_has(). Signed-off-by: H. Peter Anvin Cc: Avi Kivity Cc: Suresh Siddha LKML-Reference: <1273135546-29690-2-git-send-email-avi@redhat.com> commit a3c8acd04376d604370dcb6cd2143c9c14078a50 Author: H. Peter Anvin Date: Tue May 11 17:47:07 2010 -0700 x86: Add new static_cpu_has() function using alternatives For CPU-feature-specific code that touches performance-critical paths, introduce a static patching version of [boot_]cpu_has(). This is run at alternatives time and is therefore not appropriate for most initialization code, but on the other hand initialization code is generally not performance critical. On gcc 4.5+ this uses the new "asm goto" feature. Signed-off-by: H. Peter Anvin Cc: Avi Kivity Cc: Suresh Siddha LKML-Reference: <1273135546-29690-2-git-send-email-avi@redhat.com> commit 192ff91fc84e067a3babfddb96114a51c939548e Author: Vasily Khoruzhick Date: Tue May 11 09:55:11 2010 +0300 ARM: RX1950: configure GPG13-15 as input before suspend According to datasheet GPG13-15 must be configured as input in NAND boot mode, otherwise device will not be able to wake up Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 0741b7d2699d1e7b4ceab27522c9e5518b2dbd2c Author: Vasily Khoruzhick Date: Tue May 11 09:55:10 2010 +0300 ARM: RX1950: Add suspend/resume support for RX1950 Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit c4761b69f4c3bd2f6e62d9cba6d78b5fd4b24203 Author: Vasily Khoruzhick Date: Tue May 11 09:55:09 2010 +0300 ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled If PM_H1940 is enabled, kernel _must_ be located upper then 0x30008000, because this area (0x30000000-0x30100000) can be used by bootloader. If kernel is located at 0x30008000, bootloader will corrupt kernel's code during resume. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit c394f17799523fe4bc92d173b3d9ac2d240c76a2 Author: Vasily Khoruzhick Date: Tue May 11 09:55:07 2010 +0300 ARM: S3C2440: Add HP iPAQ RX1950 machine support Signed-off-by: Vasily Khoruzhick Signed-off-by: Denis Grigoriev Signed-off-by: Ben Dooks commit 72d5a9f7a9542f88397558c65bcfc3b115a65e34 Author: Paul E. McKenney Date: Mon May 10 17:12:17 2010 -0700 rcu: remove all rcu head initializations, except on_stack initializations Remove all rcu head inits. We don't care about the RCU head state before passing it to call_rcu() anyway. Only leave the "on_stack" variants so debugobjects can keep track of objects on stack. Signed-off-by: Mathieu Desnoyers Signed-off-by: Paul E. McKenney commit ec66841e495b9ab4f92bdf91efe8cf56e1471fbd Author: Jonathan Corbet Date: Wed May 5 14:44:55 2010 -0600 viafb: move some include files to include/linux These are the files which should be available to subdevices compiled outside of drivers/video/via. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 9221fc6556d6fa14b5c61050dd87e26fc4ad255c Author: Jonathan Corbet Date: Wed May 5 14:24:18 2010 -0600 viafb: Eliminate some global.h references The various subdev drivers (other than the framebuffer itself) no longer need this file. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 4a28ea9cedaa673b8a1a7f84628d784d020f3b47 Author: Jonathan Corbet Date: Wed May 5 14:28:53 2010 -0600 viafb: get rid of i2c debug cruft It's ugly and adds a global.h dependency. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 64a6bd6a570c53f1955eaedf3952dcbe9b62da1d Author: Jonathan Corbet Date: Wed May 5 13:42:49 2010 -0600 viafb: fold via_io.h into via-core.h Preparatory move toward the ultimate goal of moving pan-subdevice stuff into include/linux. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 0fb0a4f00aaf5de9f328273d7a46e3aa27dab496 Author: Inaky Perez-Gonzalez Date: Mon Oct 12 12:45:40 2009 +0900 wimax/i2400m: driver defaults to firmware v1.5 for i6x60 devices Firmware is available in the linux-firmware package. Signed-off-by: Inaky Perez-Gonzalez commit 6c6706b330afbc0cb53e2af4d73022d1c1273f42 Author: Inaky Perez-Gonzalez Date: Sat Oct 3 16:55:11 2009 +0900 wimax/i2400m: driver defaults to firmware v1.5 for i5x50 devices Updates the i2400m driver to default to firmware versions v1.5 for the Intel Wireless WiMAX Connection 5150 and 5350 devices. Firmware available in linux-firmware. Signed-off-by: Inaky Perez-Gonzalez commit 9d7fdf1ba9d5b8963bf8ffe29eea17f508e81bde Author: Prasanna S Panchamukhi Date: Tue Nov 17 18:29:35 2009 -0800 wimax/i2400m: Move module params to other file so they can be static This patch moves the module parameters to the file where they can be avoided to be global and allow them to be static. The module param : idle_mode_disabled and power_save_disabled are moved from driver.c to control.c. Also these module parameters are declared to be static as they are not required to be global anymore. The module param : rx_reorder_disabled is moved from driver.c file to rx.c file. Also this parameter is declated as static as it is not required to be global anymore. Signed-off-by: Prasanna S Panchamukhi commit 3e02a06ae3dce2eb804bb4afadb7067c80d6c096 Author: Dan Carpenter Date: Thu Apr 22 11:46:32 2010 +0200 wimax: wimax_msg_alloc() returns ERR_PTR not null wimax_msg_alloc() returns an ERR_PTR and not null. I changed it to test for ERR_PTR instead of null. I also added a check in front of the kfree() because kfree() can handle null but not ERR_PTR. Signed-off-by: Dan Carpenter commit d3e56c0ad8a2dab7ffd6179b64f00702149e5c9a Author: Dan Carpenter Date: Thu Apr 22 02:50:10 2010 -0700 wimax: checking ERR_PTR vs null stch_skb is allocated with wimax_gnl_re_state_change_alloc(). That function returns ERR_PTRs on failure and doesn't return NULL. Signed-off-by: Dan Carpenter commit 7ef9f9a4ee47b8d8ab9519647ba02fc700473be8 Author: Prasanna S. Panchamukhi Date: Tue Apr 13 16:36:33 2010 -0700 wimax/i2400m: USB specific TX queue's minimum buffer room required for new message This patch specifies the TX queue's buffer room required by the USB bus driver while allocating header space for a new message. Please refer the documentation in the code. Signed-off-by: Prasanna S. Panchamukhi commit 8a3a1b65eeecd18357ac0cc941f43df153d4f271 Author: Prasanna S. Panchamukhi Date: Tue Apr 13 16:36:26 2010 -0700 wimax/i2400m: SDIO specific TX queue's minimum buffer room for new message This patch specifies the TX queue's minimum buffer room required to accommodate one smallest SDIO payload. Please refer the documentation in the code. Signed-off-by: Prasanna S. Panchamukhi commit 27502908866ba37d03594e7f7ee7b649cb007330 Author: Prasanna S. Panchamukhi Date: Tue Apr 13 16:36:19 2010 -0700 wimax/i2400m: reserve additional space in the TX queue's buffer while allocating space for a new message header Increase the possibilities of including at least one payload by reserving some additional space in the TX queue while allocating TX queue's space for new message header. Please refer the documentation in the code for details. Signed-off-by: Prasanna S. Panchamukhi commit 0809a7bbe8fbcb4e899b0a3224d8461bd74987e0 Author: Prasanna S. Panchamukhi Date: Tue Apr 13 16:36:10 2010 -0700 wimax/i2400m: fix incorrect handling of type 2 and 3 RX messages According to Intel Wimax i3200, i5x50 and i6x60 device specification documents, the host driver must not reset the device if the normalized sequence numbers are greater than 1023 for type 2 and type 3 RX messages. This patch removes the code that incorrectly used to reset the device. Signed-off-by: Prasanna S. Panchamukhi commit d11a6e4495ee1fbb38b59bc88d49d050d3736929 Author: Prasanna S. Panchamukhi Date: Tue Apr 13 16:35:58 2010 -0700 wimax i2400m: fix race condition while accessing rx_roq by using kref count This patch fixes the race condition when one thread tries to destroy the memory allocated for rx_roq, while another thread still happen to access rx_roq. Such a race condition occurs when i2400m-sdio kernel module gets unloaded, destroying the memory allocated for rx_roq while rx_roq is accessed by i2400m_rx_edata(), as explained below: $thread1 $thread2 $ void i2400m_rx_edata() $ $Access rx_roq[] $ $roq = &i2400m->rx_roq[ro_cin] $ $ i2400m_roq_[reset/queue/update_ws] $ $ $ void i2400m_rx_release(); $ $kfree(rx->roq); $ $rx->roq = NULL; $Oops! rx_roq is NULL This patch fixes the race condition using refcount approach. Signed-off-by: Prasanna S. Panchamukhi commit ded0fd62a8a7cb3b12bb007079bff2b858a12d2b Author: Prasanna S. Panchamukhi Date: Thu Apr 8 16:24:32 2010 -0700 wimax/i2400m: increase tx queue length from 5 to 20 [v1] This patch increases the tx_queue_len to 20 so as to minimize the jitter in the throughput. Signed-off-by: Prasanna S. Panchamukhi commit 85a19e07e30f67c517266cafe92b7bcd9b98966d Author: Prasanna S. Panchamukhi Date: Thu Apr 8 16:24:31 2010 -0700 wimax/i2400m: fix system freeze caused by an infinite loop [v1] This patch fixes an infinite loop caused by i2400m_tx_fifo_push() due to a corner case where there is no tail space in the TX FIFO. Please refer the documentation in the code for details. Signed-off-by: Prasanna S. Panchamukhi commit 9e6e3bd52b0f77ca5cc385892c14ff8ba5ecfa67 Author: Prasanna S. Panchamukhi Date: Thu Apr 8 16:24:30 2010 -0700 wimax/i2400m: modify i2400m_tx_fifo_push() to check for head room space in the TX FIFO [v1] This fixes i2400m_tx_fifo_push(); the check for having enough space in the TX FIFO's tail was obscure and broken in certain corner cases. The new check works in all cases and is way clearer. Please refer the documentation in the code for details. Signed-off-by: Prasanna S. Panchamukhi commit 718e94907d79e74bbc7cfdb3cda2266079c5e993 Author: Prasanna S. Panchamukhi Date: Thu Apr 8 16:24:29 2010 -0700 wimax/i2400m: fix BUILD_BUG_ON() to use the maximum message size constant [v1] The older method of computing the maximum PDU size relied on a method that doesn't work when we prop the maximum number of payloads up to the physical limit, and thus we kill the whole computation and just verify that the constants are congruent. Signed-off-by: Prasanna S. Panchamukhi commit a40242f2cde38ccb04d4c35cad66aab3c047fa6a Author: Prasanna S. Panchamukhi Date: Thu Apr 8 16:24:28 2010 -0700 wimax/i2400m: limit the message size upto 16KiB [v1] According to Intel Wimax i3200, i5x50 and i6x50 specification documents, the maximum size of each TX message can be upto 16KiB. This patch modifies the i2400m_tx() routine to check that the message size does not exceed the 16KiB limit. Please refer the documentation in the code for details. Signed-off-by: Prasanna S. Panchamukhi commit e6dd789af1823908ed3ccda26bf07faf5970bce1 Author: Prasanna S. Panchamukhi Date: Thu Apr 8 16:24:27 2010 -0700 wimax/i2400m: increase the maximum number of payloads per message to 60 [v1] According to Intel Wimax i3200, i5x50 and i6x50 device specification documents, the maximum number of payloads per message can be up to 60. Increasing the number of payloads to 60 per message helps to accommodate smaller payloads in a single transaction. This patch increases the maximum number of payloads from 12 to 60 per message. Signed-off-by: Prasanna S. Panchamukhi commit d94401742dc662747db5bb9e444d353a4feba018 Author: Cindy H Kao Date: Fri Apr 23 17:19:06 2010 -0700 wimax/i2400m: Reset the TX FIFO indices when allocating the TX FIFO in tx_setup() This patch makes sure whenever tx_setup() is invoked during driver initialization or device reset where TX FIFO is released and re-allocated, the indices tx_in, tx_out, tx_msg_size, tx_sequence, tx_msg are properly initialized. When a device reset happens and the TX FIFO is released/re-allocated, a new block of memory may be allocated for the TX FIFO, therefore tx_msg should be cleared so that no any TX threads (tx_worker, tx) would access to the out-of-date addresses. Also, the TX threads use tx_in and tx_out to decide where to put the new host-to-device messages and from where to copy them to the device HW FIFO, these indices have to be cleared so after the TX FIFO is re-allocated during the reset, the indices both refer to the head of the FIFO, ie. a new start. The same rational applies to tx_msg_size and tx_sequence. To protect the indices from being accessed by multiple threads simultaneously, the lock tx_lock has to be obtained before the initializations and released afterwards. Signed-off-by: Cindy H Kao commit 2354161dd33b204d36caa0bc48c95cc6c1a984fb Author: Cindy H Kao Date: Thu Apr 8 16:03:12 2010 -0700 wimax/i2400m: Correct the error path handlers order in i2400m_post_reset() When bus_setup fails in i2400m_post_reset(), it falls to the error path handler "error_bus_setup:" which includes unlock the mutext. However, we didn't ever try to the obtain the lock when running bus_setup. The patch is to fix the misplaced error path handler "error_bus_setup:". Signed-off-by: Cindy H Kao commit 599e59538448ee49d5470f226bb191b2f78aa3a2 Author: Cindy H Kao Date: Wed Apr 7 20:07:47 2010 -0700 wimax/i2400m: add the error recovery mechanism on TX path This patch adds an error recovery mechanism on TX path. The intention is to bring back the device to some known state whenever TX sees -110 (-ETIMEOUT) on copying the data to the HW FIFO. The TX failure could mean a device bus stuck or function stuck, so the current error recovery implementation is to trigger a bus reset and expect this can bring back the device. Since the TX work is done in a thread context, there may be a queue of TX works already that all hit the -ETIMEOUT error condition because the device has somewhat stuck already. We don't want any consecutive bus resets simply because multiple TX works in the queue all hit the same device erratum, the flag "error_recovery" is introduced to denote if we are ready for taking any error recovery. See @error_recovery doc in i2400m.h. Signed-off-by: Cindy H Kao commit f4e413458104210bc29aa5c437882c68b4b20100 Author: Cindy H Kao Date: Wed Apr 7 19:42:42 2010 -0700 wimax/i2400m: fix for missed reset events if triggered by dev_reset_handle() The problem is only seen on SDIO interface since on USB, a bus reset would really re-probe the driver, but on SDIO interface, a bus reset will not re-enumerate the SDIO bus, so no driver re-probe is happening. Therefore, on SDIO interface, the reset event should be still detected and handled by dev_reset_handle(). Problem description: Whenever a reboot barker is received during operational mode (i2400m->boot_mode == 0), dev_reset_handle() is invoked to handle that function reset event. dev_reset_handle() then sets the flag i2400m->boot_mode to 1 indicating the device is back to bootmode before proceeding to dev_stop() and dev_start(). If dev_start() returns failure, a bus reset is triggered by dev_reset_handle(). The flag i2400m->boot_mode then remains 1 when the second reboot barker arrives. However the interrupt service routine i2400ms_rx() instead of invoking dev_reset_handle() to handle that reset event, it filters out that boot event to bootmode because it sees the flag i2400m->boot_mode equal to 1. The fix: Maintain the flag i2400m->boot_mode within dev_reset_handle() and set the flag i2400m->boot_mode to 1 when entering dev_reset_handle(). It remains 1 until the dev_reset_handle() issues a bus reset. ie: the bus reset is taking place just like it happens for the first time during operational mode. To denote the actual device state and the state we expect, a flag i2400m->alive is introduced in addition to the existing flag i2400m->updown. It's maintained with the same way for i2400m->updown but instead of reflecting the actual state like i2400m->updown does, i2400m->alive maintains the state we expect. i2400m->alive is set 1 just like whenever i2400m->updown is set 1. Yet i2400m->alive remains 1 since we expect the device to be up all the time until the driver is removed. See the doc for @alive in i2400m.h. An enumeration I2400M_BUS_RESET_RETRIES is added to define the maximum number of bus resets that a device reboot can retry. A counter i2400m->bus_reset_retries is added to track how many bus resets have been retried in one device reboot. If I2400M_BUS_RESET_RETRIES bus resets were retried in this boot, we give up any further retrying so the device would enter low power state. The counter i2400m->bus_reset_retries is incremented whenever dev_reset_handle() is issuing a bus reset and is cleared to 0 when dev_start() is successfully done, ie: a successful reboot. Signed-off-by: Cindy H Kao commit 49d72df3f6cd63b49528306a2577ae7a6a0e9d6b Author: Cindy H Kao Date: Tue Mar 30 19:19:37 2010 -0700 wimax/i2400m: correct the error path handlers in dev_start() This fix is to correct order of the handlers in the error path of dev_start(). When i2400m_firmware_check fails, all the works done before it should be released or cleared. Signed-off-by: Cindy H Kao commit f22cf689a6353f072bca15d0a26f870e62dfacf8 Author: Cindy H Kao Date: Sat Jan 30 01:26:54 2010 -0800 wimax/i2400m: fix the race condition for accessing TX queue The race condition happens when the TX queue is accessed by the TX work while the same TX queue is being destroyed because a bus reset is triggered either by debugfs entry or simply by failing waking up the device from WiMAX IDLE mode. This fix is to prevent the TX queue from being accessed by multiple threads Signed-off-by: Cindy H Kao commit 570eb0ea65db625e0b11ca97f4ae857bc1193250 Author: Prasanna S. Panchamukhi Date: Tue Jan 26 19:44:45 2010 -0700 wimax/i2400m: fix insufficient size of Tx buffer for 12 payload of 1400 MTU. This patch increases the Tx buffer size so as to accommodate 12 payloads of 1408 (1400 MTU 16 bytes aligned). Currently Tx buffer is 32 KiB which is insufficient to accommodate 12 payloads of 1408 size. This patch - increases I2400M_TX_BUF_SIZE from 32KiB to 64KiB - Adds a BUILD_BUG_ON if the calculated buffer size based on the given MTU exceeds the I2400M_TX_BUF_SIZE. Below is how we calculate the size of the Tx buffer. Payload + 4 bytes prefix for each payload (1400 MTU 16 bytes boundary aligned) = (1408 + sizeof(struct i2400m_pl_data_hdr)) * I2400M_TX_PLD_MAX Adding 16 byte message header = + sizeof(struct i2400m_msg_hdr) Aligning to 256 byte boundary Total Tx buffer = (((((1408 + sizeof(struct i2400m_pl_data_hdr)) * I2400M_TX_PLD_MAX )+ sizeof(struct i2400m_msg_hdr)) / 256) + 1) * 256 * 2 Signed-off-by: Prasanna S. Panchamukhi Signed-off-by: Inaky Perez-Gonzalez commit 080de04e6229c49be41b811f5d5429afd6ed736d Author: Prasanna S. Panchamukhi Date: Tue Jan 26 19:44:44 2010 -0700 wimax/i2400m: move I2400M_MAX_MTU enum from netdev.c to i2400m.h This patch moves I2400M_MAX_MTU enum defined in netdev.c to i2400m.h. Follow up changes will make use of this value in other location, thus requiring it to be moved to a global header file i2400m.h. Signed-off-by: Prasanna S. Panchamukhi Signed-off-by: Inaky Perez-Gonzalez commit 4818d14de36228a749f714b450a85c1b35542e6f Author: Prasanna S.Panchamukhi Date: Mon Jan 18 14:28:23 2010 -0800 wimax/i2400m: fix incorrect return -ESHUTDOWN when there is no Tx buffer available i2400m_tx() routine was returning -ESHUTDOWN even when there was no Tx buffer available. This patch fixes the i2400m_tx() to return -ESHUTDOWN only when the device is down(i2400m->tx_buf is NULL) and also to return -ENOSPC when there is no Tx buffer. Error seen in the kernel log. kernel: i2400m_sdio mmc0:0001:1: can't send message 0x5606: -108 kernel: i2400m_sdio mmc0:0001:1: Failed to issue 'Enter power save'command: -108 Signed-off-by: Prasanna S.Panchamukhi commit 3798ed7bc7ade26d3f59506cd06288615dfc7585 Author: Arnaldo Carvalho de Melo Date: Tue May 11 18:01:23 2010 -0300 perf ui: Add ui_helpline methods Initially this was just to be able to have a printf like method to prepare the formatted string and then pass to newtPushHelpLine, but as we already have for ui_progress, etc, its a step in identifying a restricted, highlevel set of widgets we can then have implementations for multiple widget sets (GTK, etc). Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e213e9cf707c51808e372dabd1070a61af17e77b Author: Daniel Mack Date: Tue May 11 18:13:50 2010 +0200 ALSA: sound/usb: add preliminary support for UAC2 interrupts For both UAC1 and UAC2, interrupt endpoint messages are now parsed with structs rather that with anonymous buffer array accesses. For UAC2, only CUR interrupt notifications are supported for now. snd_usb_mixer_status_complete() was renamed to snd_usb_mixer_interrupt(). Fixed one indentation flaw on the way. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 0350b6a0cbeaf46e0883d8c79ede2efd49965472 Author: Daniel Mack Date: Tue May 11 18:13:49 2010 +0200 include/linux/usb/audio.h: add __attribute__((packed)) This was missing on the definition of struct uac_iso_endpoint_descriptor Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 89485d4931769d40353ea49bff1596accff8f06e Author: Daniel Mack Date: Tue May 11 18:57:37 2010 +0200 ALSA: include/sound/asound.h whitespace fixups This fixes some whitespace/indentation flaws I stumbled over. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit b29e7eb4b8b3e5f4ff8066af648e9fe2fc707b16 Author: Vasanthakumar Thiagarajan Date: Mon May 10 19:41:35 2010 -0700 ath9k: Remove unused rx_edma in ath_rx_addbuffer_edma() Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 083e3e8d3dfeb191f349081c052ad3d20e8861f3 Author: Vasanthakumar Thiagarajan Date: Mon May 10 19:41:34 2010 -0700 ath9k: Fix bug in handling rx frames with invalid descriptor content Don't send them for further processing. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7fca8e26662e83fec0a0c55b9a977fe9e79f01da Author: Luis R. Rodriguez Date: Mon May 10 21:42:11 2010 -0400 ath9k_hw: new initialization values for AR9003 These changes include: * For PAPRD, the TXRF3.capdiv5G, TXRF3.rdiv5G and TXRF3.rdiv2G are set to 0x0, the TXRF6.capdiv2G is set to 0x2 for all three chains. * The d2cas5G/d3cas5G/d4cas5G was updated to 4/4/4 in lowest_ob_db Tx gain table. * To improve DPPM, three parameters were updated (Released from Madhan): 1. RANGE_OSDAC is set to 0x1 for 2G, 0x0 for 5G 2. offsetC1 is set to 0xc 3. inv_clk320_adc is set to 0x1 * To reduce PHY error(from spur), cycpwr_thr1 and cycpwr_thr1_ext are increased to 0x8 at 2G. * The 2G Rx gain tables are updated with mixer gain setting 3,1,0. The new checksums yield: initvals -f ar9003 0x00000000c2bfa7d5 ar9300_2p0_radio_postamble 0x00000000ada2b114 ar9300Modes_lowest_ob_db_tx_gain_table_2p0 0x00000000e0bc2c84 ar9300Modes_fast_clock_2p0 0x00000000056eaf74 ar9300_2p0_radio_core 0x0000000000000000 ar9300Common_rx_gain_table_merlin_2p0 0x0000000078658fb5 ar9300_2p0_mac_postamble 0x0000000023235333 ar9300_2p0_soc_postamble 0x0000000054d41904 ar9200_merlin_2p0_radio_core 0x00000000748572cf ar9300_2p0_baseband_postamble 0x000000009aa5a0a4 ar9300_2p0_baseband_core 0x000000003df9a326 ar9300Modes_high_power_tx_gain_table_2p0 0x000000001cfba124 ar9300Modes_high_ob_db_tx_gain_table_2p0 0x0000000011302700 ar9300Common_rx_gain_table_2p0 0x00000000e3eab114 ar9300Modes_low_ob_db_tx_gain_table_2p0 0x00000000c9d66d40 ar9300_2p0_mac_core 0x000000001e1d0800 ar9300Common_wo_xlna_rx_gain_table_2p0 0x00000000a0c54980 ar9300_2p0_soc_preamble 0x00000000292e2544 ar9300PciePhy_pll_on_clkreq_disable_L1_2p0 0x000000002d3e2544 ar9300PciePhy_clkreq_enable_L1_2p0 0x00000000293e2544 ar9300PciePhy_clkreq_disable_L1_2p0 Cc: Don Breslin Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 9637e516d16a58b13f6098cfe899e22963132be3 Author: Luis R. Rodriguez Date: Mon May 10 15:26:27 2010 -0400 ath5k: drop warning on jumbo frames Jumbo frames are not supported, and if they are seen it is likely a bogus frame so just silently discard them instead of warning on them all time. Also, instead of dropping them immediately though move the check *after* we check for all sort of frame errors. This should enable us to discard these frames if the hardware picks other bogus items first. Lets see if we still get those jumbo counters increasing still with this. Jumbo frames would happen if we tell hardware we can support a small 802.11 chunks of DMA'd frame, hardware would split RX'd frames into parts and we'd have to reconstruct them in software. This is done with USB due to the bulk size but with ath5k we already provide a good limit to hardware and this should not be happening. This is reported quite often and if it fills the logs then this needs to be addressed and to avoid spurious reports. Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b1b3751c750277c92684c932b46eeb723babe196 Author: Dan Carpenter Date: Sat May 8 18:26:38 2010 +0200 wl1271: remove some unneeded code The goto and the break are equivelent. I removed the goto in memory of Edsger Dijkstra who famously hated gotos and who would have been eighty years old next Tuesday. Signed-off-by: Dan Carpenter Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 8607b79c794a706e6df79d44da261887c5f5def2 Author: Dan Carpenter Date: Sat May 8 18:25:51 2010 +0200 wl1271: fix notifier interface supported test The "(wl == NULL)" test doesn't work here because "wl" is always non-null. The intent of the code is to return if the interface was not supported by the driver. Signed-off-by: Dan Carpenter Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit cdd0864a495a4c6a6f60cae854ca962cfa1f1026 Author: Dan Carpenter Date: Sat May 8 18:25:17 2010 +0200 wl1271: add missing spin_lock() We should start the loop consistently with the "wl_lock" lock held. Signed-off-by: Dan Carpenter Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 5a147e8bf982f9dd414c1dd751fe02c1942506b2 Author: Stephen Rothwell Date: Wed Mar 3 17:08:11 2010 +1100 ar9170: fix for driver-core ABI change Signed-off-by: Stephen Rothwell Signed-off-by: John W. Linville commit cc755896a4274f11283bca32d1d658203844057a Merge: d250fe9 9459d59 Author: John W. Linville Date: Tue May 11 14:24:55 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/ath/ar9170/main.c commit cba7a98a474a4f2a9316473734ba76829191a78a Merge: d250fe9 4538506 Author: Patrick McHardy Date: Tue May 11 18:59:21 2010 +0200 Merge branch 'master' of git://dev.medozas.de/linux commit 4538506be386f9736b83bf9892f829adbbb70fea Author: Jan Engelhardt Date: Sat Jul 4 12:50:00 2009 +0200 netfilter: xtables: combine built-in extension structs Prepare the arrays for use with the multiregister function. The future layer-3 xt matches can then be easily added to it without needing more (un)register code. Signed-off-by: Jan Engelhardt commit b4ba26119b06052888696491f614201817491a0d Author: Jan Engelhardt Date: Tue Jul 7 20:54:30 2009 +0200 netfilter: xtables: change hotdrop pointer to direct modification Since xt_action_param is writable, let's use it. The pointer to 'bool hotdrop' always worried (8 bytes (64-bit) to write 1 byte!). Surprisingly results in a reduction in size: text data bss filename 5457066 692730 357892 vmlinux.o-prev 5456554 692730 357892 vmlinux.o Signed-off-by: Jan Engelhardt commit 62fc8051083a334578c3f4b3488808f210b4565f Author: Jan Engelhardt Date: Tue Jul 7 20:42:08 2009 +0200 netfilter: xtables: deconstify struct xt_action_param for matches In future, layer-3 matches will be an xt module of their own, and need to set the fragoff and thoff fields. Adding more pointers would needlessy increase memory requirements (esp. so for 64-bit, where pointers are wider). Signed-off-by: Jan Engelhardt commit 4b560b447df83368df44bd3712c0c39b1d79ba04 Author: Jan Engelhardt Date: Sun Jul 5 19:43:26 2009 +0200 netfilter: xtables: substitute temporary defines by final name Signed-off-by: Jan Engelhardt commit de74c16996287250f0d947663127f80c6beebd3c Author: Jan Engelhardt Date: Sun Jul 5 18:26:37 2009 +0200 netfilter: xtables: combine struct xt_match_param and xt_target_param The structures carried - besides match/target - almost the same data. It is possible to combine them, as extensions are evaluated serially, and so, the callers end up a little smaller. text data bss filename -15318 740 104 net/ipv4/netfilter/ip_tables.o +15286 740 104 net/ipv4/netfilter/ip_tables.o -15333 540 152 net/ipv6/netfilter/ip6_tables.o +15269 540 152 net/ipv6/netfilter/ip6_tables.o Signed-off-by: Jan Engelhardt commit a93d2f1744206827ccf416e2cdc5018aa503314e Author: Changli Gao Date: Fri May 7 14:33:26 2010 +0800 sched, wait: Use wrapper functions epoll should not touch flags in wait_queue_t. This patch introduces a new function __add_wait_queue_exclusive(), for the users, who use wait queue as a LIFO queue. __add_wait_queue_tail_exclusive() is introduced too instead of add_wait_queue_exclusive_locked(). remove_wait_queue_locked() is removed, as it is a duplicate of __remove_wait_queue(), disliked by users, and with less users. Signed-off-by: Changli Gao Signed-off-by: Peter Zijlstra Cc: Alexander Viro Cc: Paul Menage Cc: Li Zefan Cc: Davide Libenzi Cc: LKML-Reference: <1273214006-2979-1-git-send-email-xiaosuo@gmail.com> Signed-off-by: Ingo Molnar commit d11c7addfe0fa501cb54c824c0fac3481d527433 Author: Kyle McMartin Date: Mon May 10 16:43:35 2010 -0400 perf symbols: allow forcing use of cplus_demangle For Fedora, I want to force perf to link against libiberty.a for cplus_demangle, rather than libbfd.a for bfd_demangle due to licensing insanity on binutils. (libiberty is LGPL2, libbfd is GPL3.) If we just rely on autodetection, we'll end up with libbfd linked against us, since they're both in binutils-static in the buildroot. Cc: Ingo Molnar LKML-Reference: <20100510204335.GA7565@bombadil.infradead.org> Signed-off-by: Kyle McMartin Signed-off-by: Arnaldo Carvalho de Melo commit 6b3c4ef50441e85dc9b2c9b67e95e8ad1185c15e Author: Masami Hiramatsu Date: Tue May 11 00:59:53 2010 -0400 perf probe: Check older elfutils and set NO_DWARF Check whether elfutils is older than 0.138 (from which version checking routine has been introduced). And if so, set NO_DWARF because it is hard to check the API dependency without version checking. Signed-off-by: Masami Hiramatsu Reported-by: Robert Richter Cc: Robert Richter Cc: Ingo Molnar LKML-Reference: <20100511045953.9913.19485.stgit@localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo commit b09e0190acf88c7fe3b05e3c331e1b2ef5310896 Author: Arnaldo Carvalho de Melo Date: Tue May 11 11:10:15 2010 -0300 perf hist: Adopt filter by dso and by thread methods from the newt browser Those are really not specific to the newt code, can be used by other UI frontends. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit fdb3603800e7a65bc3cafdfd5a1797d08f09e582 Author: Suresh Jayaraman Date: Tue May 11 09:46:46 2010 +0530 cifs: propagate cifs_new_fileinfo() error back to the caller ..otherwise memory allocation errors go undetected. Signed-off-by: Suresh Jayaraman Signed-off-by: Steve French commit 795e74f7a69f9c08afa4fa7c86cc4f18a62bd630 Merge: a523572 12c7389 Author: Joerg Roedel Date: Tue May 11 17:40:57 2010 +0200 Merge branch 'iommu/largepages' into amd-iommu/2.6.35 Conflicts: arch/x86/kernel/amd_iommu.c commit baffe1699c68da5040de6b274054adc995795782 Author: Haojian Zhuang Date: Wed May 5 10:11:15 2010 -0400 [ARM] pxa: add namespace on ssp In order to prevent code ambiguous, add namespace on functions in ssp driver. Signed-off-by: Haojian Zhuang Acked-by: Liam Girdwood Signed-off-by: Eric Miao commit 2503991a56483dc8477a3c6ca86da253eb5f8af9 Author: Haojian Zhuang Date: Wed Apr 28 15:43:21 2010 -0400 [ARM] mmp: append device support in jasper Support regulator MAX8649, PMIC MAX8925 into the Jasper. Backlight & power supply components of MAX8925 are enabled in Jasper. Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Eric Miao commit fed240558094058a5d372448b722fed93ddabd6b Author: Haojian Zhuang Date: Wed Apr 28 15:34:04 2010 -0400 [ARM] mmp: update twsi index Sync twsi index to register index. It's used to avoid typo error. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit d49ea9e30bab64280eb93aaf5dedad205a30d28b Author: Mingliang Hu Date: Mon Apr 12 18:14:18 2010 +0800 [ARM] mmp: add smc registers definition Signed-off-by: Mingliang Hu Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit f4557870834b15bcbe14a2fcd1a0338e9f9c89b5 Author: Haojian Zhuang Date: Wed Apr 28 15:24:24 2010 -0400 [ARM] mmp: add dma support to mmp2 Add DMA support in MMP2. Signed-off-by: Lei Wen Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 7f39403c56b01a8c023e8eb9ebe89007cdc4f4e6 Author: Haojian Zhuang Date: Wed Apr 28 15:18:59 2010 -0400 [ARM] mmp: update mfp setting Update mfp setting for mmp2. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 8ae84427bb05c2921dcb0200b161b904028b5784 Author: Mingliang Hu Date: Mon Apr 12 17:55:21 2010 +0800 [ARM] mmp: fix clock tick rate in mmp2 In MMP2, clock tick rate should be 6500000. Signed-off-by: Mingliang Hu Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 55d3936d30affccb904f9294a3076ccb7bf09688 Author: Haojian Zhuang Date: Wed Apr 28 11:43:00 2010 -0400 [ARM] mmp: configure gpio pins from 128 to 192 In mmp2, 6 banks of GPIO registers are supported. So we can support 192 GPIO pins at most. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit d24123bfae56aef5a38a7c89fd588f1bd7584751 Author: Haojian Zhuang Date: Wed Apr 28 11:32:30 2010 -0400 [ARM] mmp: update mmp2 defconfig Enable MAX8649 & MAX8925 regulator, dynamic debug, Marvell Jasper platform. Disable DNOTIFY, MAX8660 regulator, 88pm860x PMIC. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 66b196475031c748a5861390a4fadb915e14ccdc Author: Haojian Zhuang Date: Wed Apr 28 10:59:45 2010 -0400 [ARM] mmp: enable L2 in mmp2 Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit e598863690d956ad4e18904bb5b6c63fea1ad255 Author: Haojian Zhuang Date: Wed Apr 28 10:48:24 2010 -0400 [ARM] mmp: update clock register function Use clk_add_table in order to sync with clock driver. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit f97cab28b1895ecb0aa317cc785bb209f57fc1e8 Author: Eric Miao Date: Wed Apr 14 07:00:42 2010 +0800 [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond delay_detect in HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call to msecs_to_jiffies() at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms. The assignment in csb726.c was incorrect, and is fixed in this patch as a result. Signed-off-by: Eric Miao Acked-by: Robert Jarzmik Acked-by: Marc Zyngier Acked-by: Marek Vasut Acked-by: Mike Rapoport Acked-by: Daniel Mack commit e66b6d8e86a67c637203684ab76ea760dccb10f9 Author: Marek Vasut Date: Fri Mar 26 06:51:32 2010 +0100 MAINTAINERS: New MAINTAINERS entries for Zipit Z2 and Voipac PXA270 Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit fb25cb33096e2f86be5e45fecbc4d20eb66a9953 Author: Marek Vasut Date: Sun May 2 06:10:25 2010 +0200 [ARM] pxa/vpac270: fix now invalid bit of UP2OCR This patch removes write to UP2OCR[DMSTATE] (ex-UP2OCR_DPPUBE) which is invalid on PXA270C5 and later. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit bcc399bb491e0971d84aba593d79d3addf5d31ee Author: Marek Vasut Date: Sat May 1 06:54:36 2010 +0200 [ARM] pxa/vpac270: add OneNAND support Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit aeec1346884688b86ac7f0f36fb30aba30b459d8 Author: Marek Vasut Date: Mon Apr 26 23:23:48 2010 +0200 [ARM] pxa/vpac270: remove TS_IRQ magic number The touchscreen GPIO IRQ was used as a magic number. Define it properly in the board header file. This is a simple cleanup patch. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 052345aec01cbd22285771eee6e08486c07d3bcc Author: Marek Vasut Date: Mon Apr 26 21:46:07 2010 +0200 [ARM] pxa/vpac270: add ide support This patch adds support for the on-board IDE channel. I tested this with a CDROM connected over 2.5-3.5 IDE reduction with external power supplied to the CDROM. This was not tested with the Voipac 270-HDD-000 (official Voipac HDD module), but I expect no problems. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 83a4a1022654cbb9dd55fcf7c28807a634db54bc Author: Marek Vasut Date: Fri Mar 26 05:38:10 2010 +0100 [ARM] pxa/vpac270: Add DS1339 RTC support Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 1a8fb70e484589105a77f44bcd11e531c5fbe789 Author: Marek Vasut Date: Fri Mar 26 04:45:54 2010 +0100 [ARM] pxa/vpac270: Add touchscreen support This adds support for the UCB1400 touchscreen found in the VPAC270 device. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 947fb57e3a6be2920423de42a503eea08b0c0763 Author: Marek Vasut Date: Wed Mar 10 05:38:54 2010 +0100 [ARM] pxa/vpac270: add ethernet support Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 3d98f8816adafce2933599902fd9a5c0ccedd822 Author: Marek Vasut Date: Wed Mar 10 05:24:27 2010 +0100 [ARM] pxa/vpac270: UDC and UHC support NOTE: I wasn't able to get it running without reseting the HXOE (so it's there based on my tests with the hardware). I'll have to investigate it properly when I have more time. Signed-off-by: Marek Vasut Reviewed-by: Robert Jarzmik Signed-off-by: Eric Miao commit addff0faecfc5e73e8a742687255cef847e260db Author: Marek Vasut Date: Wed Mar 10 04:16:28 2010 +0100 [ARM] pxa: add support for Voipac PXA270 PCMCIA PCMCIA support for Voipac PXA270 Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 543cd84255f499a53d409014bc5ba71543474b05 Author: Marek Date: Tue Mar 9 04:04:12 2010 +0100 [ARM] pxa: add basic support for Voipac PXA270 SBC This patch adds basic support for the Voipac PXA270 SBC. The device consists of the following hardware: - PXA270 @ 520 MHz - 256MB RAM (sparsemem, 2*128MB regions) - 64MB NOR flash - 640x480 LCD - Ports: 2xUHC, 1xUDC, 1xPCMCIA, VGA, FFUART, 2xPS2, Speaker, MIC Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit b637799248520d711f0fdc64666131c1c869cfbc Author: Marek Vasut Date: Sun Feb 28 12:41:23 2010 +0100 [ARM] pxa: add basic support for the Aeronix Zipit Z2 handheld This patch adds support for the Zipit Z2. The parts missing from this patch are the battery support, SPI driver for the LCD and support for the Silicon Serial ID chip. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 818809752303b5b792dde4ace6321e8ccc180f65 Author: Igor Grinberg Date: Tue Mar 9 11:43:52 2010 +0200 [ARM] pxa/cm-x300: update the memory fixup. CM-X300 bootloader passes DRAM configuration information in ATAGS, however, the first memory bank is reported at actual physical address 0x8000000. Use the configuration information supplied by the bootloader and cope with the necessity to have PHYS_ADDR=0xa0000000. Signed-off-by: Igor Grinberg Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao commit d176d64b54c72ee00f825dddd63830f8bd2b5155 Author: Igor Grinberg Date: Tue Mar 9 11:43:51 2010 +0200 [ARM] pxa/cm-x300: add regulator on vcc_core Signed-off-by: Igor Grinberg Signed-off-by: Eric Miao commit e4e309708eeb87a5b2429bc1f9bd1bc469d5a8b0 Author: Igor Grinberg Date: Tue Mar 9 11:43:50 2010 +0200 [ARM] pxa/cm-x300: fix da903x IRQ line assignment Signed-off-by: Igor Grinberg Signed-off-by: Eric Miao commit d768c67c0cc70c7817585676a40e0d2a9094bdbe Author: Igor Grinberg Date: Tue Mar 9 11:43:49 2010 +0200 [ARM] pxa/cm-x300: da903x WLED is not connected on cm-x300 Signed-off-by: Igor Grinberg Signed-off-by: Eric Miao commit 03ba7e07f5025710470b12e18e2b9b2979d836db Author: Igor Grinberg Date: Tue Mar 9 11:43:48 2010 +0200 [ARM] pxa/cm-x300.c: add battery charger support Signed-off-by: Igor Grinberg Signed-off-by: Eric Miao commit b1d9bf1d9836dcee235f49bb4eb5ba4450a3a678 Author: Eric Miao Date: Tue Apr 27 15:09:33 2010 +0800 [ARM] pxa: remove pxa_gpio_mode() and files Signed-off-by: Eric Miao commit 25646d70a0d386ab923a189f9790aeae3eb4f1b5 Author: Eric Miao Date: Tue Apr 27 14:50:54 2010 +0800 input: remove obsolete {corgi,spitz,tosa}kbd.c Signed-off-by: Eric Miao commit cb8f3c7dea960c27fcc66830cdaab82b13f1b597 Author: Eric Miao Date: Tue Apr 27 14:43:03 2010 +0800 [ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/Kconfig Tosa is now able to use generic matrix keypad driver instead of the deprecated tosakbd.c, where CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is still useful. Move it to mach/Kconfig. Signed-off-by: Eric Miao commit cb432b358dced89bd2af86b3f783a0a99e489421 Author: Eric Miao Date: Mon Jan 11 21:27:21 2010 +0800 [ARM] pxa/corgi: cleanup GPIO configurations and low power mode settings Signed-off-by: Eric Miao commit e63f591a8ce5d3b5214a14d6cebaad7b6c1c4b4c Author: Eric Miao Date: Fri Jan 8 13:32:46 2010 +0800 [ARM] pxa/corgi: use generic GPIO API and remove pxa_gpio_mode() Signed-off-by: Eric Miao commit b6eede112673678f8a7a1680d6ad12245443829d Author: Eric Miao Date: Mon Jan 11 16:17:25 2010 +0800 [ARM] pxa/spitz: use generic GPIO API and remove pxa_gpio_mode() REVISIT: change to GPIO18 is ugly, need to make sure whether that's really necessary - GPIO18_RDY as an VLIO input signal - we don't normally need to do such kind of trick during low power mode. Signed-off-by: Eric Miao commit 1fe8c2bcad52d16e4d31d3680b9bb536c56df3d8 Author: Eric Miao Date: Tue Apr 27 11:14:24 2010 +0800 [ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified Signed-off-by: Eric Miao commit c09f431c338cf032c68ea68915f4dd85d92fd526 Author: Eric Miao Date: Tue Apr 20 14:52:50 2010 +0800 [ARM] pxa: allow keypad GPIOs to wakeup when configured as generic Signed-off-by: Eric Miao commit 1106143d7ab43ba07678c88c85417df219354ae8 Author: Eric Miao Date: Mon Jan 11 21:25:15 2010 +0800 [ARM] pxa: add MFP_LPM_KEEP_OUTPUT flag to pin config Some pins are expected to keep their last level during suspend, and introduce MFP_LPM_KEEP_OUTPUT for this. Signed-off-by: Eric Miao commit c8ee5c69516fdd973b981e3ac12d49b3133930cd Author: Julia Lawall Date: Mon Mar 22 16:16:24 2010 +0800 [ARM] pxa: use resource_size() in ssp.c Signed-off-by: Julia Lawall Signed-off-by: Eric Miao commit 077de1ad5ad8b4e08fd8853ae7e4cc628c1a369b Author: Julia Lawall Date: Mon Mar 22 16:11:55 2010 +0800 [ARM] pxa: avoid NULL dereferencing in error handling of ssp.c The assignments of res to the results of the two calls to platform_get_resource make it impossible to use res in the error handling code in the arguments to release_mem_region. The semantic match that finds the former problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E, E1; identifier f; statement S1,S3; iterator iter; @@ if ((E == NULL && ...) || ...) { ... when != false ((E == NULL && ...) || ...) when != true ((E != NULL && ...) || ...) when != iter(E,...) S1 when != E = E1 ( sizeof(E->f) | * E->f ) ... when any return ...; } else S3 // Signed-off-by: Julia Lawall Signed-off-by: Eric Miao commit 07871c195a5ec7d59d34994c123472b113da09ba Author: Haojian Zhuang Date: Fri Mar 19 11:55:14 2010 -0400 [ARM] mmp: enable ssp in aspenite Configure both ssp and wm8753 in aspenite. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 7e4992288e55f1e15f7498ead618b3943f5cfd3f Author: Haojian Zhuang Date: Fri Mar 19 11:53:17 2010 -0400 [ARM] mmp: support ssp in pxa168 Support ssp devices in PXA168. PXA168 could reuse the code of PXA SSP. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 004690f05244e1a41824cda7dc4feb7804964dc6 Author: Haojian Zhuang Date: Fri Mar 19 11:52:39 2010 -0400 [ARM] pxa: simplify ifdef in ssp.h Try to keep minimum ifdef in ssp.h. Some of the definitions are valid only to specific SoCs, and device drivers should be responsible to take care of these difference. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 866d091dcb043594626d4facf7c6fcffcc7c8d35 Author: Eric Miao Date: Tue Mar 16 17:30:15 2010 +0800 [ARM] pxa: remove incorrect select PXA_SSP in Kconfig PXA_SSP is actually used by drivers like drivers/spi/pxa2xx_spi.c and sound/soc/pxa/pxa-ssp.c, not by boards. Remove those incorrect 'select' from Kconfig and make SOC_PXA_SSP to select. Signed-off-by: Eric Miao commit 54c39b420f017c546fb130a05c14bdb0a7910f98 Author: Haojian Zhuang Date: Tue Mar 16 17:12:37 2010 +0800 [ARM] pxa: move ssp into common plat-pxa Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Eric Miao commit be1194cca55961b4dd98ea17fb24f0ffc6fa2213 Author: Eric Miao Date: Tue Mar 16 17:21:57 2010 +0800 [ARM] pxa: remove unnecessary #include of Signed-off-by: Eric Miao commit 83f2889643d8efbc7fe925afbaa114e775699d7c Author: Eric Miao Date: Tue Mar 16 17:03:20 2010 +0800 [ARM] pxa: merge regs-ssp.h into ssp.h No need to separate them as they should be together from the begining. Signed-off-by: Eric Miao commit c9840daa70fbb8f6031fcd1f254a3da49a41ea7b Author: Eric Miao Date: Tue Mar 16 16:48:01 2010 +0800 [ARM] pxa: correct SSCR0_SCR to support multiple SoCs The previous definitions of SSCR0_SCR and SSCR0_SerClkDiv() prevented them being used simultaneously when supporting multiple PXA SoCs, esp. in drivers/spi/pxa2xx_spi.c, make them correct. The change from SSCR0_SerClkDiv(2) to SSCR0_SCR(2), will make the result a little bit different in pxa2xx_spi_probe(), however, since that's only used as a default initialization value, it's acceptable. Signed-off-by: Eric Miao commit 793ffb9ed3179906760874689a99d4863d76914e Author: Eric Miao Date: Tue Mar 16 14:44:05 2010 +0800 [ARM] pxa: remove the now legacy SSP API Signed-off-by: Eric Miao commit 639b91a364fafea24fc1d2e8853c12ce45d4ceea Author: Eric Miao Date: Mon Mar 15 22:39:27 2010 +0800 [ARM] pxa: remove now un-used corgi_ssp.c and corgi_lcd.c The only use of corgi_ssp.c is corgi_ts.c, which is now deprecated and removed. Remove corgi_ssp.c and corgi_lcd.c and their relevant function declarations and data structures. Signed-off-by: Eric Miao Cc: Richard Purdie Cc: Pavel Machek commit 5700929d2209c5e2038f340bacc91e9818439cdf Author: Eric Miao Date: Mon Mar 15 22:23:09 2010 +0800 input: remove now deprecated corgi_ts.c touchscreen driver The corgi touchscreen is now deprecated in favour of the generic ads7846.c driver. The noise reduction technique used in corgi_ts.c, which is to wait till vsync before ADC sampling, is also integrated into ads7846 driver now. Provided that the original driver is not generic and is difficult to maintain, it will be removed now. Signed-off-by: Eric Miao Cc: Richard Purdie Cc: Pavel Machek Cc: Dmitry Torokhov commit a52357259680fe5368c2fabf5949209e231f2aa2 Author: Joerg Roedel Date: Tue May 11 17:12:33 2010 +0200 x86/amd-iommu: Add amd_iommu=off command line option This patch adds a command line option to tell the AMD IOMMU driver to not initialize any IOMMU it finds. Signed-off-by: Joerg Roedel commit 8e6d5573af55435160d329f6ae3fe16a0abbdaec Author: Lin Ming Date: Sat May 8 20:28:41 2010 +1000 perf, powerpc: Implement group scheduling transactional APIs [paulus@samba.org: Set cpuhw->event[i]->hw.config in power_pmu_commit_txn.] Signed-off-by: Lin Ming Signed-off-by: Paul Mackerras Signed-off-by: Peter Zijlstra LKML-Reference: <20100508102841.GA10650@brick.ozlabs.ibm.com> Signed-off-by: Ingo Molnar commit 96c21a460a37880abfbc8445d5b098dbab958a29 Author: Peter Zijlstra Date: Tue May 11 16:19:10 2010 +0200 perf: Fix exit() vs event-groups Corey reported that the value scale times of group siblings are not updated when the monitored task dies. The problem appears to be that we only update the group leader's time values, fix it by updating the whole group. Reported-by: Corey Ashford Signed-off-by: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: # .34.x LKML-Reference: <1273588935.1810.6.camel@laptop> Signed-off-by: Ingo Molnar commit 050735b08ca8a016bbace4445fa025b88fee770b Author: Peter Zijlstra Date: Tue May 11 11:51:53 2010 +0200 perf: Fix exit() vs PERF_FORMAT_GROUP Both Stephane and Corey reported that PERF_FORMAT_GROUP didn't work as expected if the task the counters were attached to quit before the read() call. The cause is that we unconditionally destroy the grouping when we remove counters from their context. Fix this by splitting off the group destroy from the list removal such that perf_event_remove_from_context() does not do this and change perf_event_release() to do so. Reported-by: Corey Ashford Reported-by: Stephane Eranian Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: # .34.x LKML-Reference: <1273571513.5605.3527.camel@twins> Signed-off-by: Ingo Molnar commit 6a2f1ee1f9bb5346644105c9355e9e06f6a847d3 Author: Mark Brown Date: Mon May 10 18:36:37 2010 +0100 ASoC: Don't restart unconfigured WM8994 FLLs If the FLL is not configured attempting to resume it will produce a warning message so skip the resume. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 6adb26bd03f6056357298bc29d5c6acdea2b216a Author: Mark Brown Date: Mon May 10 16:13:11 2010 +0100 ASoC: Reorder power down sequence for WM hubs devices Disable the output stage prior to the delay stage rather than the other way around. Fixes merge issue with previous headphone output path corrections. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3254d2850075c88083d870b3ee5e1ce0922cd3d9 Author: Mark Brown Date: Mon May 10 14:56:03 2010 +0100 ASoC: Add additional WM hubs DC servo trace Log the values we're getting back from the DC servo and the values we write to it. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit fd5722e5cdb233bbc47e782e10b3b5e3488a22fa Author: Mark Brown Date: Mon May 10 14:55:04 2010 +0100 ASoC: Add register write logging for WM8994 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 5b285cac3570a935aaa28312c1ea28f9e01c5452 Author: Patrick McHardy Date: Tue May 11 14:40:56 2010 +0200 ipv6: ip6mr: add support for dumping routing tables over netlink The ip6mr /proc interface (ip6_mr_cache) can't be extended to dump routes from any tables but the main table in a backwards compatible fashion since the output format ends in a variable amount of output interfaces. Introduce a new netlink interface to dump multicast routes from all tables, similar to the netlink interface for regular routes. Signed-off-by: Patrick McHardy commit d1db275dd3f6e4182c4c4b4a1ac6287925d60569 Author: Patrick McHardy Date: Tue May 11 14:40:55 2010 +0200 ipv6: ip6mr: support multiple tables This patch adds support for multiple independant multicast routing instances, named "tables". Userspace multicast routing daemons can bind to a specific table instance by issuing a setsockopt call using a new option MRT6_TABLE. The table number is stored in the raw socket data and affects all following ip6mr setsockopt(), getsockopt() and ioctl() calls. By default, a single table (RT6_TABLE_DFLT) is created with a default routing rule pointing to it. Newly created pim6reg devices have the table number appended ("pim6regX"), with the exception of devices created in the default table, which are named just "pim6reg" for compatibility reasons. Packets are directed to a specific table instance using routing rules, similar to how regular routing rules work. Currently iif, oif and mark are supported as keys, source and destination addresses could be supported additionally. Example usage: - bind pimd/xorp/... to a specific table: uint32_t table = 123; setsockopt(fd, SOL_IPV6, MRT6_TABLE, &table, sizeof(table)); - create routing rules directing packets to the new table: # ip -6 mrule add iif eth0 lookup 123 # ip -6 mrule add oif eth0 lookup 123 Signed-off-by: Patrick McHardy commit 6bd521433942d85e80f7a731a88cc91a327f38e0 Author: Patrick McHardy Date: Tue May 11 14:40:53 2010 +0200 ipv6: ip6mr: move mroute data into seperate structure Signed-off-by: Patrick McHardy commit f30a77842129b5656360cc1f5db48a3fcfb64528 Author: Patrick McHardy Date: Tue May 11 14:40:51 2010 +0200 ipv6: ip6mr: convert struct mfc_cache to struct list_head Signed-off-by: Patrick McHardy commit b5aa30b19121de49021fba57aa1f6e4c787fcf67 Author: Patrick McHardy Date: Tue May 11 14:40:50 2010 +0200 ipv6: ip6mr: remove net pointer from struct mfc6_cache Now that cache entries in unres_queue don't need to be distinguished by their network namespace pointer anymore, we can remove it from struct mfc6_cache add pass the namespace as function argument to the functions that need it. Signed-off-by: Patrick McHardy commit c476efbcde5ba58b81ac752f4a894d6db8e17d94 Author: Patrick McHardy Date: Tue May 11 14:40:48 2010 +0200 ipv6: ip6mr: move unres_queue and timer to per-namespace data The unres_queue is currently shared between all namespaces. Following patches will additionally allow to create multiple multicast routing tables in each namespace. Having a single shared queue for all these users seems to excessive, move the queue and the cleanup timer to the per-namespace data to unshare it. As a side-effect, this fixes a bug in the seq file iteration functions: the first entry returned is always from the current namespace, entries returned after that may belong to any namespace. Signed-off-by: Patrick McHardy commit f48f606d9f85a8b25c716082c73c36e9ff6f0cde Author: Jaroslav Kysela Date: Tue May 11 12:10:47 2010 +0200 [ALSA] snd-hda-intel: Improve azx_position_ok() Add back the zero return value (activate workqueue) when bdl_pos_adj is nonzero for position check. Do the position related check only for first next period using wallclk counter. Return -1 value (ignore interrupt) when period_bytes variable is zero. Signed-off-by: Jaroslav Kysela commit fcef85c0c122f90f57f2f3ef0caeaf6404d6e8f3 Author: Ben Dooks Date: Thu May 6 15:42:23 2010 +0900 ARM: SAMSUNG: Add spinlock locking to GPIO banks Add locking to each GPIO bank to allow for SMP capable code to use the gpiolib functions. See the gpio-core.h header file for more information. Signed-off-by: Ben Dooks commit d11bb4a925613fa814ed4ae350440eb24ebff336 Author: Peter Ujfalusi Date: Mon May 10 14:39:24 2010 +0300 ASoC: core: Fix for the volume limiting when invert is in use If the register for the volume needs invert, than the inversion need to be done from the chip maximum, and not from the platform dependent limit. Introduce soc_mixer_control.platform_max value, which initially equals to chip maximum. The snd_soc_limit_volume function only modify the platform_max, all volsw_info call returns this as well. The .max value holds the chip default (maximum), and it is used for the inversion, if it is needed. Additional check in the volsw_info call has been added to check the validity of the platform_max in case, when custom macros used by codec drivers are not initializing it correctly. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e54637205b00837bf00de916b0ae361c6aa0b139 Author: Jaroslav Kysela Date: Tue May 11 10:21:46 2010 +0200 [ALSA] snd-hda-intel: use WALLCLK register to check for early irqs Use 24Mhz WALLCLK register to ignore too early interrupts and wrong interrupt status. The bad timing confuses the higher ALSA layer and causes audio skipping. More information about behaviour and debugging can be found in kernel bz#15912. https://bugzilla.kernel.org/show_bug.cgi?id=15912 Signed-off-by: Jaroslav Kysela commit 83897badcb20243465b67a5826dfdda50a052eb5 Author: Bill Pemberton Date: Fri Apr 30 09:34:29 2010 -0400 agp: use NULL instead of 0 when pointer is needed Fixes sparse warning: drivers/char/agp/generic.c:1217:33: warning: Using plain integer as NULL pointer Signed-off-by: Bill Pemberton CC: linux-kernel@vger.kernel.org Signed-off-by: Jiri Kosina commit 758ef749f3b1a4c5e6ba5b5bca5eae968a2c0c5f Author: Bill Pemberton Date: Fri Apr 30 09:34:38 2010 -0400 rtc-v3020: make bitfield unsigned Fix sparse warning: include/linux/rtc-v3020.h:18:23: error: dubious one-bit signed bitfield Signed-off-by: Bill Pemberton CC: p_gortmaker@yahoo.com Signed-off-by: Jiri Kosina commit 8356dda2a573775b651ed13625d3a9ec48e0116c Author: Bill Pemberton Date: Fri Apr 30 09:34:28 2010 -0400 PCI: make bitfield unsigned Fix sparse warning: drivers/pci/pci.h:247:25: error: dubious one-bit signed bitfield Signed-off-by: Bill Pemberton CC: linux-pci@vger.kernel.org Signed-off-by: Jiri Kosina commit 8ac97b74bca1fc8a63b28cc6121519d1cfa2af99 Author: Bill Pemberton Date: Fri Apr 30 09:34:31 2010 -0400 jbd2: use NULL instead of 0 when pointer is needed Fixes sparse warning: fs/jbd2/journal.c:1892:9: warning: Using plain integer as NULL pointer Signed-off-by: Bill Pemberton CC: linux-ext4@vger.kernel.org Signed-off-by: Jiri Kosina commit c2d45b4da042720ae94648b417d0e051742441d4 Author: Bill Pemberton Date: Fri Apr 30 09:34:32 2010 -0400 cciss: fix shadows sparse warning Fix sparse warnings: drivers/block/cciss.c:1591:37: warning: symbol 'i' shadows an earlier one drivers/block/cciss.c:2437:21: warning: symbol 'i' shadows an earlier one Signed-off-by: Bill Pemberton Acked-by: Mike Miller Signed-off-by: Jiri Kosina commit e3174cfd2a1e28fff774681f00a0eef3d31da970 Author: Ingo Molnar Date: Tue May 11 08:31:49 2010 +0200 Revert "perf: Fix exit() vs PERF_FORMAT_GROUP" This reverts commit 4fd38e4595e2f6c9d27732c042a0e16b2753049c. It causes various crashes and hangs when events are activated. The cause is not fully understood yet but we need to revert it because the effects are severe. Reported-by: Stephane Eranian Reported-by: Lin Ming Cc: Peter Zijlstra Cc: Corey Ashford Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar commit 4b478ee2a1251d99813a90afeb0f809b3a8b04fb Author: Paul Mundt Date: Tue May 11 15:24:04 2010 +0900 sh: All SH-X3 cores support NUMA and SMP, update Kconfig. Signed-off-by: Paul Mundt commit beaffc399397eb9427225f37c1e56c099571b2df Author: Shahin Ghazinouri Date: Tue May 11 08:19:55 2010 +0200 ALSA: hda - Fixes distorted recording on US15W chipset The HDA controller in US15W (Poulsbo) reports inaccurate position values for capture streams when using the LPIB read method, resulting in distorted recordings. However, using the position buffer is broken for playback streams, resulting in a fallback to the LPIB method with the current driver. This patch works around the issue by independently detecting the read position method for capture and playback streams. The patch will not have any effect if the position fix method is explicitly set. [Code simplified by tiwai] Signed-off-by: Shahin Ghazinouri Signed-off-by: Takashi Iwai commit d250fe91ae129bff0968e685cc9c466d3a5e3482 Merge: 1ae5dc3 b56f2d5 Author: David S. Miller Date: Mon May 10 23:03:26 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 commit 21823259a70b7a2a21eea1d48c25a6f38896dd11 Author: Paul Mundt Date: Tue May 11 13:52:50 2010 +0900 sh: Ensure active regions have a backing PMB entry. In the NUMA or memory hot-add case where system memory has been partitioned up, we immediately run in to a situation where the existing PMB entry doesn't cover the new range (primarily as a result of the entry size being shrunk to match the node size early in the initialization). In order to fix this up it's necessary to preload a PMB mapping for the new range prior to activation in order to circumvent reset by MMU. Signed-off-by: Paul Mundt commit dfbca89987b74c34d9b1a2414b0e5ccee65347e0 Author: Paul Mundt Date: Tue May 11 13:50:29 2010 +0900 sh: Reject small mappings for PMB bolting. The minimum section size for the PMB is 16M, so just always error out early if the specified size is too small. This permits us to unconditionally call in to pmb_bolt_mapping() with variable sizes without wasting a TLB and cache flush for the range. Signed-off-by: Paul Mundt commit 4bc277ac9cae60e11fe2e557e4ea4acb56d3dc9a Author: Paul Mundt Date: Tue May 11 13:32:19 2010 +0900 sh: bootmem refactoring. This reworks much of the bootmem setup and initialization code allowing us to get rid of duplicate work between the NUMA and non-NUMA cases. The end result is that we end up with a much more flexible interface for supporting more complex topologies (fake NUMA, highmem, etc, etc.) which is entirely LMB backed. This is an incremental step for more NUMA work as well as gradually enabling migration off of bootmem entirely. Signed-off-by: Paul Mundt commit 15f2a7967a46c7fab579ab88b9f1e0c7f78ac495 Merge: 4f615d5 7aed3b3 Author: Paul Mundt Date: Tue May 11 11:53:11 2010 +0900 Merge branches 'sh/clkfwk' and 'sh/kexec' commit 4f615d575c17195f975cf8314be54f362d859a3f Author: Hiroshi DOYU Date: Mon May 10 14:50:55 2010 +0300 sh: clkfwk: Use debugfs_remove_recursive() for rewinding Rewinding each debugfs entries to unregister if an error happens. Based on the commit ca4caa4e1d45f9542fa54263974d0ef637157b4a Signed-off-by: Hiroshi DOYU Signed-off-by: Paul Mundt commit 9e1985e13d42b4b66af94637346849565174309d Author: Magnus Damm Date: Mon May 10 14:02:09 2010 +0000 sh: get rid of div6 clock names Get rid of div6 clock names on sh7343/sh7366/sh7722/sh7723/sh7724 Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 098ec49b684313cbd2ba1e24db61cfda9788ff73 Author: Magnus Damm Date: Mon May 10 14:01:55 2010 +0000 sh: tie in div6 clocks using clkdev Use clkdev for div6 lookup on SH-Mobile processors: sh7343/sh7366/sh7722/sh7723/sh7724 Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 08134c3c629bf128245f721391b96a858d88e997 Author: Magnus Damm Date: Mon May 10 14:01:44 2010 +0000 sh: get rid of hwblk clock names Remove the clock name from sh7722/sh7723/sh7724 hwblk clocks. Lookup is handled by clkdev. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d97432f1014c73bbace9eb1e67742c1bcab0c3cd Author: Magnus Damm Date: Mon May 10 14:01:34 2010 +0000 sh: allow registering clocks without name Modify the SuperH clock code to support struct clk with NULL as name. Such clocks will not be hooked up to debugfs. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit fd30401b07fdcf21e4be87fd276d1b2c84d712a3 Author: Magnus Damm Date: Mon May 10 14:01:22 2010 +0000 sh: tie in hwblk clocks using clkdev Use clkdev for lookup of hwblk clocks on sh7722/sh7723/sh7724. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e4e06697977bf6731d940ab1bd84e16cb53c3ae3 Author: Magnus Damm Date: Mon May 10 14:01:12 2010 +0000 sh: scif and tmu clkdev changes Modify sh7722/sh7723/sh7724 to use clkdev for TMU and SCIF clock lookups. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f3d51e13fea901729fef15bf1c32ca004d45476e Author: Magnus Damm Date: Mon May 10 14:01:02 2010 +0000 sh: hwblk index rework Rework the sh7722/sh7723/sh7724 hwblk code to use the hwblk id as index in the mstp clock array. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f001d5b28bc583c85281a9ce315ac16970201eae Author: Thomas Abraham Date: Mon Apr 19 20:05:08 2010 +0900 ARM: S5P: Add USB External Crystal clock definition Add USB external crystal clock definition Xusbxti to common S5P clock code. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b78232da3f85950a207bbcb64db46fd95b581465 Author: Jongpill Lee Date: Fri Mar 19 15:33:31 2010 +0900 ARM: S5PV210: Bug fix on PWM Timer This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering. Signed-off-by: Jongpill Lee Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit dcd897dba163e746cd98d8290c5a18dc47157c64 Author: Jongpill Lee Date: Fri Mar 19 15:33:22 2010 +0900 ARM: S5P6442: Bug fix on PWM Timer This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering. Signed-off-by: Jongpill Lee Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 474b62f573360947e2740458bde3778d420e1b40 Author: Jongpill Lee Date: Fri Mar 19 15:33:12 2010 +0900 ARM: S5P6440: Bug fix on PWM Timer This patch fixes return value in below functions - pwm_cfg_src_is_tclk - tcfg_to_divisor - pwm_tdiv_has_div1 - pwm_tdiv_div_bits And this patch changes Copyright ordering, and addes 'based on' information. Signed-off-by: Jongpill Lee Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 4376030a54860dedab9d848dfa7cc700a6025c0b Author: Mathieu Desnoyers Date: Sat Apr 17 08:48:39 2010 -0400 rcu head introduce rcu head init on stack PEM: o Would it be possible to make this bisectable as follows? a. Insert a new patch after current patch 4/6 that defines destroy_rcu_head_on_stack(), init_rcu_head_on_stack(), and init_rcu_head() with their !CONFIG_DEBUG_OBJECTS_RCU_HEAD definitions. This patch performs this transition. Signed-off-by: Mathieu Desnoyers CC: "Paul E. McKenney" CC: David S. Miller CC: akpm@linux-foundation.org CC: mingo@elte.hu CC: laijs@cn.fujitsu.com CC: dipankar@in.ibm.com CC: josh@joshtriplett.org CC: dvhltc@us.ibm.com CC: niv@us.ibm.com CC: tglx@linutronix.de CC: peterz@infradead.org CC: rostedt@goodmis.org CC: Valdis.Kletnieks@vt.edu CC: dhowells@redhat.com CC: eric.dumazet@gmail.com CC: Alexey Dobriyan Signed-off-by: Paul E. McKenney commit a5d8e467f83f6672104f276223a88e3b50cbd375 Author: Mathieu Desnoyers Date: Sat Apr 17 08:48:38 2010 -0400 Debugobjects transition check Implement a basic state machine checker in the debugobjects. This state machine checker detects races and inconsistencies within the "active" life of a debugobject. The checker only keeps track of the current state; all the state machine logic is kept at the object instance level. The checker works by adding a supplementary "unsigned int astate" field to the debug_obj structure. It keeps track of the current "active state" of the object. The only constraints that are imposed on the states by the debugobjects system is that: - activation of an object sets the current active state to 0, - deactivation of an object expects the current active state to be 0. For the rest of the states, the state mapping is determined by the specific object instance. Therefore, the logic keeping track of the state machine is within the specialized instance, without any need to know about it at the debugobject level. The current object active state is changed by calling: debug_object_active_state(addr, descr, expect, next) where "expect" is the expected state and "next" is the next state to move to if the expected state is found. A warning is generated if the expected is not found. Signed-off-by: Mathieu Desnoyers Reviewed-by: Thomas Gleixner Acked-by: David S. Miller CC: "Paul E. McKenney" CC: akpm@linux-foundation.org CC: mingo@elte.hu CC: laijs@cn.fujitsu.com CC: dipankar@in.ibm.com CC: josh@joshtriplett.org CC: dvhltc@us.ibm.com CC: niv@us.ibm.com CC: peterz@infradead.org CC: rostedt@goodmis.org CC: Valdis.Kletnieks@vt.edu CC: dhowells@redhat.com CC: eric.dumazet@gmail.com CC: Alexey Dobriyan Signed-off-by: Paul E. McKenney commit e61a639a794063d78fd248a37ce2c21d5c81fc19 Author: Tom Zanussi Date: Sun May 9 23:47:00 2010 -0500 perf/trace/scripting: syscall-counts script cleanup A small fix for the syscall counts script: - silence the match output in the shell script Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-10-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit 79e653f1bf2e52d12a952366e782dadf590b9d1d Author: Tom Zanussi Date: Sun May 9 23:46:59 2010 -0500 perf/trace/scripting: syscall-counts-by-pid script cleanup A small fix for the syscall counts by pid script: - silence the match output in the shell script Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-9-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit a4ab0c12975d1286b2696370f5e0576450609bf0 Author: Tom Zanussi Date: Sun May 9 23:46:58 2010 -0500 perf/trace/scripting: failed-syscalls-by-pid script cleanup A small fixe for the failed syscalls by pid script: - silence the match output in the shell script Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-8-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit 3824a4e8da9791f4eed99d69bfcdb3b42f440426 Author: Tom Zanussi Date: Sun May 9 23:46:57 2010 -0500 perf/trace/scripting: don't show script start/stop messages by default Only print the script start/stop messages in verbose mode - users normally don't care and it just clutters up the output. Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-7-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit a3412d9b358d37fce4527fd67ea601635f2b9496 Author: Tom Zanussi Date: Sun May 9 23:46:56 2010 -0500 perf/trace/scripting: workqueue-stats script cleanup Some minor fixes for the workqueue-stats script: - Fix nuisance 'use of uninitialized value' warnings Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-6-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit e366728d57cb8c708f76b282ae194c6044355b5f Author: Tom Zanussi Date: Sun May 9 23:46:55 2010 -0500 perf/trace/scripting: wakeup-latency script cleanup Some minor fixes for the wakeup-latency script: - Fix nuisance 'use of uninitialized value' warnings - Avoid divide-by-zero error Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-5-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit e88a4bfbcda440b1c6b9d5a31a554a6ad9686182 Author: Tom Zanussi Date: Sun May 9 23:46:54 2010 -0500 perf/trace/scripting: rwtop script cleanup A couple of fixes for the rwtop script: - printing the totals and clearing the hashes in the signal handler eventually leads to various random and serious problems when running the rwtop script continuously. Moving the print_totals() calls to the event handlers solves that problem, and the event handlers are invoked frequently enough that it doesn't affect the timeliness of the output. - Fix nuisance 'use of uninitialized value' warnings Cc: Frédéric Weisbecker Cc: Ingo Molnar Message-Id: <1273466820-9330-4-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit 6922c3d772711239e75ddaea760e6b0535e7e7a6 Author: Tom Zanussi Date: Sun May 9 23:46:53 2010 -0500 perf/trace/scripting: rw-by-pid script cleanup Some minor fixes for the rw-by-pid script: - Fix nuisance 'use of uninitialized value' warnings - Change the failed read/write sections to sort by error counts Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit c3f5fd287aa897f710f3305367a1d256c9cf3e83 Author: Tom Zanussi Date: Sun May 9 23:46:52 2010 -0500 perf/trace/scripting: failed-syscalls script cleanup A couple small fixes for the failed syscalls script: - The script description says it can be restricted to a specific comm, make it so. - silence the match output in the shell script Cc: Frédéric Weisbecker Cc: Ingo Molnar LKML-Reference: <1273466820-9330-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit fefb0b94bbab858be0909a7eb5ef357e0f996a79 Author: Arnaldo Carvalho de Melo Date: Mon May 10 13:57:51 2010 -0300 perf hist: Calculate max_sym name len and nr_entries Better done when we are adding entries, be it initially of when we're re-sorting the histograms. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit db125c787bc2c07ad97ba94707b653885d723a40 Author: Johannes Berg Date: Fri May 7 01:49:15 2010 -0700 iwlwifi: clear driver stations when going down During a hw restart, mac80211 will attempt to reconfigure all stations. Currently, that fails and leads to warnings because we still have the stations marked active. Therefore, clear all stations when doing down. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 63d4176933a5c4d9387eb79e1d50a9232e58c06e Author: Johannes Berg Date: Fri Apr 30 11:30:50 2010 -0700 iwlwifi: remove pointless HT check Remove the check before invoking iwl_set_ht_add_station(), since neither of the conditions in this check makes sense, as either we pass in a NULL ht_info (first branch) or in the IBSS case an ht_info with ht_enabled=false. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 57f8db89340f6ba5d913a1950b8dad4431d2beda Author: Johannes Berg Date: Fri Apr 30 11:30:49 2010 -0700 iwlwifi: rename iwl_add_local_station This function is now only used for the special IBSS BSSID station, so rename it to indicate this. The new name is iwl_add_bssid_station. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit c1182743b688bce7b0bbd7cff78b049e45672cb5 Author: Johannes Berg Date: Fri Apr 30 11:30:48 2010 -0700 iwlwifi: move iwl_find_station() to 4965 4965 code is the only thing that now still needs iwl_find_station(), so move it there and make it static. Everything else can rely on the station data passed by mac80211. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit bdbb612fb2c49111d393a69a08b0328e51913c17 Author: Johannes Berg Date: Fri Apr 30 13:53:37 2010 -0700 iwlwifi: use iwl_sta_id() for TKIP key update With the station ID being stored in the station struct, which mac80211 gives us for TKIP phase 1 key updates, we can also remove the use of iwl_find_station() in that code path. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 619753ff57a2e15b58546b856536928d1a3daef9 Author: Johannes Berg Date: Fri Apr 30 11:30:46 2010 -0700 iwlagn: use iwl_sta_id() for aggregation With the station ID being stored in the station struct, which mac80211 gives us for aggregation callbacks, we can also remove the use of iwl_find_station() in those code paths. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 2a87c26bbe9587baeb9e56d3ce0b4971bd777643 Author: Johannes Berg Date: Fri Apr 30 11:30:45 2010 -0700 iwlwifi: use iwl_find_station less Since we now store the station ID in each station struct, many places need not look at the station table any more since they can just pull the station ID out of the struct. Remove iwl_get_sta_id() and use iwl_sta_id() instead as appropriate. This reduces the amount of code needed to find the right station significantly, and works since mac80211 passes the station only after it has been fully initialised, ie. even if TX races with station addition it will only be passed to TX once the addition is complete. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 64ba9a54c60990416c4098c63792c37d8fccb9e1 Author: Johannes Berg Date: Fri Apr 30 11:30:44 2010 -0700 iwlwifi: add iwl_sta_id() In places where the station struct is guaranteed to exist (presumably), use this helper to get the station ID out of it (and warn if there's no station struct after all). Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit fd1af15d0a82ae681ecf34192150e27455c9c494 Author: Johannes Berg Date: Fri Apr 30 11:30:43 2010 -0700 iwlwifi: track station IDs mac80211 allows us to store private data per station, so put the station ID there. This allows us to avoid the station ID lookup when removing regular stations. To also be able to avoid the lookup to remove the special IBSS BSSID station, track its ID in the per-vif private data. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 4ff739747de20506e478269221f22f3d8d24c706 Author: Wey-Yi Guy Date: Fri Apr 30 11:35:16 2010 -0700 iwlwifi: provide more comments for cfg structure Provide comments for newly added cfg parameters Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 470356b891f1d18e87d5fdc393976fab6d0a978d Author: Wey-Yi Guy Date: Fri Apr 30 11:35:15 2010 -0700 iwlwifi: "tx power per chain" are part of ucode_tx_stats Move "tx power per chain" into ucode_tx_stats, it is debugging information provided by uCode as part of statistics notification. The "tx power per chain" parameters are optional parameters which only supported by 6000 series device today; those are reserved fields for all the other devices. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 3bce6066263efb5733ee2141ac8b56684fb3b0a7 Author: Reinette Chatre Date: Tue Apr 13 16:11:19 2010 -0700 iwlagn: work around rate scaling reset delay When station is using an HT channel to communicate to AP and communication is lost then driver will first be notified that channel is not an HT channel anymore before AP station is removed. A consequence of that is that the driver will know that it is not communicating on HT anymore, but the rate scaling table is still under the impression it is operating in HT. Any time after driver has been notified channel is not HT anymore there will thus be a firmware SYSASSERT when the current active LQ command is sent. A workaround for this issue is to not send a LQ command in the short time between being notified channel is not HT anymore and rate scaling table being updated. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2173 Signed-off-by: Reinette Chatre commit 2c810ccdbac434ae38f4ec5331d3f047dc90f98a Author: Johannes Berg Date: Thu Apr 29 00:53:29 2010 -0700 iwlwifi: rework broadcast station management Currently, the broadcast station is managed along with the interface type, rather than always being present. That leads to a bug with injection -- it is currently not possible to inject frames when the only virtual interface is a monitor, because in that the required broadcast station is missing. Additionally, allocating and deallocating the broadcast station's LQ all the time is wasteful, and the code to support this is fairly complex. So this changes completely the way we manage the broadcast station. Rather than manage it along with any interface, we now allocate it when we bring the device up, and remove it again when we bring the device down. When we bring the device up, we don't immediately program the broadcast station into it, instead we just mark it active and rely on the next restore cycle to upload it to the device. This works because an unassociated RXON is always required at least once to set up device parameters, which implies a reprogramming of stations into the device. As we now manage all stations properly, there no longer is a need for forcing a clearing of them via iwl_clear_ucode_stations(), which can become a lot simpler. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit a6a0345c837346d1b74f4907d4747e6c1053a99f Author: Johannes Berg Date: Thu Apr 29 10:41:07 2010 -0700 iwlwifi: split allocation/sending local station LQ Rename iwl_sta_init_lq to iwl_sta_alloc_lq and move sending it out into the caller. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 156b70d17ce85778341cfb2a90c5bcb14b28ab3f Author: Johannes Berg Date: Wed Apr 28 14:44:45 2010 -0700 iwlwifi: fix iwl_sta_init_lq station ID The "is_ap" argument to iwl_sta_init_lq is never true, so it and the corresponding code can be removed. However, it needs to have the station ID because it is also used for the IBSS BSSID station, and that doesn't have the broadcast ID. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 59c02b4149183cb53d95b1ce3a8188cbee63f57f Author: Johannes Berg Date: Thu Apr 29 04:43:10 2010 -0700 iwlwifi: note that priv->bssid is used only by 3945 The bssid member of struct iwl_priv is now only used by 3945 code, so note that. It shouldn't be used by any other code in the future. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit ca3c1f59dc469e19431c683383d8205397595806 Author: Johannes Berg Date: Thu Apr 29 04:43:09 2010 -0700 iwlwifi: use vif in iwl_ht_conf Pass the virtual interface pointer to iwl_ht_conf() so it doesn't need to rely on iw_mode and other global variables. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 3a065ab3b57bedefa1d59c88f731da6513ac482a Author: Johannes Berg Date: Thu Apr 29 04:43:08 2010 -0700 iwlwifi: remove useless priv->vif check This check is not useful, since we now no longer dereference priv->vif at this spot. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 832f47e333c7d0db632b57e9f07956ae40dd481d Author: Johannes Berg Date: Thu Apr 29 04:43:07 2010 -0700 iwlagn: use virtual interface in TX aggregation handling Most of the TX aggregation handling can be passed the virtual interface directly instead of having to rely on priv->vif. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 1dda6d28377bec52f96767e8d4a59aa95102b9dd Author: Johannes Berg Date: Thu Apr 29 04:43:06 2010 -0700 iwlwifi: push virtual interface through Rather than keeping every bit of information around in priv and the virtual interface, add a virtual interface to many functions and use the information directly from it. This removes beacon_int, assoc_capability and assoc_id from struct iwl_priv. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 3474ad635db371b0d8d0ee40086f15d223d5b6a4 Author: Johannes Berg Date: Thu Apr 29 04:43:05 2010 -0700 iwlwifi: apply filter flags directly Since iwl_configure_filter can now sleep since the mac80211 callback was changed, we can now apply filter flags changes directly. Also, while at it, make the code a bit more generic with a local macro. There's no need to check changed_flags since we apply all at the same time anyway. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit eafdfbd32aa9fcaf17733c04d5eb071af3b1ff47 Author: Johannes Berg Date: Thu Apr 29 04:43:04 2010 -0700 iwlagn: use vif->type to check station We need not check iw_mode, since we have the vif pointer available. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 93286db50130754d9655c457ad0e11cb8f37a10f Author: Johannes Berg Date: Thu Apr 29 04:43:03 2010 -0700 iwlagn: move iwl_get_ra_sta_id to 4965 This function is only needed by 4965, so it need not be in core code and can be made static. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 159605dd5ec6356f5a7f0c56d9b9e63e0e61f3a8 Author: Johannes Berg Date: Thu Apr 29 04:43:02 2010 -0700 iwlwifi: remove rts_threshold We never use that member of struct iwl_priv. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit a29576a7844326c5223f4d4adbfd3f4d64173d4c Author: Abhijeet Kolekar Date: Wed Apr 28 15:47:04 2010 -0700 iwl3945: add plcp error checking Add plcp error checking for 3945. After threshold of plcp is reached , it resets the radio Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit dd7a2509b3a79b290730a9c6a784bf03fedabb9a Author: Johannes Berg Date: Wed Apr 28 23:33:10 2010 -0700 iwlagn: implement loading a new firmware file type The old firmware file type does not allow indicating any firmware capabilities, which we frequently want to make things easier. This implements a new firmware type that is based on a TLV structure, and adds a TLV for the maximum length of probe requests in scans. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 0e9a44dc0bb718c28b20a48f551818036ef090ab Author: Johannes Berg Date: Wed Apr 28 12:09:16 2010 -0700 iwlagn: prepare for new firmware file format Currently the first four bytes in a firmware file indicate the major, minor and api versions as well as the serial number. These combined can never be zero, so we can use that special case for a new, future, file format. This patch simply shuffles the code and prepares for that new format. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit d1358f62d47c9e872994e5c6e9c9d6e1f31d24c4 Author: Johannes Berg Date: Wed Apr 28 12:09:15 2010 -0700 iwlwifi: move eeprom version printout to eeprom init It doesn't belong into firmware loading, it should instead be printed after loading the EEPROM. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 22adba2a6995dc24663251ffb954f8856968f26e Author: Johannes Berg Date: Wed Apr 28 12:09:14 2010 -0700 iwlwifi: remove ucode virtual functions AGN devices all use the same ucode operations, except for 4965, because 4965 uses only v1 file headers. Therefore, we can remove all the indirection we have here and just code the API distinction in place, with a small special case for 4965. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 93b1a2f919a752bb689fdb0c5817c643c2f74435 Author: Johannes Berg Date: Wed Apr 28 12:09:13 2010 -0700 iwl3945: remove ucode access indirection As these function pointers will always point to the 3945 functions, we can just call them directly and avoid the indirection. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 3e4de7616fea5c68a9300af0e347a7f014ddcc63 Author: Johannes Berg Date: Wed Apr 28 12:09:12 2010 -0700 iwlagn: show and store firmware build number We currently display the build number only if debugging is enabled, but it is really helpful so show it all the time. Also store it so it can be retrieved later via ethtool. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 1fa61b2e793dad51271c7ce39377daade51261d7 Author: Johannes Berg Date: Wed Apr 28 08:44:52 2010 -0700 iwlwifi: manage IBSS station properly Currently iwlwifi will eventually exhaust the station table when adding the BSSID station for IBSS mode, unless the interface is set down. The new mac80211 ibss joined/left notification allows us to fix that easily by moving the code to add the IBSS station to the notification, and also adding code to remove it again when we leave the IBSS. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit c0222df86e55576ef879795b5a158c46e6653f07 Author: Johannes Berg Date: Wed Apr 28 08:44:51 2010 -0700 iwlwifi: pass address to iwl_remove_station We'll need that function for IBSS station management, so pass it the address, which is the only thing it uses from the station struct. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 6e0b9cac681bf9b633397d2d5270e5ab31ca04db Author: Johannes Berg Date: Wed Apr 28 08:44:50 2010 -0700 iwl3945: use iwl3945_add_bcast_station iwl3945 should not use iwl_add_local_station(..., false) because that would leave the IWL_STA_UCODE_INPROGRESS flag set for the station, which is not desirable. Instead it can use iwl3945_add_bcast_station() here. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit d2e210aef3a8e7472f91d10a50ecbc91c0a53d62 Author: Reinette Chatre Date: Fri Apr 23 10:33:33 2010 -0700 iwlwifi: make bcast LQ command available for later restore actions When adding the broadcast station the link quality command is generated on demand, sent to device, and disappears. It is thus not available for later cases when we need to restore stations and need to send the link quality command afterwards. Now, when first adding the broadcast station, also generate its link quality command to always be available for later restoring. Also fix an issue when adding local stations where the "in progress" state is never cleared. Reported-by: Johannes Berg Signed-off-by: Reinette Chatre commit 459bc732abad5e461da9a06d82dfc0cb1119ef5a Author: Shanyu Zhao Date: Tue Apr 27 22:05:15 2010 -0700 iwlwifi: dump firmware build info in error case Dump the firmware version and build number in case of firmware SW error. This would help firmware engineer analyze the error log. Requested-by: Jay Sternberg Signed-off-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit 3d38f1731e3a8217e228fde0a4bfece865bc7901 Author: Wey-Yi Guy Date: Tue Apr 27 18:43:33 2010 -0700 iwlwifi: checking for all the possible failure cases Multiple error condition require fw/rf reset, driver should check all the possible errors as long as the error checking functions for the devices are available. Reported-by: Reinette Chatre Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit f401241310f4260505b1c462807c83aac5e5bbc8 Author: Wey-Yi Guy Date: Tue Apr 27 14:10:00 2010 -0700 iwlwifi: wimax co-exist code clean up wifi/wimax co-exist command is part of _agn device configuration sequence; move it to iwl-agn-ucode.c which is more appropriate place for the function. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 0af0d04b8db7712498558541cbedeeebdbabf70f Author: Wey-Yi Guy Date: Mon Apr 26 16:08:27 2010 -0700 iwlwifi: give correct return information for tx power debugfs Return -EAGAIN when request tx power information and uCode is not ready; so it will not confuse with tx power information not available. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 65d1f89682acf4d61dec7a8b771ed34afb7c17d9 Author: Wey-Yi Guy Date: Sun Apr 25 15:41:43 2010 -0700 iwlwifi: use cfg to configure calibration operation sensitivity calibration and chain noise calibration are not available for all the devices; use .cfg to configure the availability of those calibration functions Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 6e5c800e75fad95f2a12d45d9b548b23834a13ff Author: Wey-Yi Guy Date: Tue Apr 27 14:00:28 2010 -0700 iwlwifi: use .cfg to enable/disable continuous ucode trace Instead of checking device type for enable/disable continuous ucode trace function; put it in .cfg for better control and more flexibilities. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 4e7033ef491a8447247e77b20626cbc197a2eb83 Author: Wey-Yi Guy Date: Tue Apr 27 14:33:33 2010 -0700 iwlwifi: remove device type checking for tx power in debugfs Instead of checking device type for enable/disable tx power control, move it to .cfg for better control and more flexibilities. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 92445c953eb5698d1abab16b9a43238effdc0a6d Author: Johannes Berg Date: Tue Apr 27 03:36:15 2010 -0700 iwlwifi: use vif iwl_bss_info_changed The iw_mode will always follow the only vif we have, but using the vif directly seems easier. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 683abfbefe95750f8aa47dc6d2a7ee41c01c14ad Author: Wey-Yi Guy Date: Mon Apr 26 17:20:07 2010 -0700 iwlwifi: rename "tx_power" to "chain_tx_power" The "chain_tx_power" debugfs function is to display the tx power per chain based. Name it "tx_power" is misleading. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 381733cc53ce7abf3d8498f8ccf7586546c0b264 Author: Wey-Yi Guy Date: Sun Apr 25 09:39:46 2010 -0700 iwlwifi: remove powersave debugfs if it is not supported For the devices do not have power save support, remove the power save control related debugfs files. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 1e460535ab3978b7a23e08e9f556af2f84c43235 Author: Abhijeet Kolekar Date: Fri Apr 23 14:14:53 2010 -0700 iwl3945: fix scan races Port following patch to 3945. "commit 90c4162ff59a3281b6d2f7206740be6217bd6758 Author: Johannes Berg Date: Wed Apr 7 00:21:36 2010 -0700 iwlwifi: fix scan races" Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit 95b13014bb761a267db8bc1a47cbb35ddde587ef Author: Shanyu Zhao Date: Wed Apr 21 11:46:33 2010 -0700 iwlwifi: rename 6000 series Gen2 devices to Gen2a Rename the current 6000 series Gen2 devices to Gen2a. Rename the ucode name prefix to iwlwifi-6000g2a. Also corrected the device IDs for Gen2a series devices. Signed-off-by: Jay Sternberg Signed-off-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit a15707d80ee9a0e0812c5f1a1ed8e41e0a6e52f3 Merge: 9459d59 562db53 Author: Reinette Chatre Date: Mon May 10 15:08:11 2010 -0700 Merge branch 'wireless-2.6' into wireless-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-dev.h commit 562db532760827f6ce30801a08e6b568848bc9f2 Author: Johannes Berg Date: Thu Apr 29 07:41:53 2010 -0700 iwlagn: wait for asynchronous firmware loading When we kick off a firmware loading process, and then unbind from the pci device right away, we get into trouble. Avoid that by waiting for the firmware loading to finish (whether successfully or not) before the unbind in iwl_pci_remove. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit ca0dbd86b12be9af7cda230890eb741d5cb8b624 Author: Thadeu Lima de Souza Cascardo Date: Fri May 7 16:52:26 2010 -0300 doc: inode uses a mutex instead of a semaphore. Replace the introduced i_sem by an i_mutex in the filesystem locking documentation. This was introduced [1] after all occurrences were already replaced in the same text [2]. However, the term "inode semaphore" has not been replaced then, and it's replaced now. [1] afddba49d18f346e5cc2938b6ed7c512db18ca68 [2] a7bc02f4f47fd0e7860c6589f0ad000d1476f7a3 Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Nick Piggin Cc: Artem Bityutskiy Cc: Randy Dunlap Cc: Christoph Hellwig Cc: Al Viro Signed-off-by: Jiri Kosina commit ce60d4d5d50a5454768faa522da98aa5f8070bd0 Author: Jan Kiszka Date: Mon Apr 19 23:53:07 2010 +0200 uml: i386: Avoid redefinition of NR_syscalls The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name. CC arch/um/kernel/skas/syscall.o/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning: "NR_syscalls" redefined In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3, from /data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6, from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10: /data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition Signed-off-by: Jan Kiszka Signed-off-by: Jiri Kosina commit 8f77578cc2debaeb30a4ef6206f4ba10944bdcd8 Author: Matt Helsley Date: Mon May 10 23:18:47 2010 +0200 Freezer / cgroup freezer: Update stale locking comments Update stale comments regarding locking order and add a little more detail so it's easier to follow the locking between the cgroup freezer and the power management freezer code. Signed-off-by: Matt Helsley Signed-off-by: Rafael J. Wysocki commit 543f2503a956601dd490c6cde0ebf6adb4653e50 Author: Mark Brown Date: Mon May 10 23:10:13 2010 +0200 PM / platform_bus: Allow runtime PM by default Currently the default runtime PM callbacks for platform devices return -ENOSYS, preventing the use of runtime PM platforms until they have provided at least a default implementation. This hinders the use of runtime PM by devices which work with many platforms such as memory mapped devices, MFDs and on chip IPs shared by multiple architectures. Change the default implementation to the standard pm_generic_runtime one, allowing drivers to use runtime PM without per-architecture changes. Signed-off-by: Mark Brown Acked-by: Greg Kroah-Hartman Signed-off-by: Rafael J. Wysocki commit 2f60ba706bd9af84c4eab704243b262e69556f2e Author: Rafael J. Wysocki Date: Mon May 10 23:09:30 2010 +0200 i2c: Fix bus-level power management callbacks There are three issues with the i2c bus type's power management callbacks at the moment. First, they don't include any hibernate callbacks, although they should at least include the .restore() callback (there's no guarantee that the driver will be present in memory before loading the image kernel and we must restore the pre-hibernation state of the device). Second, the "legacy" callbacks are not going to be invoked by the PM core since the bus type's pm object is not NULL. Finally, the system sleep PM (ie. suspend/resume) callbacks don't check if the device has been already suspended at run time, in which case they should skip suspending it. Also, it looks like the i2c bus type can use the generic subsystem-level runtime PM callbacks. For these reasons, rework the system sleep PM callbacks provided by the i2c bus type to handle hibernation correctly and to invoke the "legacy" callbacks for drivers that provide them. In addition to that make the i2c bus type use the generic subsystem-level runtime PM callbacks. Signed-off-by: Rafael J. Wysocki Acked-by: Mark Brown Acked-by: Jean Delvare commit ed77134bfccf5e75b6cbadab268e559dbe6a4ebb Author: Mark Gross Date: Thu May 6 01:59:26 2010 +0200 PM QOS update This patch changes the string based list management to a handle base implementation to help with the hot path use of pm-qos, it also renames much of the API to use "request" as opposed to "requirement" that was used in the initial implementation. I did this because request more accurately represents what it actually does. Also, I added a string based ABI for users wanting to use a string interface. So if the user writes 0xDDDDDDDD formatted hex it will be accepted by the interface. (someone asked me for it and I don't think it hurts anything.) This patch updates some documentation input I got from Randy. Signed-off-by: markgross Signed-off-by: Rafael J. Wysocki commit 0fef8b1e83c4ab08cf1304dbebcfd749caf4f187 Author: Randy Dunlap Date: Tue May 4 00:03:26 2010 +0200 PM / Hibernate: Fix block_io.c printk warning Fix printk format warning in block_io.c: kernel/power/block_io.c:41: warning: format '%ld' expects type 'long int', but argument 2 has type 'sector_t' Signed-off-by: Randy Dunlap Signed-off-by: Rafael J. Wysocki commit 6f612af57821c637b7eaca4374ac7b85f800d6e2 Author: Jiri Slaby Date: Sat May 1 23:54:02 2010 +0200 PM / Hibernate: Group swap ops Move all the swap processing into one function. It will make swap calls from a non-swap code easier. Signed-off-by: Jiri Slaby Signed-off-by: Rafael J. Wysocki commit 51fb352b2c586b29c7bba38178b3b5389a7fb074 Author: Jiri Slaby Date: Sat May 1 23:53:02 2010 +0200 PM / Hibernate: Move the first_sector out of swsusp_write The first sector knowledge is swap-only specific. Move it into the swap handle. This will be needed for later non-swap specific code moving into snapshot.c. Signed-off-by: Jiri Slaby Acked-by: Pavel Machek Signed-off-by: "Rafael J. Wysocki" commit 8a0d613fa12e1b7f7f71ca88ed7dc2a3de95121a Author: Jiri Slaby Date: Sat May 1 23:52:34 2010 +0200 PM / Hibernate: Separate block_io Move block I/O operations to a separate file. It is because it will be used later not only by the swap writer. Signed-off-by: Jiri Slaby Signed-off-by: Rafael J. Wysocki commit d3c1b24c50e8b2bbc840322caf26c7eada594d21 Author: Jiri Slaby Date: Sat May 1 23:52:02 2010 +0200 PM / Hibernate: Snapshot cleanup Remove support of reads with offset. This means snapshot_read/write_next now does not accept count parameter. It allows to clean up the functions and snapshot handle which no longer needs to care about offsets. /dev/snapshot handler is converted to simple_{read_from,write_to}_buffer which take care of offsets. Signed-off-by: Jiri Slaby Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit 6a727b43be8b005609e893a80af980808012cfdb Author: Jiri Slaby Date: Sat May 1 23:51:22 2010 +0200 FS / libfs: Implement simple_write_to_buffer It will be used in suspend code and serves as an easy wrap around copy_from_user. Similar to simple_read_from_buffer, it takes care of transfers with proper lengths depending on available and count parameters and advances ppos appropriately. Signed-off-by: Jiri Slaby Signed-off-by: Rafael J. Wysocki commit bc6a0cbd576c66995d782331456f68ae63a50af4 Author: Pavel Machek Date: Fri Apr 23 20:32:29 2010 +0200 PM / Hibernate: document open(/dev/snapshot) side effects Opening and closing /dev/snapshot causes the kernel to carry out some hibernate preparations that should be documented. [rjw: Added the changelog.] Signed-off-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit c92445fadb9179d811b5cb044947ad4712403541 Author: Dominik Brodowski Date: Fri Apr 23 20:32:23 2010 +0200 PM / Runtime: Add sysfs debug files Add a few sysfs files relating to runtime power management for advanced debug purposes: runtime_enabled: is runtime PM enabled for this device? States are "enabled", "disabled", "forbidden" or a combination of the latter two. runtime_status: what state is the device in currently? E.g., it reports "suspended" for runtime-suspended devices, and "active" for active devices. NOTE: if runtime_enabled returns "disabled", the value of this file may not reflect its physical state. runtime_usage: the runtime PM usage count of a device runtime_active_kids: the runtime PM children usage count of a device, or 0 if the ignore_children flag is set. Also, CONFIG_PM_SLEEP_ADVANCED_DEBUG is not defined in any Kconfig file, so replace it with CONFIG_PM_ADVANCED_DEBUG. Signed-off-by: Dominik Brodowski Acked-by: Alan Stern Signed-off-by: Rafael J. Wysocki commit d6f9cda1fd241bc7a1d896da94950fd972eca9b7 Author: Alan Stern Date: Fri Mar 26 23:53:55 2010 +0100 PM: Improve device power management document Improve the device power management document after it's been updated by the previous patch. Signed-off-by: Alan Stern Signed-off-by: Rafael J. Wysocki commit 624f6ec871886525ca19cf7841f918da91d4315e Author: Rafael J. Wysocki Date: Fri Mar 26 23:53:42 2010 +0100 PM: Update device power management document The device PM document, Documentation/power/devices.txt, is badly outdated and requires total rework to fit the current design of the PM framework. Make it more up to date. Signed-off-by: Rafael J. Wysocki Reviewed-by: Randy Dunlap commit 240c7337a4cd3d91b196c5ef97ad461b3a22fa09 Author: Alan Stern Date: Tue Mar 23 00:50:07 2010 +0100 PM: Allow runtime_suspend methods to call pm_schedule_suspend() This patch (as1361) changes the runtime PM interface slightly; it allows suspend requests to be scheduled while the runtime_suspend method is running. If the method succeeds then the scheduled request is cancelled, whereas if the method fails then an idle notification is sent only if no request was scheduled. Being able to schedule suspend requests from within a runtime_suspend method is useful for drivers that need to test for idleness and suspend the device all while holding a single spinlock, or for drivers that want to check for idleness by polling. Signed-off-by: Alan Stern Signed-off-by: Rafael J. Wysocki commit 228c54ef7a028d5a4b6606eb0c8035874d9b6788 Author: Dmitry Torokhov Date: Mon Mar 15 21:44:41 2010 +0100 PM: pm_wakeup - switch to using bool Also change couple of stubs implemented as macros in !CONFIG_PM case in statinc inline functions to provide proper typechecking of arguments regardless of config. Signed-off-by: Dmitry Torokhov Signed-off-by: Rafael J. Wysocki commit dce8bf4e115aa44d590802ce3554e926840c9042 Author: H. Peter Anvin Date: Mon May 10 13:41:41 2010 -0700 x86, fpu: Use the proper asm constraint in use_xsave() The proper constraint for a receiving 8-bit variable is "=qm", not "=g" which equals "=rim"; even though the "i" will never match, bugs can and do happen due to the difference between "q" and "r". Signed-off-by: H. Peter Anvin Cc: Avi Kivity Cc: Suresh Siddha LKML-Reference: <1273135546-29690-2-git-send-email-avi@redhat.com> commit c3f8978ea332cd4be88e12574452a025892ac9af Author: H. Peter Anvin Date: Mon May 10 13:37:16 2010 -0700 x86, fpu: Unbreak FPU emulation Unbreak FPU emulation, broken by checkin 86603283326c9e95e5ad4e9fdddeec93cac5d9ad: x86: Introduce 'struct fpu' and related API Signed-off-by: H. Peter Anvin Cc: Avi Kivity Cc: Suresh Siddha LKML-Reference: <1273135546-29690-3-git-send-email-avi@redhat.com> commit 9459d59fbf0bc82ff4c804679fa8bc22788eca63 Author: Randy Dunlap Date: Mon May 10 09:24:29 2010 -0700 wireless: depends on NET When CONFIG_NET is disabled, the attempt to build wext-priv.c fails with: net/wireless/wext-priv.c: In function 'ioctl_private_call': net/wireless/wext-priv.c:207: error: implicit declaration of function 'call_commit_handler' Signed-off-by: Randy Dunlap Signed-off-by: John W. Linville commit a6bc03a07f8676d336e697914e9fe6cd54474ad1 Author: Xose Vazquez Perez Date: Mon May 10 11:35:36 2010 +0200 wireless: rt2x00: rt2800usb: replace X by x s/X/x Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6295d81552f4b58256a9f7d85ce630b862598753 Author: Gertjan van Wingerde Date: Sun May 9 21:24:22 2010 +0200 rt2x00: Clean up generic procedures on descriptor writing. With a little bit of restructuring it isn't necessary to have special cases in rt2x00queue_write_tx_descriptor for writing the descriptor for beacons. Simply split off the kicking of the TX queue to a separate function with is only called for non-beacons. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3b9f0ed78cf2eb678edd60d74a4a36f5947d003d Author: Gertjan van Wingerde Date: Sat May 8 23:40:26 2010 +0200 rt2x00: Fix beaconing on rt2800. According to the Ralink vendor driver for rt2800 we don't need a full TXD for a beacon but just a TXWI in front of the actual beacon. Fix the rt2800pci and rt2800usb beaconing code accordingly. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit f224f4ef794c4a9146a7fa7303018fecab8c9328 Author: Gertjan van Wingerde Date: Sat May 8 23:40:25 2010 +0200 rt2x00: provide beacon's txdesc to write_beacon callback function. Preparation to fix rt2800 beaconing. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit d61cb26696e19494c049297def6c8f37d9e2f534 Author: Gertjan van Wingerde Date: Sat May 8 23:40:24 2010 +0200 rt2x00: Clean up all driver's kick_tx_queue callback functions. All of the driver's kick_tx_queue callback functions treat the TX queue for beacons in a special manner. Clean this up by integrating the kicking of the beacon queue into the write_beacon callback function, and let the generic code no longer call the kick_tx_queue callback function when updating the beacon. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2de64dd22d0390688b853788dcadee3c0ad9e518 Author: Gertjan van Wingerde Date: Sat May 8 23:40:22 2010 +0200 rt2x00: Factor out RXWI processing to common rt2800 code. RXWI processing is exactly the same for rt2800pci and rt2800usb, so make it common code. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 59679b91d1d33ebe90b72ffded9a57dba788fa6b Author: Gertjan van Wingerde Date: Sat May 8 23:40:21 2010 +0200 rt2x00: Factor out TXWI writing to common rt2800 code. TXWI writing is exactly the same for rt2800pci and rt2800usb, so make it common code. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 78b8f3b0ddb061af1e3907f9c4bca76eae39f79f Author: Gertjan van Wingerde Date: Sat May 8 23:40:20 2010 +0200 rt2x00: Don't check whether hardware crypto is enabled when reading RXD. We should simply follow what the hardware told us it has done. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit e6a8aab1648226d64772a8224df0677f555a5632 Author: Gertjan van Wingerde Date: Sat May 8 23:40:19 2010 +0200 rt2x00: Clean up rt2800usb.h. Remove unused RXD_DESC_SIZE define and remove duplicated RXWI definitions from rt2800.h. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit d43e49ec83b7d1b1339205e1f3980a447658dc40 Author: Gertjan van Wingerde Date: Sat May 8 23:40:18 2010 +0200 rt2x00: Fix setting of txdesc->length field. We should take the stripping of the IV into account for the txdesc->length field. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Tested-by: Pavel Roskin Signed-off-by: John W. Linville commit 05e8594d5594acb62896571a7fe04faa647e0437 Author: Dan Carpenter Date: Sat May 8 18:24:38 2010 +0200 ath5k: several off by one range checks There are several places that use > ARRAY_SIZE() instead of >= ARRAY_SIZE(). Signed-off-by: Dan Carpenter Acked-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 0730d114194364d078dbd0cfce708e8c67dccdfb Author: Dan Carpenter Date: Sat May 8 18:24:02 2010 +0200 ath9k/htc_drv_main: off by one error I changed "> ATH9K_HTC_MAX_TID" to ">= ATH9K_HTC_MAX_TID" to avoid a potential overflow. Signed-off-by: Dan Carpenter Acked-by: Sujith Signed-off-by: John W. Linville commit 277a64d17ee819161242ce3059a9c2d0f8dfd29c Author: Dan Carpenter Date: Sat May 8 18:23:20 2010 +0200 ath9k/htc_drv_main: null dereference typo This is a stray null dereference. We initialize "ista" properly later on. Signed-off-by: Dan Carpenter Acked-by: Sujith Signed-off-by: John W. Linville commit 7ada88e5e5d7b465de8d0441b4a8d890a602074f Author: Dan Carpenter Date: Sat May 8 18:21:01 2010 +0200 iwlwifi: remove stray mutex_unlock() This mutex_unlock() has been here from the initial commit, but as nearly as I can tell, there isn't a reason for it. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 5efa3a6bf4dd1674920d7419cbde9d731cdb61f1 Author: Luis R. Rodriguez Date: Fri May 7 18:23:22 2010 -0400 ath9k_hw: enable PCIe low power mode for AR9003 Cc: Paul Shaw Cc: Don Breslin Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 9e385c56a1eecfb62dbc5162037fb4ed1676b27e Author: John W. Linville Date: Mon May 10 14:24:34 2010 -0400 rtl8180: change PCI DMA mask to DMA_BIT_MASK(32) From the original report: "I had problems to get my rtl8185 PCI card running on Sparc64: I always got an error about "No suitable DMA available" followed by an error that no device could be detected. When comparing the rtl8180 driver to others I noticed that others are mostly using DMA_BIT_MASK so I changed the custom mask to DMA_BIT_MASK(32) which fixed my issue." Reported-by: Tiziano Müller Acked-by: David S. Miller Signed-off-by: John W. Linville commit d822ed1094032ab524344a9a474c93128d9c2159 Author: Paul E. McKenney Date: Sat May 8 19:58:22 2010 -0700 rcu: fix build bug in RCU_FAST_NO_HZ builds Signed-off-by: Paul E. McKenney commit 77e38ed347162423c6b72e06c865a121081c2bb6 Author: Paul E. McKenney Date: Sun Apr 25 21:04:29 2010 -0700 rcu: RCU_FAST_NO_HZ must check RCU dyntick state The current version of RCU_FAST_NO_HZ reproduces the old CLASSIC_RCU dyntick-idle bug, as it fails to detect CPUs that have interrupted or NMIed out of dyntick-idle mode. Fix this by making rcu_needs_cpu() check the state in the per-CPU rcu_dynticks variables, thus correctly detecting the dyntick-idle state from an RCU perspective. Signed-off-by: Paul E. McKenney commit d14aada8e20bdf81ffd43f433b123972cf575b32 Author: Paul E. McKenney Date: Mon Apr 19 22:24:22 2010 -0700 rcu: make SRCU usable in modules Add a #include for mutex.h to allow SRCU to be more easily used in kernel modules. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit f1d507beeab1d1d60a1c58eac7dc81522c6f4629 Author: Paul E. McKenney Date: Thu Apr 15 15:49:46 2010 -0700 rcu: improve the RCU CPU-stall warning documentation The existing Documentation/RCU/stallwarn.txt has proven unhelpful, so rework it a bit. In particular, show how to interpret the stall-warning messages. Signed-off-by: Paul E. McKenney commit d21670acab9fcb4bc74a40b68a6941059234c55c Author: Paul E. McKenney Date: Wed Apr 14 17:39:26 2010 -0700 rcu: reduce the number of spurious RCU_SOFTIRQ invocations Lai Jiangshan noted that up to 10% of the RCU_SOFTIRQ are spurious, and traced this down to the fact that the current grace-period machinery will uselessly raise RCU_SOFTIRQ when a given CPU needs to go through a quiescent state, but has not yet done so. In this situation, there might well be nothing that RCU_SOFTIRQ can do, and the overhead can be worth worrying about in the ksoftirqd case. This patch therefore avoids raising RCU_SOFTIRQ in this situation. Changes since v1 (http://lkml.org/lkml/2010/3/30/122 from Lai Jiangshan): o Omit the rcu_qs_pending() prechecks, as they aren't that much less expensive than the quiescent-state checks. o Merge with the set_need_resched() patch that reduces IPIs. o Add the new n_rp_report_qs field to the rcu_pending tracing output. o Update the tracing documentation accordingly. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 4a90a0681cf6cd21cd444184302aa045156486b3 Author: Paul E. McKenney Date: Wed Apr 14 16:48:11 2010 -0700 rcu: permit discontiguous cpu_possible_mask CPU numbering TREE_RCU assumes that CPU numbering is contiguous, but some users need large holes in the numbering to better map to hardware layout. This patch makes TREE_RCU (and TREE_PREEMPT_RCU) tolerate large holes in the CPU numbering. However, NR_CPUS must still be greater than the largest CPU number. Signed-off-by: Paul E. McKenney commit 4300aa642cc9ecb35f2e0683dd294fb790ef028c Author: Paul E. McKenney Date: Tue Apr 13 16:18:22 2010 -0700 rcu: improve RCU CPU stall-warning messages The existing RCU CPU stall-warning messages can be confusing, especially in the case where one CPU detects a single other stalled CPU. In addition, the console messages did not say which flavor of RCU detected the stall, which can make it difficult to work out exactly what is causing the stall. This commit improves these messages. Requested-by: Dhaval Giani Signed-off-by: Paul E. McKenney commit 26845c2860cebebe6ce2d9d01ae3cb3db84b7e29 Author: Paul E. McKenney Date: Tue Apr 13 14:19:23 2010 -0700 rcu: print boot-time console messages if RCU configs out of ordinary Print boot-time messages if tracing is enabled, if fanout is set to non-default values, if exact fanout is specified, if accelerated dyntick-idle grace periods have been enabled, if RCU-lockdep is enabled, if rcutorture has been boot-time enabled, if the CPU stall detector has been disabled, or if four-level hierarchy has been enabled. This is all for TREE_RCU and TREE_PREEMPT_RCU. TINY_RCU will be handled separately, if at all. Suggested-by: Josh Triplett Signed-off-by: Paul E. McKenney commit c68de2097a8799549a3c3bf27cbfeea24a604284 Author: Paul E. McKenney Date: Thu Apr 15 10:12:40 2010 -0700 rcu: disable CPU stall warnings upon panic The current RCU CPU stall warnings remain enabled even after a panic occurs, which some people have found to be a bit counterproductive. This patch therefore uses a notifier to disable stall warnings once a panic occurs. Signed-off-by: Paul E. McKenney commit 55ec936ff4e57cc626db336a7bf33b267390e9b4 Author: Paul E. McKenney Date: Tue Apr 13 12:22:33 2010 -0700 rcu: enable CPU_STALL_VERBOSE by default The CPU_STALL_VERBOSE kernel configuration parameter was added to 2.6.34 to identify any preempted/blocked tasks that were preventing the current grace period from completing when running preemptible RCU. As is conventional for new configurations parameters, this defaulted disabled. It is now time to enable it by default. Signed-off-by: Paul E. McKenney commit bbad937983147c017c25406860287cb94da9af7c Author: Paul E. McKenney Date: Fri Apr 2 16:17:17 2010 -0700 rcu: slim down rcutiny by removing rcu_scheduler_active and friends TINY_RCU does not need rcu_scheduler_active unless CONFIG_DEBUG_LOCK_ALLOC. So conditionally compile rcu_scheduler_active in order to slim down rcutiny a bit more. Also gets rid of an EXPORT_SYMBOL_GPL, which is responsible for most of the slimming. Signed-off-by: Paul E. McKenney commit 25502a6c13745f4650cc59322bd198194f55e796 Author: Paul E. McKenney Date: Thu Apr 1 17:37:01 2010 -0700 rcu: refactor RCU's context-switch handling The addition of preemptible RCU to treercu resulted in a bit of confusion and inefficiency surrounding the handling of context switches for RCU-sched and for RCU-preempt. For RCU-sched, a context switch is a quiescent state, pure and simple, just like it always has been. For RCU-preempt, a context switch is in no way a quiescent state, but special handling is required when a task blocks in an RCU read-side critical section. However, the callout from the scheduler and the outer loop in ksoftirqd still calls something named rcu_sched_qs(), whose name is no longer accurate. Furthermore, when rcu_check_callbacks() notes an RCU-sched quiescent state, it ends up unnecessarily (though harmlessly, aside from the performance hit) enqueuing the current task if it happens to be running in an RCU-preempt read-side critical section. This not only increases the maximum latency of scheduler_tick(), it also needlessly increases the overhead of the next outermost rcu_read_unlock() invocation. This patch addresses this situation by separating the notion of RCU's context-switch handling from that of RCU-sched's quiescent states. The context-switch handling is covered by rcu_note_context_switch() in general and by rcu_preempt_note_context_switch() for preemptible RCU. This permits rcu_sched_qs() to handle quiescent states and only quiescent states. It also reduces the maximum latency of scheduler_tick(), though probably by much less than a microsecond. Finally, it means that tasks within preemptible-RCU read-side critical sections avoid incurring the overhead of queuing unless there really is a context switch. Suggested-by: Lai Jiangshan Acked-by: Lai Jiangshan Signed-off-by: Paul E. McKenney Cc: Ingo Molnar Cc: Peter Zijlstra commit 99652b54de1ee094236f7171485214071af4ef31 Author: Paul E. McKenney Date: Tue Mar 30 15:50:01 2010 -0700 rcu: rename rcutiny rcu_ctrlblk to rcu_sched_ctrlblk Make naming line up in preparation for CONFIG_TINY_PREEMPT_RCU. Signed-off-by: Paul E. McKenney commit da848c47bc6e873a54a445ea1960423a495b6b32 Author: Paul E. McKenney Date: Tue Mar 30 15:46:01 2010 -0700 rcu: shrink rcutiny by making synchronize_rcu_bh() be inline Because synchronize_rcu_bh() is identical to synchronize_sched(), make the former a static inline invoking the latter, saving the overhead of an EXPORT_SYMBOL_GPL() and the duplicate code. Signed-off-by: Paul E. McKenney commit 32c141a0a1dfa29e0a07d78bec0c0919fc4b9f88 Author: Paul E. McKenney Date: Tue Mar 30 10:59:28 2010 -0700 rcu: fix now-bogus rcu_scheduler_active comments. The rcu_scheduler_active check has been wrapped into the new debug_lockdep_rcu_enabled() function, so update the comments to reflect this new reality. Signed-off-by: Paul E. McKenney commit d20200b591f59847ab6a5c23507084a7d29e23c5 Author: Paul E. McKenney Date: Tue Mar 30 10:52:21 2010 -0700 rcu: Fix bogus CONFIG_PROVE_LOCKING in comments to reflect reality. It is CONFIG_DEBUG_LOCK_ALLOC rather than CONFIG_PROVE_LOCKING, so fix it. Signed-off-by: Paul E. McKenney commit 5db356736acb9ba717df1aa9444e4e44cbb30a71 Author: Lai Jiangshan Date: Tue Mar 30 18:40:36 2010 +0800 rcu: ignore offline CPUs in last non-dyntick-idle CPU check Offline CPUs are not in nohz_cpu_mask, but can be ignored when checking for the last non-dyntick-idle CPU. This patch therefore only checks online CPUs for not being dyntick idle, allowing fast entry into full-system dyntick-idle state even when there are some offline CPUs. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 0c34029abdfdea64420cb4264c4e91a776b22157 Author: Lai Jiangshan Date: Sun Mar 28 11:12:30 2010 +0800 rcu: move some code from macro to function Shrink the RCU_INIT_FLAVOR() macro by moving all but the initialization of the ->rda[] array to rcu_init_one(). The call to rcu_init_one() can then be moved to the end of the RCU_INIT_FLAVOR() macro, which is required because rcu_boot_init_percpu_data(), which is now called from rcu_init_one(), depends on the initialization of the ->rda[] array. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit f261414f0d56dd1a0e34888e27d1d4902ad052f3 Author: Lai Jiangshan Date: Sun Mar 28 11:15:20 2010 +0800 rcu: make dead code really dead cleanup: make dead code really dead Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit d25eb9442bb2c38c1e742f0fa764d7132d72593f Author: Paul E. McKenney Date: Thu Mar 18 21:36:51 2010 -0700 rcu: substitute set_need_resched for sending resched IPIs This patch adds a check to __rcu_pending() that does a local set_need_resched() if the current CPU is holding up the current grace period and if force_quiescent_state() will be called soon. The goal is to reduce the probability that force_quiescent_state() will need to do smp_send_reschedule(), which sends an IPI and is therefore more expensive on most architectures. Signed-off-by: "Paul E. McKenney" commit 2b3fc35f6919344e3cf722dde8308f47235c0b70 Author: Lai Jiangshan Date: Tue Apr 20 16:23:07 2010 +0800 rcu: optionally leave lockdep enabled after RCU lockdep splat There is no need to disable lockdep after an RCU lockdep splat, so remove the debug_lockdeps_off() from lockdep_rcu_dereference(). To avoid repeated lockdep splats, use a static variable in the inlined rcu_dereference_check() and rcu_dereference_protected() macros so that a given instance splats only once, but so that multiple instances can be detected per boot. This is controlled by a new config variable CONFIG_PROVE_RCU_REPEATEDLY, which is disabled by default. This provides the normal lockdep behavior by default, but permits people who want to find multiple RCU-lockdep splats per boot to easily do so. Requested-by: Eric Paris Signed-off-by: Lai Jiangshan Tested-by: Eric Paris Signed-off-by: Paul E. McKenney commit fae683f764f91f31ab45512e70cc8cc81d4d157b Author: Suresh Jayaraman Date: Mon May 10 20:00:05 2010 +0530 cifs: add comments explaining cifs_new_fileinfo behavior The comments make it clear the otherwise subtle behavior of cifs_new_fileinfo(). Signed-off-by: Suresh Jayaraman Reviewed-by: Shirish Pargaonkar -- fs/cifs/dir.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) Signed-off-by: Steve French commit 86603283326c9e95e5ad4e9fdddeec93cac5d9ad Author: Avi Kivity Date: Thu May 6 11:45:46 2010 +0300 x86: Introduce 'struct fpu' and related API Currently all fpu state access is through tsk->thread.xstate. Since we wish to generalize fpu access to non-task contexts, wrap the state in a new 'struct fpu' and convert existing access to use an fpu API. Signal frame handlers are not converted to the API since they will remain task context only things. Signed-off-by: Avi Kivity Acked-by: Suresh Siddha LKML-Reference: <1273135546-29690-3-git-send-email-avi@redhat.com> Signed-off-by: H. Peter Anvin commit c9ad488289144ae5ef53b012e15895ef1f5e4bb6 Author: Avi Kivity Date: Thu May 6 11:45:45 2010 +0300 x86: Eliminate TS_XSAVE The fpu code currently uses current->thread_info->status & TS_XSAVE as a way to distinguish between XSAVE capable processors and older processors. The decision is not really task specific; instead we use the task status to avoid a global memory reference - the value should be the same across all threads. Eliminate this tie-in into the task structure by using an alternative instruction keyed off the XSAVE cpu feature; this results in shorter and faster code, without introducing a global memory reference. [ hpa: in the future, this probably should use an asm jmp ] Signed-off-by: Avi Kivity Acked-by: Suresh Siddha LKML-Reference: <1273135546-29690-2-git-send-email-avi@redhat.com> Signed-off-by: H. Peter Anvin commit b56f2d55c6c22b0c5774b3b22e336fb6cc5f4094 Author: Patrick McHardy Date: Mon May 10 18:47:57 2010 +0200 netfilter: use rcu_dereference_protected() Restore the rcu_dereference() calls in conntrack/expectation notifier and logger registration/unregistration, but use the _protected variant, which will be required by the upcoming __rcu annotations. Based on patch by Eric Dumazet Signed-off-by: Patrick McHardy commit 1e4b1057121bc756b91758a434b504d2010f6088 Merge: 3b254c5 3ee9437 Author: Patrick McHardy Date: Mon May 10 18:39:28 2010 +0200 Merge branch 'master' of /repos/git/net-next-2.6 Conflicts: net/bridge/br_device.c net/bridge/br_forward.c Signed-off-by: Patrick McHardy commit 1c02c4d2e92f2097f1bba63ec71560b0e05a7f36 Author: Arnaldo Carvalho de Melo Date: Mon May 10 13:04:11 2010 -0300 perf hist: Introduce hists class and move lots of methods to it In cbbc79a we introduced support for multiple events by introducing a new "event_stat_id" struct and then made several perf_session methods receive a point to it instead of a pointer to perf_session, and kept the event_stats and hists rb_tree in perf_session. While working on the new newt based browser, I realised that it would be better to introduce a new class, "hists" (short for "histograms"), renaming the "event_stat_id" struct and the perf_session methods that were really "hists" methods, as they manipulate only struct hists members, not touching anything in the other perf_session members. Other optimizations, such as calculating the maximum lenght of a symbol name present in an hists instance will be possible as we add them, avoiding a re-traversal just for finding that information. The rationale for the name "hists" to replace "event_stat_id" is that we may have multiple sets of hists for the same event_stat id, as, for instance, the 'perf diff' tool has, so event stat id is not what characterizes what this struct and the functions that manipulate it do. Cc: Eric B Munson Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d118f8ba6ac2af2bf11d40cba657c813f0f39ca2 Author: Arnaldo Carvalho de Melo Date: Mon May 10 12:51:05 2010 -0300 perf session: create_kernel_maps should use ->host_machine Using machines__create_kernel_maps(..., HOST_KERNEL_ID) it would create another machine instance for the host machine, and since 1f626bc we have it out of the machines rb_tree. Fix it by using machine__create_kernel_maps(&self->host_machine) directly. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a Author: Patrick McHardy Date: Mon May 10 17:45:56 2010 +0200 netfilter: nf_conntrack_proto: fix warning with CONFIG_PROVE_RCU =================================================== [ INFO: suspicious rcu_dereference_check() usage. ] --------------------------------------------------- include/net/netfilter/nf_conntrack_l3proto.h:92 invoked rcu_dereference_check() without protection! other info that might help us debug this: rcu_scheduler_active = 1, debug_locks = 0 2 locks held by iptables/3197: #0: (sk_lock-AF_INET){+.+.+.}, at: [] ip_setsockopt+0x7c/0xa0 #1: (&xt[i].mutex){+.+.+.}, at: [] xt_find_table_lock+0x3e/0x110 stack backtrace: Pid: 3197, comm: iptables Not tainted 2.6.34-rc4 #2 Call Trace: [] lockdep_rcu_dereference+0xb8/0xc0 [] nf_ct_l3proto_module_put+0x6b/0x70 [] state_mt_destroy+0x11/0x20 [] cleanup_match+0x2f/0x50 [] cleanup_entry+0x33/0x90 [] ? __do_replace+0x1a3/0x210 [] __do_replace+0x19c/0x210 [] do_ipt_set_ctl+0x16a/0x1b0 [] nf_sockopt+0x60/0xa0 ... The __nf_ct_l3proto_find() call doesn't actually need rcu read side protection since the caller holds a reference to the protocol. Use rcu_read_lock() anyways to avoid the warning. Kernel bugzilla #15781: https://bugzilla.kernel.org/show_bug.cgi?id=15781 Reported-by: Christian Casteyde Signed-off-by: Patrick McHardy commit 5433137336b049f1de8fc9a393991a49f1c1eb66 Merge: 1965c44 482c453 Author: Takashi Iwai Date: Mon May 10 17:24:03 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 1965c441ecf1f9cd723dd590cbb6c191cfc13fb2 Author: Pierre-Louis Bossart Date: Thu May 6 16:37:03 2010 -0500 ALSA: hda: enable SPDIF output for Conexant 5051/Lenovo docking stations This patch enables the SPDIF output pin by default. It also enables it for quirks related to Levono docking stations (x200 and 25041, identified with the same 17aa:20f2 ID). Even though not all Lenovo docking stations have SPDIF connectors, enabling the pin by default shouldn't be a problem for anyone. Other quirks remain unmodified. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Takashi Iwai commit cdd5b75b0cd24c4d6a98b12a219217b1ccfe2586 Author: Arnaldo Carvalho de Melo Date: Mon May 10 10:56:50 2010 -0300 perf callchains: Use zalloc to allocate objects Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 51c8176472de1551a301b676e36a61884e0e8494 Author: Suresh Jayaraman Date: Mon May 10 15:15:24 2010 +0530 cifs: remove unused parameter from cifs_posix_open_inode_helper() ..a left over from the commit 3321b791b2e8897323f8c044a0c77ff25781381c. Cc: Jeff Layton Signed-off-by: Suresh Jayaraman Signed-off-by: Steve French commit 7f8264539c62378cccbdf9b598927b034bef4a92 Author: Arnaldo Carvalho de Melo Date: Mon May 10 10:51:25 2010 -0300 perf newt: Use newtAddComponent() Instead of newtAddComponents(just-one-entry, NULL), that is not needed if, like in this browser, we're adding just one component at a time. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d7e81c269db899b800e0963dc4aceece1f82a680 Author: John Stultz Date: Fri May 7 18:07:38 2010 -0700 clocksource: Add clocksource_register_hz/khz interface How to pick good mult/shift pairs has always been difficult to describe to folks writing clocksource drivers, since it requires careful tradeoffs in adjustment accuracy vs overflow limits. Now, with the clocks_calc_mult_shift function, its much easier. However, not many clocksources have converted to using that function, and there is still the issue of the max interval length assumption being made by each clocksource driver independently. So this patch simplifies the registration process by having clocksources be registered with a hz/khz value and the registration function taking care of setting mult/shift. This should take most of the confusion out of writing a clocksource driver. Additionally it also keeps the shift size tradeoff (more accuracy vs longer possible nohz times) centralized so the timekeeping core can keep track of the assumptions being made. [ tglx: Coding style and comments fixed ] Signed-off-by: John Stultz LKML-Reference: <1273280858-30143-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 29f87b793da421a6ab816d991dc8dbf909dfb66a Author: Stanislaw Gruszka Date: Tue Apr 27 14:12:15 2010 -0700 posix-cpu-timers: Optimize run_posix_cpu_timers() We can optimize and simplify things taking into account signal->cputimer is always running when we have configured any process wide cpu timer. In check_process_timers(), we don't have to check if new updated value of signal->cputime_expires is smaller, since we maintain new first expiration time ({prof,virt,sched}_expires) in code flow and all other writes to expiration cache are protected by sighand->siglock . Signed-off-by: Stanislaw Gruszka Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit dbb6be6d5e974c42bbecd183effaa0df69e1dd8b Merge: 6a867a3 b57f95a Author: Thomas Gleixner Date: Mon May 10 11:59:37 2010 +0200 Merge branch 'linus' into timers/core Reason: Further posix_cpu_timer patches depend on mainline changes Signed-off-by: Thomas Gleixner commit 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 Author: Eric Dumazet Date: Mon May 10 05:01:31 2010 -0700 net: trans_start cleanups Now that core network takes care of trans_start updates, dont do it in drivers themselves, if possible. Drivers can avoid one cache miss (on dev->trans_start) in their start_xmit() handler. Exceptions are NETIF_F_LLTX drivers Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 5e2ff328c0668794ff408a4632f5b8a62827571f Author: Paul Mundt Date: Mon May 10 20:17:25 2010 +0900 sh: rework memory limits to work with LMB. This reworks the memory limit handling to tie in through the available LMB infrastructure. This requires a bit of reordering as we need to have all of the LMB reservations taken care of prior to establishing the limits. While we're at it, the crash kernel reservation semantics are reworked so that we allocate from the bottom up and reduce the risk of having to disable the memory limit due to a clash with the crash kernel reservation. Signed-off-by: Paul Mundt commit cc49b092d308f8ea8634134b0d95d831a88a674b Merge: 7c224a0 bae663b Author: Ingo Molnar Date: Mon May 10 13:13:40 2010 +0200 Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile commit 7c224a03a79021ab12ce057964df9e679af5386d Merge: 5bdb793 b57f95a Author: Ingo Molnar Date: Mon May 10 13:12:26 2010 +0200 Merge commit 'v2.6.34-rc7' into oprofile Merge reason: Update to Linus's latest -rc. Signed-off-by: Ingo Molnar commit 896060c76bdfd8a45eb33b3dd1a8307fe37f6c04 Author: Mark Brown Date: Fri May 7 18:39:25 2010 +0100 ASoC: Use more idiomatic driver name for WM8731 Make dev_() prints much prettier. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 06ae99888e599ea2e82386d618405c473c379185 Author: Mark Brown Date: Fri May 7 19:14:45 2010 +0100 ASoC: Refactor WM8731 regulator management into bias management This allows more flexible integration with subsystem features. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a8cd4561ea176f51e9f4707873ca4eff8fd5ee70 Author: Anand Gadiyar Date: Mon May 10 14:51:19 2010 +0530 fix "seperate" typos in comments s/seperate/separate Signed-off-by: Anand Gadiyar Signed-off-by: Jiri Kosina commit 3efab7dcc0f4d0087f73ff975eaa2fddc02ffc69 Author: Mark Brown Date: Sun May 9 13:25:43 2010 +0100 ASoC: Allow DAI links to be kept active over suspend As well as allowing DAPM pins to be marked as ignoring suspend allow DAI links to be similarly marked. This is primarily intended for digital links between CODECs and non-CPU devices such as basebands in mobile phones and will suppress all suspend calls for the DAI link. It is likely that this will need to be revisited if used with devices which are part of the SoC CPU. Tested-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 452a5fd679f8a6f215df71c41487ad4b2c7774db Author: Mark Brown Date: Fri May 7 21:18:53 2010 +0100 ASoC: Allow active paths from the GSM modem while the GTA02 is suspended Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1547aba993c990e5a316751431328145b38e1fea Author: Mark Brown Date: Fri May 7 21:11:40 2010 +0100 ASoC: Support leaving paths enabled over system suspend Some devices can usefully run audio while the Linux system is suspended. One of the most common examples is smartphone systems, which are normally designed to allow audio to be run between the baseband and the CODEC without passing through the CPU and so can suspend the CPU when on a voice call for additional power savings. Support such systems by providing an API snd_soc_dapm_ignore_suspend(). This can be used to mark DAPM endpoints as not being sensitive to system suspend. When the system is being suspended paths between endpoints which are marked as ignoring suspend will be kept active. Both source and sink must be marked, and there must already be an active path between the two endpoints prior to suspend. When paths are active over suspend the bias management will hold the device bias in the ON state. This is used to avoid suspending the CODEC while it is still in use. Tested-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9949788b793826f2d19e929ac0219ad0e0891e2d Author: Mark Brown Date: Fri May 7 20:24:05 2010 +0100 ASoC: Refactor DAPM suspend handling Instead of using stream events to handle power down during suspend integrate the handling with the normal widget path checking by replacing all cases where we report a connected endpoint in a path with a function snd_soc_dapm_suspend_check() which looks at the ALSA power state for the card and reports false if we are in a D3 state. Since the core moves us into D3 prior to initating the suspend all power checks during suspend will cause the widgets to be powered down. In order to ensure that widgets are powered up on resume set the card to D2 at the start of resume handling (ALSA API calls require D0 so we are still protected against userspace access). Tested-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 50ae8384cde9a67714ff03010493c5052690624e Author: Mark Brown Date: Fri May 7 18:40:54 2010 +0100 ASoC: Remove unused DAPM suspend flag We now manage suspend within the main power analysis rather than by flipping the state of widgets. Tested-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 29e189c29d33d273424327ca4c1a74d8cdc04f48 Author: Mark Brown Date: Fri May 7 20:30:00 2010 +0100 ASoC: Remove unneeded suspend bias managment from CODEC drivers The core will ensure that the device is in either STANDBY or OFF bias before suspending, restoring the bias in the driver is unneeded. Some drivers doing slightly more roundabout things have been left alone for now. Tested-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 2b0b05ddc04b6d45e71cd36405df512075786f1e Author: Marcel Holtmann Date: Mon May 10 11:33:10 2010 +0200 Bluetooth: Fix issues where sk_sleep() helper is needed now There were some left-overs that used sk->sk_sleep instead of the new sk_sleep() helper. Signed-off-by: Marcel Holtmann commit a371b37ccdb97ccf99b25645c7976f6448bb7274 Author: Dominik Brodowski Date: Sat Mar 20 20:04:26 2010 +0100 pata_pcmcia: get rid of extra indirection We don't need ata_pcmcia_info any more. Acked-by: Jeff Garzik Signed-off-by: Dominik Brodowski commit 378b451ede192163780bb15b1ad0a913aa8ee4ae Author: Dominik Brodowski Date: Tue Mar 30 18:23:24 2010 +0200 pcmcia: remove suspend-related comment from yenta_socket.c While pci_set_power_state() is called by the PCI core unconditionally on all PCI devices, it is not called on _any_ PCI bridge device. Therefore, it is not surprising calling pci_set_power_state() on CardBus devices causes trouble. CC: dbrownell@users.sourceforge.net CC: gregkh@suse.de Signed-off-by: Dominik Brodowski commit 059f667d9f81082e94dead14ff3fa7b3b42c98a0 Author: Dominik Brodowski Date: Tue Mar 30 18:07:50 2010 +0200 pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held This avoids multiple lock takings in several codepaths. Signed-off-by: Dominik Brodowski commit a60f22c4af3382b86301d64d6a9d68f30191d4c9 Author: Dominik Brodowski Date: Sun Mar 7 09:22:51 2010 +0100 pcmcia: remove pcmcia_add_device_lock As all cards to pcmcia_device_add() are already locked by skt_mutex, and the critical sections inside this function are further protected by ops_mutex, there's no need to keep a third lock around. Therfore, remove pcmcia_add_device_lock. Signed-off-by: Dominik Brodowski commit 6d59622e52c296cad8702c483a0092f428b794ef Author: Tejun Heo Date: Tue Mar 30 02:52:37 2010 +0900 pcmcia: 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 Cc: Stephen Rothwell Signed-off-by: Dominik Brodowski commit 4b49291aca7ea60a3da645c8f9fa8b2d6efee120 Author: Dominik Brodowski Date: Sat Mar 20 14:06:24 2010 +0100 pcmcia: remove unused mem_op.h Signed-off-by: Dominik Brodowski commit cf26e8dc419424786575990aa133e76f5fb38657 Author: Dominik Brodowski Date: Mon Mar 29 21:40:35 2010 +0200 pcmcia: do not autoadd root PCI bus resources On the PCI root bus on the x86 architecture, the risk of hitting some strange system devices is too high: If a driver isn't loaded, the resources are not claimed; even if a driver is loaded, it may not request all resources or even the wrong one. We can neither trust the rest of the kernel nor ACPI/PNP and CRS parsing to get it right. Therefore, explicitly spell out what safeguards we provide, and add a safeguard to only use resources which are set up exclusively for the secondary PCI bus (non-subtractive mode): the risk of hitting system devices is quite low, as they usually aren't connected to the secondary PCI bus. CC: Jesse Barnes CC: Bjorn Helgaas Signed-off-by: Dominik Brodowski commit b19a7275dec4b470ea9abaae6129d21a0d75ab2f Author: Dominik Brodowski Date: Sat Mar 20 13:10:47 2010 +0100 pcmcia: clarify alloc_io_space, move it to resource handlers Clean up the alloc_io_space() function by moving most of it to the actual resource_ops. This allows for a bit less re-directions. Future cleanups will follow, and will make up for the code duplication currently present between rsrc_iodyn and rsrc_nonstatic (which are hardly ever built at the same time anyway, therefore no increase in built size). Signed-off-by: Dominik Brodowski commit 49b1153adfe18a3cce7e70aa26c690f275917cd0 Author: Dominik Brodowski Date: Sun Mar 7 16:41:57 2010 +0100 pcmcia: move all pcmcia_resource_ops providers into one module Signed-off-by: Dominik Brodowski commit 5c128e84324ca9389bc5f7d39f6b18f6de4a58ec Author: Dominik Brodowski Date: Sat Mar 20 20:03:57 2010 +0100 pcmcia: move high level CIS access code to separate file No code changes. Signed-off-by: Dominik Brodowski commit b9300aa7449f6636b188743d09199dcf27b1a4b4 Author: Dominik Brodowski Date: Sat Mar 20 19:43:40 2010 +0100 pcmcia: dev_node removal (core) Remove the dev_node declaration. We now only pass the device name to the deprecated userspace tools. Signed-off-by: Dominik Brodowski commit b498ada6d0cf0f9828b0c590f9fa2e84f60f5709 Author: Dominik Brodowski Date: Sat Mar 20 19:43:26 2010 +0100 pcmcia: dev_node removal (remaining drivers) As a fourth step, remove any remaining usages of dev_node_t from drivers: - ipwireless can be simplified a bit, as we do not need to pass around the (write-only) dev_node_t around. - avma1_cs can be simplified as well, if we only keep the minor number around as "priv" data, not a full-fledged struct. Acked-by: Jiri Kosina Acked-by: Karsten Keil Signed-off-by: Dominik Brodowski commit c7c2fa079073ab92b0736a161b4cf1051a3e631f Author: Dominik Brodowski Date: Sat Mar 20 19:39:26 2010 +0100 pcmcia: dev_node removal (drivers with unregister_netdev check) As a third step, remove any usage of dev_node_t from drivers which only wrote to this typedef/struct, except to determine whether register_netdev() succeeded previously. However, the function calling unregister_netdev() was only ever called by the PCMCIA core if register_netdev() succeeded previously. The lonely exception was easily fixed. CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org Signed-off-by: Dominik Brodowski commit ded6a1a341cb38c4cfeb09d3d01ffe16b5c804b3 Author: Dominik Brodowski Date: Sat Mar 20 19:35:12 2010 +0100 pcmcia: dev_node removal (drivers with updated printk call) As a second step, remove any usage of dev_node_t from drivers which only wrote to this typedef/struct, except one printk() which can easily be replaced by a dev_info()/dev_warn() call. CC: Harald Welte CC: linux-ide@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: netdev@vger.kernel.org CC: linux-usb@vger.kernel.org Acked-by: Karsten Keil Signed-off-by: Dominik Brodowski commit 317b6d63000b3cc48c43d582d76063500e531a6c Author: Dominik Brodowski Date: Sat Mar 20 19:26:51 2010 +0100 pcmcia: dev_node removal (write-only drivers) dev_node_t was only used to transport some minor/major numbers from the PCMCIA device drivers to deprecated userspace helpers. However, only a few drivers made use of it, and the userspace helpers are deprecated anyways. Therefore, get rid of dev_node_t . As a first step, remove any usage of dev_node_t from drivers which only wrote to this typedef/struct, but did not make use of it. CC: linux-bluetooth@vger.kernel.org CC: Harald Welte CC: linux-mtd@lists.infradead.org CC: linux-wireless@vger.kernel.org CC: netdev@vger.kernel.org CC: linux-serial@vger.kernel.org CC: alsa-devel@alsa-project.org Signed-off-by: Dominik Brodowski commit b1577190e7cd259b5fc4846305f31cba9633f31e Author: Dominik Brodowski Date: Sat Mar 20 14:21:01 2010 +0100 pcmcia: clean up cs.h With req_irq_t gone, we can get rid of some definitions. Signed-off-by: Dominik Brodowski commit eb14120f743d29744d9475bffec56ff4ad43a749 Author: Dominik Brodowski Date: Sun Mar 7 12:21:16 2010 +0100 pcmcia: re-work pcmcia_request_irq() Instead of the old pcmcia_request_irq() interface, drivers may now choose between: - calling request_irq/free_irq directly. Use the IRQ from *p_dev->irq. - use pcmcia_request_irq(p_dev, handler_t); the PCMCIA core will clean up automatically on calls to pcmcia_disable_device() or device ejection. - drivers still not capable of IRQF_SHARED (or not telling us so) may use the deprecated pcmcia_request_exclusive_irq() for the time being; they might receive a shared IRQ nonetheless. CC: linux-bluetooth@vger.kernel.org CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: linux-serial@vger.kernel.org CC: alsa-devel@alsa-project.org CC: linux-usb@vger.kernel.org CC: linux-ide@vger.kernel.org Signed-off-by: Dominik Brodowski commit a7debe789dfcaee9c4d81e5738b0be8c5d93930b Author: Dominik Brodowski Date: Sun Mar 7 10:58:29 2010 +0100 pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration() As it's only used there it makes no sense relying on pcmcia_request_irq(). CC: alsa-devel@alsa-project.org Signed-off-by: Dominik Brodowski commit 6f840afb416748c15cf55c19b45c4870554c3af1 Author: Dominik Brodowski Date: Sun Mar 7 10:51:23 2010 +0100 pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket As we don't need the "Config" counter any more, we can simplify struct pcmcia_socket. Signed-off-by: Dominik Brodowski commit 6f0f38c45a8f2f511c25893e33011ff32fc811db Author: Dominik Brodowski Date: Thu Apr 8 20:33:16 2010 +0200 pcmcia: setup IRQ to be used by PCMCIA drivers at card insert Setup the IRQ to be used by PCMCIA drivers already during the device registration stage, making use of a new function pcmcia_setup_irq(). This will allow us to get rid of quite a lot of indirection in the future. Signed-off-by: Dominik Brodowski commit 0cb3c49cdd275aa9ef4b1afd090117b1b86a16d4 Author: Dominik Brodowski Date: Sat Mar 6 20:42:35 2010 +0100 pcmcia: remove unused IRQ modification feature The IRQ modification feature was unused, and I see no reason to keep it. Signed-off-by: Dominik Brodowski commit 670ff6abd6caff406b217f8a828d6c03656535d8 Author: Takashi Iwai Date: Mon May 10 10:21:32 2010 +0200 ALSA: opl4 - Fix a wrong argument in proc write callback The commit 24e4a1211f691fc671de44685430dbad757d8487 ALSA: info - Use standard types for info callbacks introduced a wrong type to snd_opl4_mem_proc_write() for pos argument. Fixed now. Signed-off-by: Takashi Iwai commit 9e4b50e93786d00c703f16ed46e6a4029c0dfdd1 Author: Tetsuo Handa Date: Thu May 6 12:40:02 2010 +0900 TOMOYO: Use stack memory for pending entry. Use stack memory for pending entry to reduce kmalloc() which will be kfree()d. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit a20971b201ac1fcd236400942c98b0106c42c70a Author: Krzysztof Helt Date: Mon May 10 09:47:32 2010 +0200 ALSA: Merge es1688 and es968 drivers The ESS ES968 chip is nothing more then a PnP companion for a non-PnP audio chip. It was paired with non-PnP ESS' chips: ES688 and ES1688. The ESS' audio chips are handled by the es1688 driver in native mode. The PnP cards are handled by the ES968 driver in SB compatible mode. Move the ES968 chip handling to the es1688 driver so the driver can handle both PnP and non-PnP cards. The es968 is removed. Also, a new PnP id is added for the card I acquired (the change was tested on this card). Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 396fa8272601c3d488cb8391c3962a7ee552afd0 Author: Krzysztof Helt Date: Sun May 9 20:35:44 2010 +0200 ALSA: es1688: allocate snd_es1688 structure as a part of snd_card structure Allocate the snd_es1688 during the snd_card allocation. This allows to remove the card pointer from the snd_es1688 structure. Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 02a2ad40295fc8862457b469b3b698d8ece3c72a Merge: 1bde78b bfe7078 Author: Takashi Iwai Date: Mon May 10 09:48:47 2010 +0200 Merge branch 'fix/misc' into topic/misc commit 7b767cad296d17cfe071734f71a3b7b479534c8c Author: Tomas Winkler Date: Tue Mar 9 21:38:03 2010 +0200 Bluetooth: Use strict_strtoul instead of simple_strtoul Use strict_strtoul as suggested by checkpatch.pl for more strict input checking. Signed-off-by: Tomas Winkler Signed-off-by: Marcel Holtmann commit f120c6b635a62d414876b517aec0468628acfc60 Author: Bing Zhao Date: Wed Mar 3 14:37:37 2010 -0800 Bluetooth: Set hdev->dev_type based on Marvell device type Get the device type from MODULE_BRINGUP_REQ command response. Signed-off-by: Bing Zhao Signed-off-by: Marcel Holtmann commit 64061607eab7cb146115927cb596de123c542d45 Author: Bing Zhao Date: Wed Mar 3 14:37:36 2010 -0800 Bluetooth: Separate btmrvl_register_hdev() from btmrvl_add_card() Move btmrvl hdev registration code out of btmrvl_add_card(). New function btmrvl_register_hdev() is added. Signed-off-by: Bing Zhao Signed-off-by: Marcel Holtmann commit 903c843773a18e061817dd7a1a5c28dd41a3bf97 Author: Bing Zhao Date: Wed Mar 3 14:37:35 2010 -0800 Bluetooth: Decode btmrvl MODULE_BRINGUP_REG response correctly The MODULE_BRINGUP_REQ command response returns success with either 0x00 or 0x0c. Signed-off-by: Bing Zhao Signed-off-by: Marcel Holtmann commit 31f085fea891d5972e994dfb423231a3d4d60a8a Author: Dan Carpenter Date: Mon Mar 8 15:15:59 2010 +0300 Bluetooth: Fix storing negative values as unsigned char This is mostly cleanup. There is only one caller and it just checks for non-zero return values. Still "ret" should be int because we want to return -EINVAL on errors. Signed-off-by: Dan Carpenter Signed-off-by: Marcel Holtmann commit f48fd9c8cd746fdb055a97249a209c77dca0f710 Author: Marcel Holtmann Date: Sat Mar 20 15:20:04 2010 +0100 Bluetooth: Create per controller workqueue Instead of having a global workqueue for all controllers, it makes more sense to have a workqueue per controller. Signed-off-by: Marcel Holtmann commit 844c0972427ee5f661158160aaca10b22b3dda60 Author: Gustavo F. Padovan Date: Tue May 4 23:16:01 2010 -0300 Bluetooth: Fix spec error in the RemoteBusy Logic On the receipt of an RR(P=1) under RemoteBusy set to TRUE(on the RECV state table) we have to call sendIorRRorRNR(F=1) and just after set RemoteBusy to False. This leads to a freeze in the sending process since it's not allowed send data with RemoteBusy set to true and no one call SendPending-I-Frames after set RemoteBusy to false(The last action for that event). Actually sendIorRRorRNR() calls SendPending-I-Frames but at that moment RemoteBusy is still True and we cannot send any frame, after, no one calls SendPending-I-Frames again and the sending process stops. The solution here is to set RemoteBusy to false inside SendPending-I-Frames just before call SendPending-I-Frames. That will make SendPending-I-Frames able to send frames. This solution is similar to what RR(P=0)(F=0) on the RECV table and RR(P=1) on the SREJ_SENT table do. Actually doesn't make any sense call SendPending-I-Frames if we can send any frame, i. e., RemoteBusy is True. Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit 4178ba462a3e8ab5094e69606f01d9e95f2d5ea6 Author: Gustavo F. Padovan Date: Sat May 1 16:15:45 2010 -0300 Bluetooth: Prevents buffer overflow on l2cap_ertm_reassembly_sdu() The checks should be done before the the memcpy to avoid buffer overflow. Reported-by: João Paulo Rechi Vita Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit dfc909befbfe967bd7f46ef33b6969c1b7f3cf42 Author: Gustavo F. Padovan Date: Sat May 1 16:15:45 2010 -0300 Bluetooth: Fix race condition on l2cap_ertm_send() l2cap_ertm_send() can be called both from user context and bottom half context. The socket locks for that contexts are different, the user context uses a mutex(which can sleep) and the second one uses a spinlock_bh. That creates a race condition when we have interruptions on both contexts at the same time. The better way to solve this is to add a new spinlock to lock l2cap_ertm_send() and the vars it access. The other solution was to defer l2cap_ertm_send() with a workqueue, but we the sending process already has one defer on the hci layer. It's not a good idea add another one. The patch refactor the code to create l2cap_retransmit_frames(), then we encapulate the lock of l2cap_ertm_send() for some call. It also changes l2cap_retransmit_frame() to l2cap_retransmit_one_frame() to avoid confusion Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 6161c0382bbab883a634d284f7367a88bbe88534 Author: Gustavo F. Padovan Date: Sat May 1 16:15:44 2010 -0300 Bluetooth: Add wait_queue to wait ack of all sent packets To guarantee that all packets we sent were received we need to wait for theirs ack before shutdown the socket. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 1890d36bb556a27684ad29654a9898ab9a5f57ee Author: Gustavo F. Padovan Date: Sat May 1 16:15:44 2010 -0300 Bluetooth: Implement Local Busy Condition handling Supports Local Busy condition handling through a waitqueue that wake ups each 200ms and try to push the packets to the upper layer. If it can push all the queue then it leaves the Local Busy state. The patch modifies the behaviour of l2cap_ertm_reassembly_sdu() to support retry of the push operation. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 9b53350d3cf5b330c3261d89b5e62a2dc25c5653 Author: João Paulo Rechi Vita Date: Sat May 1 16:15:44 2010 -0300 Bluetooth: Completes the I-frame tx_seq check logic on RECV Add checks for invalid tx_seq and fixes the duplicated tx_seq check. Signed-off-by: João Paulo Rechi Vita Acked-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit 18778a63ddc83bc89bda3b119fb02eb121512a66 Author: Gustavo F. Padovan Date: Sat May 1 16:15:44 2010 -0300 Bluetooth: Implement missing parts of the Invalid Frame Detection There is a plenty of situation where ERTM shall close the channel, this commit treats the cases regarding Invalid Frame Detection. It create one reassembly SDU function for ERTM and other for Streaming Mode to make the Invalid Frame Detection handling less complex. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit f11d676da4059c7888efca810ab300b931736a26 Author: Gustavo F. Padovan Date: Sat May 1 16:15:44 2010 -0300 Bluetooth: Refactor l2cap_retransmit_frame() Make the code flow cleaner and changes the function to void. It also fixes a potential NULL dereference with skb. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 9a9c6a34416b3743c09c00f3d6708d9df3c21629 Author: Gustavo F. Padovan Date: Sat May 1 16:15:43 2010 -0300 Bluetooth: Make hci_send_acl() void hci_send_acl can't fail, so we can make it void. This patch changes that and all the funcions that use hci_send_acl(). That change exposed a bug on sending connectionless data. We were not reporting the lenght send back to the user space. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit ff12fd643334071084b6145cad3793bb6c956638 Author: Gustavo F. Padovan Date: Wed May 5 22:09:15 2010 -0300 Bluetooth: Fix lockdep annotation on ERTM A spin_lock_init() call was missing. :) Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 9b16dc6551cbde65d0ac525af3c46efab53a2c46 Author: Gustavo F. Padovan Date: Wed May 5 20:05:57 2010 -0300 Bluetooth: Check if we really are in WAIT_F when F bit comes F-bit set should be processed only if we are in the WAIT_F state. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit a2e12a2a312f816d5970b0c809d43b399fbfe90c Author: Gustavo F. Padovan Date: Wed May 5 19:58:27 2010 -0300 Bluetooth: Remove unneeded control vars Trivial clean up. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 0301ef04b5f49a95681694fc0d75af9441faa919 Author: Gustavo F. Padovan Date: Wed May 5 20:56:43 2010 -0300 Bluetooth: Remove set of SrejSaveReqSeq under receipt of REJ frame That action is not specified by the ERTM spec, so removing it. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 59203a21a56c53afeb6f45e059299e6f1437f30f Author: Gustavo F. Padovan Date: Sat May 1 16:15:43 2010 -0300 Bluetooth: Fix errors reported by checkpatch.pl Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 44651b85cc3a076147af5d181fc4833ef8debc59 Author: Gustavo F. Padovan Date: Sat May 1 16:15:43 2010 -0300 Bluetooth: Don't set control bits to zero first We can set the SAR bits in the control field directly. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 01760bdde9a92413b7fff928d08e19352bf09d82 Author: João Paulo Rechi Vita Date: Sat May 1 16:15:43 2010 -0300 Bluetooth: Close L2CAP channel on invalid ReqSeq Signed-off-by: João Paulo Rechi Vita Acked-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit afefdbc4cf3b9d409d07e1e5264e7ff88bc48711 Author: Gustavo F. Padovan Date: Sat May 1 16:15:43 2010 -0300 Bluetooth: Fix SDU reassembly under SREJ The code was reusing the control var without its reinitialization. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 0041ecfa3025d7612fdaab12b2f07c9c3c09f42f Author: João Paulo Rechi Vita Date: Sat May 1 16:15:42 2010 -0300 Bluetooth: Check if mode is supported on getsockopt Add this check to getsockopt makes possible to fail early instead of waiting until listen / connect. Signed-off-by: João Paulo Rechi Vita Acked-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit bd3c9e255e76ae232d417e3914ca5d80ca3e9485 Author: Gustavo F. Padovan Date: Sat May 1 16:15:42 2010 -0300 Bluetooth: Add SOCK_STREAM support to L2CAP if enable_ertm is true and we have SOCK_STREAM the default mode will be ERTM, otherwise Basic Mode. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 84fb0a6334af0ccad3544f6972c055d90fbb9fbe Author: Gustavo F. Padovan Date: Sat May 1 16:15:42 2010 -0300 Bluetooth: Add Kconfig option for L2CAP Extended Features The L2CAP Extended Features are still unstable and under development, so we are adding them under the EXPERIMENTAL flag to get more feedback on them. L2CAP Extended Features includes the Enhanced Retransmission and Streaming Modes, Frame Check Sequence (FCS), and Segmentation and Reassemby (SAR). Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 3b1a9f3fa6ad842991538da2c3b2e29e047b131f Author: Gustavo F. Padovan Date: Sat May 1 16:15:42 2010 -0300 Bluetooth: Optimize SREJ_QUEUE append When the I-frame received is the expected, i.e., its tx_seq is equal to expected_tx_seq and we are under a SREJ, we can just add it to the tail of the list. Doing that we change the complexity from O(n) to O(1). Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 812e737e29a1d559e7bfbea675fdcfcbad9f5e1f Author: Gustavo F. Padovan Date: Sat May 1 16:15:42 2010 -0300 Bluetooth: Fix drop of acked packets on ERTM l2cap_drop_acked_frames() was droping not sent packets, causing them to be not transmitted. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 0ee0d20855ae9271de3f6695f4cafc08ab2533bb Author: Gustavo F. Padovan Date: Sat May 1 16:15:41 2010 -0300 Bluetooth: Fix crash when monitor timeout expires The code was crashing due to a invalid access to hci_conn after the channel disconnect. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit f6e6b16823de0aff31cb8ee8c098383e3aceec58 Author: Gustavo F. Padovan Date: Sat May 1 16:15:41 2010 -0300 Bluetooth: Fix bug when retransmitting I-frames If there is no frames to retransmit l2cap was crashing the kernel, now we check if the queue is empty first. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 68d7f0ce911e41e463c45911be031cdf6a096fe8 Author: Gustavo F. Padovan Date: Sat May 1 16:15:41 2010 -0300 Bluetooth: Enable option to configure Max Transmission value via sockopt With the sockopt extension we can set a per-channel MaxTx value. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 369ba30264826f38eefc61b93688100be8adbd4d Author: Gustavo F. Padovan Date: Sat May 1 16:15:41 2010 -0300 Bluetooth: Add module parameter for txWindow size on L2CAP Very useful for testing purposes. Signed-off-by: Gustavo F. Padovan [jprvita@profusion.mobi: improved parameter description] Signed-off-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 803020c6fa63aa738cfda3329c9675b42023e9d2 Author: Gustavo F. Padovan Date: Sat May 1 16:15:41 2010 -0300 Bluetooth: Change acknowledgement to use the value of txWindow Now that we can set the txWindow we need to change the acknowledgement procedure to ack after each (pi->txWindow/6 + 1). The plus 1 is to avoid the zero value. It also renames pi->num_to_ack to a better name: pi->num_acked. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 14b5aa71ec506f4e38ca6a1dc02ecd668ecfd902 Author: Gustavo F. Padovan Date: Sat May 1 16:15:40 2010 -0300 Bluetooth: Add sockopt configuration for txWindow on L2CAP Now we can set/get Transmission Window size via sockopt. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 855666cccc939d392316de17512e17a08b2fa05a Author: Gustavo F. Padovan Date: Sat May 1 16:15:40 2010 -0300 Bluetooth: Send Ack after clear the SREJ list As specified by Bluetooth 3.0 spec we shall send an acknowledgment using the Send-Ack() after clear the SREJ list. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 052897ca5019d9157ae09e5e84eee2a9ef5dccc6 Author: Gustavo F. Padovan Date: Sat May 1 16:15:40 2010 -0300 Bluetooth: Check the SDU size against the MTU value If the SDU size is greater than the MTU something is wrong, so report an error. Signed-off-by: Gustavo F. Padovan [jprvita@profusion.mobi: set err to appropriate errno value] Signed-off-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 10467e9e9b89272b25b56688bb276d0830e9ab9a Author: Gustavo F. Padovan Date: Sat May 1 16:15:40 2010 -0300 Bluetooth: Add le16 macro to Retransmission and Monitor Timeouts values Fix a possible problem with Big Endian machines. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 1c7621596d11b9c3e19eb88a818758dee4901c95 Author: Gustavo F. Padovan Date: Sat May 1 16:15:40 2010 -0300 Bluetooth: Fix configuration of the MPS value We were accepting values bigger than we can accept. This was leading ERTM to drop packets because of wrong FCS checks. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 7b1c0049be3aabc18831ada339dbcf41ba8c81fd Author: Gustavo F. Padovan Date: Sat May 1 16:15:39 2010 -0300 Bluetooth: Read RFC conf option on a successful Conf RSP On Enhanced Retransmission Mode and Streaming Mode a entity can send, on a successful Conf RSP, new values for the RFC fields. For example, the entity can send txWindow and MPS values less than the value received on a Conf REQ. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 2fb862e215e53630066c677e06d7551fa38bf235 Author: Gustavo F. Padovan Date: Sat May 1 16:15:39 2010 -0300 Bluetooth: Ignore Tx Window value with Streaming mode Tx Window value shall not be used with Streaming Mode and the receiver of the config Request shall ignore its value. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit c1b4f43be01c2a363be021485dd18cca33cfab8a Author: Gustavo F. Padovan Date: Sat May 1 16:15:39 2010 -0300 Bluetooth: Add timer to Acknowledge I-frames We ack I-frames on each txWindow/5 I-frames received, but if the sender stop to send I-frames and it's not a txWindow multiple we can leave some frames unacked. So I added a timer to ack I-frames on this case. The timer expires in 200ms. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 05fbd89dd4153341717b33d9e8ae8bd29db6c1c8 Author: Gustavo F. Padovan Date: Sat May 1 16:15:39 2010 -0300 Bluetooth: Finish implementation for Rec RR (P=1) on ERTM Now the code handles the case under SREJ_SENT state. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 8abb52ee00c4b3f857269eb6b7145991bab869bf Author: Gustavo F. Padovan Date: Sat May 1 16:15:38 2010 -0300 Bluetooth: Remove duplicate use of __get_reqseq() macro on L2CAP tx_seq var already has the value of __get_reqseq(). Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 6e3a59819fac19006fe4255b87928e5a12c54532 Author: Gustavo F. Padovan Date: Sat May 1 16:15:38 2010 -0300 Bluetooth: Group the ack of I-frames into l2cap_data_channel_rrframe() It also fix a bug: we weren't acknowledging I-frames when P=1. Note that when F=1 we are acknowledging packets before setting RemoteBusy to False. The spec says we should do that in the opposite order, but acknowledment of packets doesn't care about RemoteBusy flag so we can do that in the order we want. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 99b0d4b7b09edeacf4542bced5c01239375b51a9 Author: Gustavo F. Padovan Date: Sat May 1 16:15:38 2010 -0300 Bluetooth: Handle all cases of receipt of RNR-frames into L2CAP We weren't handling the receipt under SREJ_SENT state table. It also introduce l2cap_send_srejtail(). It will be used in the nexts commits too. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit e072745f4adb01b909bd08a0cfc8f79348f4d2c6 Author: Gustavo F. Padovan Date: Sat May 1 16:15:38 2010 -0300 Bluetooth: Split l2cap_data_channel_sframe() Create a function for each type fo S-frame and avoid a lot of nested code. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 73edaa9933219e25d6733b78d1e2c881025705e2 Author: Gustavo F. Padovan Date: Sat May 1 16:15:38 2010 -0300 Bluetooth: Add Recv RR (P=0)(F=0) for SREJ_SENT state on ERTM This finishes the implementation of Recv RR (P=0)(F=0) for the Enhanced Retransmission Mode on L2CAP. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit f0946ccfc7da403a46b7ff7cb2e3deffac108742 Author: Gustavo F. Padovan Date: Sat May 1 16:15:37 2010 -0300 Bluetooth: Move set of P-bit to l2cap_send_sframe() Abstract the send of of P-bit and avoids code duplication like we did with the setting of F-bit. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 9e917af13d59182f95bbb5483dc0c4254dfb7944 Author: Gustavo F. Padovan Date: Sat May 1 16:15:37 2010 -0300 Bluetooth: Implement SendAck() Action on ERTM. Shall be used to ack received frames, It must decide type of acknowledgment between a RR frame, a RNR frame or transmission of pending I-frames. It also modifies l2cap_ertm_send() to report the number of frames sent. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 36f2fd585f43199f006a3b5ff84e95815102cd31 Author: Gustavo F. Padovan Date: Sat May 1 16:15:37 2010 -0300 Bluetooth: Check if SDU size is greater than MTU on L2CAP After reassembly the SDU we need to check his size. It can't overflow the MTU size. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 277ffbe362823d18a17792fbd8e507010e666299 Author: Gustavo F. Padovan Date: Sat May 1 16:15:37 2010 -0300 Bluetooth: Check the minimum {I,S}-frame size into L2CAP All packets with size fewer than the minimum specified is dropped. Note that the size of the l2cap basic header, FCS and SAR fields are already subtracted of len at the moment of the size check. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 1d8f5d16913d74e428950ee02fe9ff7e6391c120 Author: Gustavo F. Padovan Date: Sat May 1 16:15:37 2010 -0300 Bluetooth: Support case with F bit set under WAIT_F state. On receipt of a F=1 under WAIT_F state ERTM shall stop monitor timer and start retransmission timer (if there are unacked frames). Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit d5392c8f1e9faef089bb7cb66c3314da8bddd1fe Author: Gustavo F. Padovan Date: Sat May 1 16:15:36 2010 -0300 Bluetooth: Implement 'Send IorRRorRNR' event After receive a RR with P bit set ERTM shall use this funcion to choose what type of frame to reply with F bit = 1. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit e8235c6bdd1c7ffbaa7eb8dcdbb46c51f1e5d72e Author: Gustavo F. Padovan Date: Sat May 1 16:15:36 2010 -0300 Bluetooth: Use a l2cap_pinfo struct instead l2cap_pi() macro Trivial clean up. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit d1daa091e8612f3aab14d28b5836375fafe155e1 Author: Gustavo F. Padovan Date: Sat May 1 16:15:36 2010 -0300 Bluetooth: Fix ACL MTU issue ERTM and Streaming Modes was having problems when the ACL MTU is lower than MPS. The 'minus 10' is to take in account the header and fcs lenghts. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 7dffe4210233a2860c3f41477c40b3252edf2b7d Author: Gustavo F. Padovan Date: Sat May 1 16:15:36 2010 -0300 Bluetooth: Fix expected_tx_seq calculation on L2CAP All operation related to the txWindow should be modulo 64. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit faaebd192ec9c3febcab98149d1309199a5b886c Author: Gustavo F. Padovan Date: Sat May 1 16:15:35 2010 -0300 Bluetooth: Fix memory leak of S-frames into L2CAP l2cap_data_channel do not free the S-frame, so we free it here. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit c69163e9ed5048407cc84f439cbfecc53f6f7131 Author: Gustavo F. Padovan Date: Sat May 1 16:15:35 2010 -0300 Bluetooth: Move specific Basic Mode code to the right place Inside "case L2CAP_MODE_BASIC:" we don't need to check for sk_type and L2CAP mode. So only the length check is fine. Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit b9dbdbc1f4404cba2e64939c30c87d59c9796e4e Author: Gustavo F. Padovan Date: Sat May 1 16:15:35 2010 -0300 Bluetooth: Trivial clean ups to SCO Remove extra braces and labels, break over column 80 lines, etc Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit 0d861d8b8edd139a9b291cb262d08dec8dc3922d Author: Gustavo F. Padovan Date: Sat May 1 16:15:35 2010 -0300 Bluetooth: Make hci_send_sco() void It also removes an unneeded check for the MTU. The check is done before on sco_send_frame() Signed-off-by: Gustavo F. Padovan Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann commit 4f7ac1814ef6f0773e57ffd159a1dd57a3c80521 Author: Gustavo F. Padovan Date: Sat May 1 16:15:34 2010 -0300 Bluetooth: Fix wrong packet type count increment Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit acce90d6a957812081b83ac4d1133e93a43569c6 Author: Gustavo F. Padovan Date: Sat May 1 16:15:34 2010 -0300 Bluetooth: Use the proper function cast to get hdr data Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit fe1aff710756ac73c455d214845c74e304d0e966 Author: Gustavo F. Padovan Date: Sat May 1 16:15:34 2010 -0300 Bluetooth: Fix return value when bt_skb_alloc fails Set the proper error(ENOMEM), instead of just return 0. Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit af507ae8a0512a83728b17d8f8c5fa1561669f50 Author: Li Zefan Date: Mon May 10 11:24:27 2010 +0800 sched: Remove a stale comment This comment should have been removed together with uids_mutex when removing user sched. Signed-off-by: Li Zefan Cc: Peter Zijlstra Cc: Dhaval Giani LKML-Reference: <4BE77C6B.5010402@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 19d8f84f86af867abee174be8bf1e4941a59143d Author: Paul Mundt Date: Mon May 10 15:39:05 2010 +0900 sh: enable LMB region setup via machvec. This plugs in a memory init callback in the machvec to permit boards to wire up various bits of memory directly in to LMB. A generic machvec implementation is provided that simply wraps around the normal Kconfig-derived memory start/size. Signed-off-by: Paul Mundt commit 1f0ac7183f4d270bd9ce511254ba5d931d4f29c9 Merge: 232a5c9 76ba7e8 Author: Ingo Molnar Date: Mon May 10 08:20:19 2010 +0200 Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core commit 3998d095354d2a3062bdaa821ef07a1e1c82873c Author: H. Peter Anvin Date: Sun May 9 22:46:54 2010 -0700 x86, hypervisor: add missing EXPORT_SYMBOL() needs to be included; fixes modular builds of the VMware balloon driver, and any future modular drivers which depends on the hypervisor. Reported-by: Ingo Molnar Signed-off-by: H. Peter Anvin Cc: Greg KH Cc: Hank Janssen Cc: Alok Kataria Cc: Ky Srinivasan Cc: Dmitry Torokhov LKML-Reference: <4BE49778.6060800@zytor.com> commit 63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc Author: Ben Dooks Date: Fri Apr 30 16:32:26 2010 +0900 ARM: SAMSUNG: Update S3C2416 entry with S3C2450 These devices are so similar that they share the same SoC ID code, so note this. Signed-off-by: Ben Dooks commit eb90de4a2d2880f0037d2b2ba85a3e857a898b40 Author: Ben Dooks Date: Fri Apr 30 19:48:02 2010 +0900 ARM: S3C2413: Update GPIO pull-up support Ensure the right get/set pull code is selected and assigned to the GPIO core. Signed-off-by: Ben Dooks commit e12ef7f02ed56af4f84a5743fa268901c52729bf Author: Ben Dooks Date: Mon May 3 16:44:35 2010 +0900 ARM: S3C2416: Use s3c2440 style i2c controller The s3c2416 i2c controllers are compatible with the s3c2440 style i2c block, so change the device name appropriately. Signed-off-by: Ben Dooks y commit a6e1ec7f69950864ff8d992da6d929b1444f7cb3 Author: Ben Dooks Date: Fri Apr 30 10:59:42 2010 +0900 ARM: S3C2416: Add support for OHCI on SMDK2416 Add device definition and ensure that the host port is powered up at start time. Full power control can be added at a later date. Signed-off-by: Ben Dooks commit c140c98ac161ad270a768126431e36a22f86f6b3 Author: Ben Dooks Date: Thu Apr 29 18:59:43 2010 +0900 ARM: S3C2416: Add support for second HSMMC channel Add support for the second HSMMC channel on the S3C2416. Signed-off-by: Ben Dooks commit 8d6f8658305db969981f64a22296b487ef2f1148 Author: Ben Dooks Date: Fri Apr 30 11:12:58 2010 +0900 ARM: S3C2416: Add basic clock support Add basic clock support for the PLLs, HSMMC channels and PWM clocks. This is enough to get a basic system up and running. Signed-off-by: Ben Dooks commit af337f3e633a198034a99450416257ddf2307497 Author: Ben Dooks Date: Wed Apr 28 18:03:57 2010 +0900 ARM: S3C2443: Move parts of the clock code to common clock file To share code with some of the newer parts such as the S3C2416, move parts of arch/arm/mach-s3c2443/clock.c to a common file called arch/arm/plat-s3c24xx/s3c2443-clock.c. Update the build configuration to deal with this new file. Signed-off-by: Ben Dooks commit d11a7d7100123d178821f82ecc11ba2d9d6e97c8 Author: Ben Dooks Date: Wed Apr 28 18:00:07 2010 +0900 ARM: S3C24XX: Identify S3C2416 if S3C2412/S3C2413 built in Extend the ARMv5 ID code to deal with S3C2416 being built with S3C2412/S3C2413 enabled, as these have their ID registers in a different place. Signed-off-by: Ben Dooks commit d24131470f3def698683144cf1e81ee0f4f9c0b8 Author: Yauhen Kharuzhy Date: Wed Aug 19 16:31:07 2009 +0300 ARM: S3C2416: Add initial support of SMDK2416 Add support of SMDK2416 development board. Signed-off-by: Yauhen Kharuzhy Signed-off-by: Ben Dooks commit f1290a49c5496521360a3e40d8bc766aceee65e5 Author: Yauhen Kharuzhy Date: Wed Apr 28 18:09:01 2010 +0900 ARM: S3C2416: Add arch support Add arch/arm/mach-s3c2416 for support of the Samsung S3C2416 SoC. This patch adds support of the S3C2416 SoC, clocks, timers, and initial IRQ support (without support of secondary set of registers). Signed-off-by: Yauhen Kharuzhy [ben-linux@fluff.org: removed files to be reworked, fixed conflicts] [ben-linux@fluff.org: use s3c2443 reset instead of specific reset code] Signed-off-by: Ben Dooks commit 4e04691bc600b53f6aab63404e58fae3bdf8e310 Author: Ben Dooks Date: Wed Apr 28 12:58:13 2010 +0900 ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage Add s3c_disable_clocks() and change the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Ben Dooks commit e561aacc70716ff59b9359ba8f010609ee757241 Author: Ben Dooks Date: Wed Apr 28 18:10:02 2010 +0900 ARM: SAMSUNG: Move S3C6400 PLL code to for re-use The S3C6400 EPLL code matches the S3C2416 and compatible SoCs, so move it from mach-s3c64xx into for easy reuse. Signed-off-by: Ben Dooks commit 7cfdee9f6791fe9ec288e75ee746790ebf3b6c3b Author: Yauhen Kharuzhy Date: Wed Aug 19 16:31:03 2009 +0300 ARM: S3C2416: Add S3C2416-specific registers definitions Add macros for S3C2416 SoC support. Signed-off-by: Yauhen Kharuzhy [ben-linux@fluff.org: removed files that need changing] [ben-linux@fluff.org: Fix S3C2416_GPH0_TXD0 definition] Signed-off-by: Ben Dooks commit 232a5c948da5e23dff27e48180abf4a4238f7602 Author: Arnaldo Carvalho de Melo Date: Sun May 9 20:28:10 2010 -0300 perf report: Allow limiting the number of entries to print in callchains Works by adding a third parameter to the '-g' argument, after the graph type and minimum percentage, for example: [root@doppio linux-2.6-tip]# perf report -g fractal,0.5,2 Will show only the first two symbols where at least 0.5% of the samples took place. All the other symbols that don't fall outside these constraints will be put together in the last entry, prefixed with "[...]" and the total percentage for them. Suggested-by: Arjan van de Ven Acked-by: Arjan van de Ven Cc: Arjan van de Ven Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 1f626bc36847ac8dd192f055aed0f9678a781313 Author: Arnaldo Carvalho de Melo Date: Sun May 9 19:57:08 2010 -0300 perf session: Embed the host machine data on perf_session We have just one host on a given session, and that is the most common setup right now, so embed a ->host_machine struct machine instance directly in the perf_session class, check if we're looking for it before going to the rb_tree. This also fixes a problem found when we try to process old perf.data files where we didn't have MMAP events for the kernel and modules and thus don't create the kernel maps, do it in event__preprocess_sample if it wasn't already. Reported-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi Cc: Zhang, Yanmin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4cc4945844fe2cf493f1783b6ce938ba1617d5c2 Author: Arnaldo Carvalho de Melo Date: Sun May 9 21:14:07 2010 -0300 perf symbols: Check if a struct machine instance was found Which can happen when processing old files that had no fake kernel MMAP, events. That shouldn't result in perf_session__create_kernel_maps not being called, this will be fixed in a followup patch, for now do these checks to avoid segfaulting. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3ceb0d4438876a65606c258e5d69e03e57460dd6 Author: Arnaldo Carvalho de Melo Date: Sun May 9 16:07:01 2010 -0300 perf symbols: Consider unresolved DSOs in the dso__col_widt calculation By using BITS_PER_LONG / 4, that is the number of chars that will be used in such cases as the DSO "name". Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 76ba7e846fcc89d9d4b25b89e303c9058de96d60 Author: Hitoshi Mitake Date: Sat May 8 17:10:29 2010 +0900 perf lock: Drop "-a" option from cmd_record() default arguments set This patch drops "-a" from the default arguments passed to perf record by perf lock. If a user wants to do a system wide record of lock events, perf lock record -a ... is enough for this purpose. This can reduce the size of the perf.data file. % sudo ./perf lock record whoami root [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.439 MB perf.data (~19170 samples) ] % sudo ./perf lock record -a whoami # with -a option root [ perf record: Woken up 0 times to write data ] [ perf record: Captured and wrote 48.962 MB perf.data (~2139197 samples) ] Signed-off-by: Hitoshi Mitake Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Jens Axboe Cc: Jason Baron Cc: Xiao Guangrong LKML-Reference: Message-Id: <1273306229-5216-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Frederic Weisbecker commit 19379b11819efc1fc3b602e64f7e7531050aaddb Author: Arjan van de Ven Date: Sun May 9 08:26:51 2010 -0700 ondemand: Make the iowait-is-busy time a sysfs tunable Pavel Machek pointed out that not all CPUs have an efficient idle at high frequency. Specifically, older Intel and various AMD cpus would get a higher powerusage when copying files from USB. Mike Chan pointed out that the same is true for various ARM chips as well. Thomas Renninger suggested to make this a sysfs tunable with a reasonable default. This patch adds a sysfs tunable for the new behavior, and uses a very simple function to determine a reasonable default, depending on the CPU vendor/type. Signed-off-by: Arjan van de Ven Acked-by: Rik van Riel Acked-by: Pavel Machek Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082651.46914d04@infradead.org> [ minor tidyup ] Signed-off-by: Ingo Molnar commit 6b8fcd9029f217a9ecce822db645e19111c11080 Author: Arjan van de Ven Date: Sun May 9 08:26:06 2010 -0700 ondemand: Solve a big performance issue by counting IOWAIT time as busy The ondemand cpufreq governor uses CPU busy time (e.g. not-idle time) as a measure for scaling the CPU frequency up or down. If the CPU is busy, the CPU frequency scales up, if it's idle, the CPU frequency scales down. Effectively, it uses the CPU busy time as proxy variable for the more nebulous "how critical is performance right now" question. This algorithm falls flat on its face in the light of workloads where you're alternatingly disk and CPU bound, such as the ever popular "git grep", but also things like startup of programs and maildir using email clients... much to the chagarin of Andrew Morton. This patch changes the ondemand algorithm to count iowait time as busy, not idle, time. As shown in the breakdown cases above, iowait is performance critical often, and by counting iowait, the proxy variable becomes a more accurate representation of the "how critical is performance" question. The problem and fix are both verified with the "perf timechar" tool. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Dave Jones Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra LKML-Reference: <20100509082606.3d9f00d0@infradead.org> Signed-off-by: Ingo Molnar commit 0224cf4c5ee0d7faec83956b8e21f7d89e3df3bd Author: Arjan van de Ven Date: Sun May 9 08:25:23 2010 -0700 sched: Intoduce get_cpu_iowait_time_us() For the ondemand cpufreq governor, it is desired that the iowait time is microaccounted in a similar way as idle time is. This patch introduces the infrastructure to account and expose this information via the get_cpu_iowait_time_us() function. [akpm@linux-foundation.org: fix CONFIG_NO_HZ=n build] Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082523.284feab6@infradead.org> Signed-off-by: Ingo Molnar commit e0e37c200f1357db0dd986edb359c41c57d24f6e Author: Arjan van de Ven Date: Sun May 9 08:24:39 2010 -0700 sched: Eliminate the ts->idle_lastupdate field Now that the only user of ts->idle_lastupdate is update_ts_time_stats(), the entire field can be eliminated. In update_ts_time_stats(), idle_lastupdate is first set to "now", and a few lines later, the only user is an if() statement that assigns a variable either to "now" or to ts->idle_lastupdate, which has the value of "now" at that point. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082439.2fab0b4f@infradead.org> Signed-off-by: Ingo Molnar commit 8d63bf949e330588b80d30ca8f0a27a45297a9e9 Author: Arjan van de Ven Date: Sun May 9 08:24:03 2010 -0700 sched: Fold updating of the last_update_time_info into update_ts_time_stats() This patch folds the updating of the last_update_time into the update_ts_time_stats() function, and updates the callers. This allows for further cleanups that are done in the next patch. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082403.60072967@infradead.org> Signed-off-by: Ingo Molnar commit 8c7b09f43f4bf570654bcc458ce96819a932303c Author: Arjan van de Ven Date: Sun May 9 08:23:23 2010 -0700 sched: Update the idle statistics in get_cpu_idle_time_us() Right now, get_cpu_idle_time_us() only reports the idle statistics upto the point the CPU entered last idle; not what is valid right now. This patch adds an update of the idle statistics to get_cpu_idle_time_us(), so that calling this function always returns statistics that are accurate at the point of the call. This includes resetting the start of the idle time for accounting purposes to avoid double accounting. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082323.2d2f1945@infradead.org> Signed-off-by: Ingo Molnar commit 595aac488b546c7185be7e29c8ae165a588b2a9f Author: Arjan van de Ven Date: Sun May 9 08:22:45 2010 -0700 sched: Introduce a function to update the idle statistics Currently, two places update the idle statistics (and more to come later in this series). This patch creates a helper function for updating these statistics. Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082245.163e67ed@infradead.org> Signed-off-by: Ingo Molnar commit b1f724c3055fa75a31d272222213647547a2d3d4 Author: Arjan van de Ven Date: Sun May 9 08:22:08 2010 -0700 sched: Add a comment to get_cpu_idle_time_us() The exported function get_cpu_idle_time_us() has no comment describing it; add a kerneldoc comment Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Reviewed-by: Rik van Riel Acked-by: Peter Zijlstra Cc: davej@redhat.com LKML-Reference: <20100509082208.7cb721f0@infradead.org> Signed-off-by: Ingo Molnar commit 28e2a106d16046ca792722795f809e3f80a5af80 Author: Arnaldo Carvalho de Melo Date: Sun May 9 13:02:23 2010 -0300 perf hist: Simplify the insertion of new hist_entry instances And with that fix at least one bug: The first hit for an entry, the one that calls malloc to create a new instance in __perf_session__add_hist_entry, wasn't adding the count to the per cpumode (PERF_RECORD_MISC_USER, etc) total variable. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 39d1e1b1e26dc84d40bf2792287d0d61e44b57df Author: Arnaldo Carvalho de Melo Date: Sun May 9 12:01:05 2010 -0300 perf report: Fix leak of resolved callchains array on error path Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 139633c6a43781cd44798165b0472a34bf53a1e8 Author: Arnaldo Carvalho de Melo Date: Sun May 9 11:47:13 2010 -0300 perf callchain: Move validate_callchain to callchain lib Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 794e43b56c18b95fc9776c914a2659e7d558a352 Author: Tom Zanussi Date: Wed May 5 00:27:40 2010 -0500 perf/live-mode: Handle payload-less events Some events, such as the PERF_RECORD_FINISHED_ROUND event consist of only an event header and no data. In this case, a 0-length payload will be read, and the 0 return value will be wrongly interpreted as an 'unexpected end of event stream'. This patch allows for proper handling of data-less events by skipping 0-length reads. Signed-off-by: Tom Zanussi Cc: Arnaldo Carvalho de Melo Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Masami Hiramatsu LKML-Reference: <1273038527.6383.51.camel@tropicana> Signed-off-by: Frederic Weisbecker commit 2c193c736803ceb547daec725e5c5d992d039f20 Author: Frederic Weisbecker Date: Sat May 8 06:36:02 2010 +0200 tracing: Factorize lock events in a lock class lock_acquired, lock_contended and lock_release now share the same prototype and format. Let's factorize them into a lock event class. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Hitoshi Mitake Cc: Steven Rostedt commit 93135439459920c4d856f4ab8f068c030085c8df Author: Frederic Weisbecker Date: Sat May 8 06:24:25 2010 +0200 tracing: Drop the nested field from lock_release event Drop the nested field as we don't use it. Every nested state can be computed from a state machine on post processing already. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Hitoshi Mitake Cc: Steven Rostedt commit 883a2a3189dae9d2912c417e47152f51cb922a3f Author: Frederic Weisbecker Date: Sat May 8 06:16:11 2010 +0200 tracing: Drop lock_acquired waittime field Drop the waittime field from the lock_acquired event, we can calculate it by substracting the lock_acquired event timestamp with the matching lock_acquire one. It is not needed and takes useless space in the traces. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Steven Rostedt commit 90c0e5fc7b73d2575c7367e1da70ff9521718e5e Author: Frederic Weisbecker Date: Fri May 7 02:33:42 2010 +0200 perf lock: Always check min AND max wait time When a lock is acquired after beeing contended, we update the wait time statistics for the given lock. But if the min wait time is updated, we don't check the max wait time. This is wrong because the first time we update the wait time, we want to update both min and max wait time. Before: Name acquired contended total wait (ns) max wait (ns) min wait (ns) key 8 1 21656 0 21656 After: Name acquired contended total wait (ns) max wait (ns) min wait (ns) key 8 1 21656 21656 21656 Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake commit 5efe08cf685f33f562566dc68b6077b6f6a4f706 Author: Frederic Weisbecker Date: Thu May 6 04:55:22 2010 +0200 perf: Fix perf lock bad rate Fix the cast made to get the bad rate. It is made in the result instead of the operands. We need the operands to be cast in double, otherwise the result will always be zero. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake commit 84c7a21791eb2e962a27e19bab5b77d5d9e13a34 Author: Frederic Weisbecker Date: Wed May 5 23:57:25 2010 +0200 perf: Humanize lock flags in perf lock Use an enum instead of plain constants for lock flags. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake commit 10350ec362b48f79f3df8447c25813790075e27c Author: Frederic Weisbecker Date: Wed May 5 23:47:28 2010 +0200 perf: Cleanup perf lock broken states Use enum to get a human view of bad_hist indexes and put bad histogram output in its own function. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake commit 26242d859c9be9eea61f7f19514e9d272ae8ce26 Author: Hitoshi Mitake Date: Mon May 3 14:12:00 2010 +0900 perf lock: Add "info" subcommand for dumping misc information This adds the "info" subcommand to perf lock which can be used to dump metadata like threads or addresses of lock instances. "map" was removed because info should do the work for it. This will be useful not only for debugging but also for ordinary analyzing. v2: adding example of usage % sudo ./perf lock info -t | Thread ID: comm | 0: swapper | 1: init | 18: migration/5 | 29: events/2 | 32: events/5 | 33: events/6 ... % sudo ./perf lock info -m | Address of instance: name of class | 0xffff8800b95adae0: &(&sighand->siglock)->rlock | 0xffff8800bbb41ae0: &(&sighand->siglock)->rlock | 0xffff8800bf165ae0: &(&sighand->siglock)->rlock | 0xffff8800b9576a98: &p->cred_guard_mutex | 0xffff8800bb890a08: &(&p->alloc_lock)->rlock | 0xffff8800b9522a08: &(&p->alloc_lock)->rlock | 0xffff8800bb8aaa08: &(&p->alloc_lock)->rlock | 0xffff8800bba72a08: &(&p->alloc_lock)->rlock | 0xffff8800bf18ea08: &(&p->alloc_lock)->rlock | 0xffff8800b8a0d8a0: &(&ip->i_lock)->mr_lock | 0xffff88009bf818a0: &(&ip->i_lock)->mr_lock | 0xffff88004c66b8a0: &(&ip->i_lock)->mr_lock | 0xffff8800bb6478a0: &(shost->host_lock)->rlock v3: fixed some problems Frederic pointed out * better rbtree tracking in dump_threads() * removed printf() and used pr_info() and pr_debug() Signed-off-by: Hitoshi Mitake Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Jens Axboe Cc: Jason Baron Cc: Xiao Guangrong LKML-Reference: <1272863520-16179-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Frederic Weisbecker commit d6b17bebd79dae2e3577f2ea27a832af4991a5e6 Author: Frederic Weisbecker Date: Mon May 3 15:14:33 2010 +0200 perf: Provide a new deterministic events reordering algorithm The current events reordering algorithm is based on a heuristic that gets broken once we deal with a very fast flow of events. Indeed the time period based flushing is not suitable anymore in the following case, assuming we have a flush period of two seconds. CPU 0 | CPU 1 | cnt1 timestamps | cnt1 timestamps | 0 | 0 1 | 1 2 | 2 3 | 3 [...] | [...] 4 seconds later If we spend too much time to read the buffers (case of a lot of events to record in each buffers or when we have a lot of CPU buffers to read), in the next pass the CPU 0 buffer could contain a slice of several seconds of events. We'll read them all and notice we've reached the period to flush. In the above example we flush the first half of the CPU 0 buffer, then we read the CPU 1 buffer where we have events that were on the flush slice and then the reordering fails. It's simple to reproduce with: perf lock record perf bench sched messaging To solve this, we use a new solution that doesn't rely on an heuristical time slice period anymore but on a deterministic basis based on how perf record does its job. perf record saves the buffers through passes. A pass is a tour on every buffers from every CPUs. This is made in order: for each CPU we read the buffers of every counters. So the more buffers we visit, the later will be the timstamps of their events. When perf record finishes a pass it records a PERF_RECORD_FINISHED_ROUND pseudo event. We record the max timestamp t found in the pass n. Assuming these timestamps are monotonic across cpus, we know that if a buffer still has events with timestamps below t, they will be all available and then read in the pass n + 1. Hence when we start to read the pass n + 2, we can safely flush every events with timestamps below t. ============ PASS n ================= CPU 0 | CPU 1 | cnt1 timestamps | cnt2 timestamps 1 | 2 2 | 3 - | 4 <--- max recorded ============ PASS n + 1 ============== CPU 0 | CPU 1 | cnt1 timestamps | cnt2 timestamps 3 | 5 4 | 6 5 | 7 <---- max recorded Flush every events below timestamp 4 ============ PASS n + 2 ============== CPU 0 | CPU 1 | cnt1 timestamps | cnt2 timestamps 6 | 8 7 | 9 - | 10 Flush every events below timestamp 7 etc... It also works on perf.data versions that don't have PERF_RECORD_FINISHED_ROUND pseudo events. The difference is that the events will be only flushed in the end of the perf.data processing. It will then consume more memory and scale less with large perf.data files. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Masami Hiramatsu commit 984028075794c00cbf4fb1e94bb6233e8be08875 Author: Frederic Weisbecker Date: Sun May 2 22:05:29 2010 +0200 perf: Introduce a new "round of buffers read" pseudo event In order to provide a more rubust and deterministic reordering algorithm, we need to know when we reach a point where we just did a pass through over every counter buffers to read every thing they had. This patch introduces a new PERF_RECORD_FINISHED_ROUND pseudo event that only consist in an event header and doesn't need to contain anything. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Masami Hiramatsu commit a10a569806e43b9be5fce60b21f836b50b1010e4 Author: H. Peter Anvin Date: Sun May 9 01:13:42 2010 -0700 Modify the VMware balloon driver for the new x86_hyper API Modify the VMware balloon driver to match the new x86_hyper API. Signed-off-by: H. Peter Anvin Cc: Greg KH Cc: Hank Janssen Cc: Alok Kataria Cc: Ky Srinivasan Cc: Dmitry Torokhov LKML-Reference: <4BE49778.6060800@zytor.com> commit 96f6e775b58687d85ee33004d414419b5ec34106 Author: H. Peter Anvin Date: Sun May 9 01:10:34 2010 -0700 x86, hypervisor: Export the x86_hyper* symbols Export x86_hyper and the related specific structures, allowing for hypervisor identification by modules. Signed-off-by: H. Peter Anvin Cc: Greg KH Cc: Hank Janssen Cc: Alok Kataria Cc: Ky Srinivasan Cc: Dmitry Torokhov LKML-Reference: <4BE49778.6060800@zytor.com> commit d7be0ce6afb1df60bc786f57410407ceae92b994 Merge: e08cae4 66f41d4 Author: H. Peter Anvin Date: Sat May 8 14:59:58 2010 -0700 Merge commit 'v2.6.34-rc6' into x86/cpu commit e157eb8341e7885ff2d9f1620155e3da6e0c8f56 Author: Pekka Enberg Date: Sat May 8 18:33:03 2010 +0300 perf report: Document '--call-graph' better for usage This patch improves 'perf report -h' output for the '--call-graph' command line option by enumerating the different output types. Signed-off-by: Pekka Enberg Cc: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1273332783-4268-1-git-send-email-penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar commit e7858f52a5cb868289a72264534a1f05f3340c6c Merge: 27a9da6 bbf1bb3 Author: Ingo Molnar Date: Sat May 8 18:11:19 2010 +0200 Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core commit c0614829c16ab9d31f1b7d40516decfbf3d32102 Author: Masami Hiramatsu Date: Tue Apr 27 18:33:12 2010 -0400 kprobes: Move enable/disable_kprobe() out from debugfs code Move enable/disable_kprobe() API out from debugfs related code, because these interfaces are not related to debugfs interface. This fixes a compiler warning. Signed-off-by: Masami Hiramatsu Acked-by: Ananth N Mavinakayanahalli Acked-by: Tony Luck Cc: systemtap Cc: DLE LKML-Reference: <20100427223312.2322.60512.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit bbf1bb3eee86f2eef2baa14e600be454d09109ee Author: Tejun Heo Date: Sat May 8 16:20:53 2010 +0200 cpu_stop: add dummy implementation for UP When !CONFIG_SMP, cpu_stop functions weren't defined at all which could lead to build failures if UP code uses cpu_stop facility. Add dummy cpu_stop implementation for UP. The waiting variants execute the work function directly with preempt disabled and stop_one_cpu_nowait() schedules a workqueue work. Makefile and ifdefs around stop_machine implementation are updated to accomodate CONFIG_SMP && !CONFIG_STOP_MACHINE case. Signed-off-by: Tejun Heo Reported-by: Ingo Molnar commit c7993165ef0c1d636ca05f4787739f8414584e6d Author: Cyrill Gorcunov Date: Sat May 8 15:25:54 2010 +0400 x86, perf: P4 PMU -- check for proper event index in RAW events RAW events are special and we should be ready for user passing in insane event index values. Signed-off-by: Cyrill Gorcunov Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Lin Ming LKML-Reference: <20100508112717.315897547@openvz.org> Signed-off-by: Ingo Molnar commit 3f51b7119d052827dbb0e40c966acdf2bdc6f47f Author: Cyrill Gorcunov Date: Sat May 8 15:25:53 2010 +0400 x86, perf: P4 PMU -- Get rid of redundant check for array index The caller already has done such a check. And it was wrong anyway, it had to be '>=' rather than '>' Signed-off-by: Cyrill Gorcunov Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Lin Ming LKML-Reference: <20100508112717.130386882@openvz.org> Signed-off-by: Ingo Molnar commit 137351e0feeb9f25d99488ee1afc1c79f5499a9a Author: Cyrill Gorcunov Date: Sat May 8 15:25:52 2010 +0400 x86, perf: P4 PMU -- protect sensible procedures from preemption Steven reported: | | I'm getting: | | Pid: 3477, comm: perf Not tainted 2.6.34-rc6 #2727 | Call Trace: | [] debug_smp_processor_id+0xd5/0xf0 | [] p4_hw_config+0x2b/0x15c | [] ? trace_hardirqs_on_caller+0x12b/0x14f | [] hw_perf_event_init+0x468/0x7be | [] ? debug_mutex_init+0x31/0x3c | [] T.850+0x273/0x42e | [] sys_perf_event_open+0x23e/0x3f1 | [] ? sysret_check+0x2e/0x69 | [] system_call_fastpath+0x16/0x1b | | When running perf record in latest tip/perf/core | Due to the fact that p4 counters are shared between HT threads we synthetically divide the whole set of counters into two non-intersected subsets. And while we're "borrowing" counters from these subsets we should not be preempted (well, strictly speaking in p4_hw_config we just pre-set reference to the subset which allow to save some cycles in schedule routine if it happens on the same cpu). So use get_cpu/put_cpu pair. Also p4_pmu_schedule_events should use smp_processor_id rather than raw_ version. This allow us to catch up preemption issue (if there will ever be). Reported-by: Steven Rostedt Tested-by: Steven Rostedt Signed-off-by: Cyrill Gorcunov Cc: Steven Rostedt Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Lin Ming LKML-Reference: <20100508112716.963478928@openvz.org> Signed-off-by: Ingo Molnar commit de902d967feb96f2dfddfbe9dbd69dc22fd5ebcb Author: Cyrill Gorcunov Date: Sat May 8 15:39:52 2010 +0400 x86, perf: P4 PMU -- configure predefined events If an event is not RAW we should not exit p4_hw_config early but call x86_setup_perfctr as well. Signed-off-by: Cyrill Gorcunov Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Lin Ming Cc: Robert Richter Signed-off-by: Ingo Molnar commit 6e85158cf5a2385264316870256fb6ad681156a0 Author: Paul Mackerras Date: Sat May 8 20:58:00 2010 +1000 perf_event: Make software events work again Commit 6bde9b6ce0127e2a56228a2071536d422be31336 ("perf: Add group scheduling transactional APIs") added code to allow a group to be scheduled in a single transaction. However, it introduced a bug in handling events whose pmu does not implement transactions -- at the end of scheduling in the events in the group, in the non-transactional case the code now falls through to the group_error label, and proceeds to unschedule all the events in the group and return failure. This fixes it by returning 0 (success) in the non-transactional case. Signed-off-by: Paul Mackerras Cc: Peter Zijlstra Cc: Lin Ming Cc: Frederic Weisbecker Cc: eranian@gmail.com LKML-Reference: <20100508105800.GB10650@brick.ozlabs.ibm.com> Signed-off-by: Ingo Molnar commit 1bde78bc25a8e244006f63adb851bfb34407d48c Author: Ville Syrjälä Date: Fri May 7 00:12:13 2010 +0300 ALSA: maestro3: Clear interrupts before enabling them Avoid spurious interrupts when initializing the device. Signed-off-by: Ville Syrjälä Signed-off-by: Takashi Iwai commit 6895b5262ea80c99e526d40d39e0ca48014bdb95 Author: Ville Syrjälä Date: Fri May 7 00:12:12 2010 +0300 ALSA: es1968: Clear interrupts before enabling them Avoid spurious interrupts when initializing the device. Signed-off-by: Ville Syrjälä Signed-off-by: Takashi Iwai commit 5e688883563ef62bd3725922f1a795a8253df499 Author: Daniel Mack Date: Sat May 8 11:24:56 2010 +0200 ALSA: sound/usb: fix UAC1 regression Commit 23caaf19b ("ALSA: usb-mixer: Add support for Audio Class v2.0") broke support for Class1 devices due to two faulty changes. This patch fixes it. Signed-off-by: Daniel Mack Reported-and-Tested-by: The Source Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 3ee943728fff536edaf8f59faa58aaa1aa7366e3 Author: Neil Horman Date: Sat May 8 01:57:52 2010 -0700 ipv4: remove ip_rt_secret timer (v4) A while back there was a discussion regarding the rt_secret_interval timer. Given that we've had the ability to do emergency route cache rebuilds for awhile now, based on a statistical analysis of the various hash chain lengths in the cache, the use of the flush timer is somewhat redundant. This patch removes the rt_secret_interval sysctl, allowing us to rely solely on the statistical analysis mechanism to determine the need for route cache flushes. Signed-off-by: Neil Horman Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit ed82702155b6343727ee732f7eae6d72e8b453fe Merge: 4d1c52b 1cf4a06 Author: Ingo Molnar Date: Sat May 8 10:02:57 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit e08cae4181af9483b04ecfac48f01c8e5a5f27bf Author: H. Peter Anvin Date: Fri May 7 16:57:28 2010 -0700 x86: Clean up the hypervisor layer Clean up the hypervisor layer and the hypervisor drivers, using an ops structure instead of an enumeration with if statements. The identity of the hypervisor, if needed, can be tested by testing the pointer value in x86_hyper. The MS-HyperV private state is moved into a normal global variable (it's per-system state, not per-CPU state). Being a normal bss variable, it will be left at all zero on non-HyperV platforms, and so can generally be tested for HyperV-specific features without additional qualification. Signed-off-by: H. Peter Anvin Acked-by: Greg KH Cc: Hank Janssen Cc: Alok Kataria Cc: Ky Srinivasan LKML-Reference: <4BE49778.6060800@zytor.com> commit 9fa02317429449e8176c9bb6da3ac00eb14d52d3 Author: Greg Kroah-Hartman Date: Fri May 7 16:55:41 2010 -0700 x86, HyperV: fix up the license to mshyperv.c This should have been GPLv2 only, we cut and pasted from the wrong file originally, sorry. Also removed some unneeded boilerplate license code, we all know where to find the GPLv2, and that there's no warranty as that is implicit from the license. Cc: Ky Srinivasan Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman LKML-Reference: <20100507235541.GA15448@kroah.com> Signed-off-by: H. Peter Anvin commit 8bbf50fe9c0fb8d83b993ae6d88a4ce27d81b999 Author: Jonathan Corbet Date: Fri Apr 30 10:03:57 2010 -0600 viafb: Fix initialization error paths Properly localize error cleanup, and make sure that the iomem regions are unmapped if framebuffer initialization fails. Reported-by: Bruno Prémont Signed-off-by: Jonathan Corbet commit 27fe971d08b43f649358745a55f3c48ac6f413f8 Author: Jonathan Corbet Date: Fri Apr 30 09:45:51 2010 -0600 viafb: Do not remove gpiochip under spinlock gpiochip_remove() is not meant to be called with interrupts disabled, and there is no need for the lock here in any case. Reported-by: Bruno Prémont Signed-off-by: Jonathan Corbet commit 2b78a963c800252a0016785813cc5140c006145c Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:57 2010 +0000 viafb: make procfs entries optional viafb: make procfs entries optional This patch adds a config option to enable procfs entries for direct hardware access. This was the old behaviour but the option defaults to no as this is really ugly and should not be needed if the driver works correct (and if it doesn't, it needs to be fixed). That stuff is really something that should - not be needed at all (the driver should be capable of doing it) - not be there (debugfs would be better for such things) So add this option just for backwards compatiblity. Signed-off-by: Florian Tobias Schandinat commit 2fed547c0298e1465d62b34a75a7b76353fee7d3 Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:56 2010 +0000 viafb: fix proc entry removal viafb: fix proc entry removal Trying to remove unregistered proc entries became painful and is useless anyway. So remove the removal of an entry that was never registered and duplicate the logic for one which is added conditionally. Additionally move the removal above releasing fb_info as we still need the information. This prevents tainting the kernel by the procfs warn on and avoiding access to already freed memory is probably also a good idea. Signed-off-by: Florian Tobias Schandinat commit 162fc8c0c03d5b8536f14cbd2cdfb399c50c05ec Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:55 2010 +0000 viafb: improve misc register handling viafb: improve misc register handling This patch improves the misc register handling by adding a modify function for this to via_io.h and moving expanded definitions of the relevant ports there. The code was changed to use those to improve readability. Signed-off-by: Florian Tobias Schandinat commit 384c3041aeaf77d299b0d4a62481850fed86e53b Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:54 2010 +0000 viafb: replace inb/outb viafb: replace inb/outb This patch replaces occurences of inb/outb with via_write_reg and via_write_reg_mask where this is possible to improve code readability. Signed-off-by: Florian Tobias Schandinat commit 100e74a150d3a31d4c12658c926429ceb880d2f7 Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:53 2010 +0000 viafb: move some modesetting functions to a seperate file viafb: move some modesetting functions to a seperate file This patch moves the modesetting functions which are already cleaned up to a seperate file. Just the beginning to bring some structure in this mess. Signed-off-by: Florian Tobias Schandinat commit 2749413db17723cf894036c0eaf339f289bcc841 Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:52 2010 +0000 viafb: unify modesetting functions viafb: unify modesetting functions This patch unifies some cleaned up modesetting functions to prepare for moving them to an extra file. This includes make them use via_io and changing there names to reflect that they do not depend on anything framebuffer specific. Signed-off-by: Florian Tobias Schandinat commit c2b12cd496bbe5eff6a48bc669fe6b0c56f2b3d9 Author: Jonathan Corbet Date: Fri Apr 23 10:31:13 2010 -0600 viafb: Reserve framebuffer memory for the upcoming camera driver The camera engine captures to framebuffer memory, so we need to set some aside for that purpose. There is no proper memory allocator for fbmem; instead, accel.c just trims some space off the top. Alas, without creating that proper memory allocator, the only way to make this work is to hack it into the same bit of code in accel.c. The allocation must happen *after* the others (some code, including user-space XV stuff, makes assumptions on where the cursor space is), and before the rest of the framebuffer is set up. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 3d28eb42c52a799c806082e6d856f634ed1db902 Author: Jonathan Corbet Date: Fri Apr 23 10:04:12 2010 -0600 viafb: Add a simple VX855 DMA engine driver This code provides a minimal amount of access to the DMA engine as needed by the camera driver. VX855 only; it's guaranteed not to work on other chipsets, so it won't try. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 94dd1a856b23bd51dfebf68e6dd63cfd4d4fd5ae Author: Jonathan Corbet Date: Fri Apr 23 09:46:59 2010 -0600 viafb: Add a simple interrupt management infrastructure The viafb device shares a single interrupt control register among several distinct subunits. This adds a simple layer for management of that register. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 6b841edf572ad757f11013326b796e126f05a719 Author: Jonathan Corbet Date: Mon Dec 28 10:22:53 2009 -0700 via: Rationalize vt1636 detection The code was ugly and didn't check whether i2c operations were succeeding; make it a little better. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit b8f7e5d846387e3bcda35f3809856cf085740a24 Author: Jonathan Corbet Date: Fri Apr 23 08:56:55 2010 -0600 viafb: Introduce viafb_find_i2c_adapter() The camera driver will need this to look up a specific adapter. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit b052d7f81fdd352a5d89ef1ac37a2c77f219463b Author: Jonathan Corbet Date: Mon Dec 28 10:04:02 2009 -0700 via: Do not attempt I/O on inactive I2C adapters If an adapter has been configured for GPIO (or off), we should not try to use it as an I2C port. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 7582eb9be85f35271fd2569681a88a5b243e9380 Author: Jonathan Corbet Date: Thu Apr 22 17:39:34 2010 -0600 viafb: Turn GPIO and i2c into proper platform devices Another step toward making this thing a real multifunction device driver. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 75b035ace904761b8a340b524533a36e37313b29 Author: Jonathan Corbet Date: Thu Apr 22 14:36:04 2010 -0600 viafb: Convert GPIO and i2c to the new indexed port ops Also add low-level locking to the i2c driver. Signed-off-by: Jonathan Corbet commit c389874805a6849e3e347fc0e13fa170d80840c1 Author: Florian Tobias Schandinat Date: Sat Apr 17 19:44:51 2010 +0000 viafb: package often used basic io functions This patch puts redesigned versions of the basic io functions that are used overall the driver in an extra header. It is prefixed with via_ as no framebuffer dependend stuff is in there. They were inlined as they are really simple which reduced the module size about 2.5%. The parameter order of read and write was fixed as it really doesn't make sense to change the order as they are parts of the same address and not source and destination. Wrapper which use the new functions were added to hw.h to replicate the old interface and avoid changing all old code. [jc: added one comment] Signed-off-by: Florian Tobias Schandinat commit 7e0de022680f7899d33141f3ab5724a704f5669a Author: Jonathan Corbet Date: Tue Dec 1 20:39:57 2009 -0700 viafb: add a driver for GPIO lines This is a simple gpiolib driver giving access to the GPIO lines in the VIA framebuffer system. A simple mechanism exists for switching lines between GPIO and I2C, but it's only compile-time for now. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 24b4d82e4715841848a499534ed5cb7db3d6bca3 Author: Jonathan Corbet Date: Thu Apr 22 13:48:09 2010 -0600 viafb: Separate global and fb-specific data This patch moves data of interest into a new viafb_dev structure which describes the device as a whole; the idea here is to create a separation between what all devices may need and what the framebuffer device in particular needs. I've also made some small steps toward thinning out the global.h mess. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit f045f77bc0bf238a871b10bea9e425329a8e4abc Author: Jonathan Corbet Date: Tue Dec 1 20:29:39 2009 -0700 viafb: Move core stuff into via-core.c The first step toward turning viafb into a multifunction driver. This patch creates a new via-core.c file which serves as the main PCI driver; everything else comes below that. Some work has been done to rationalize the i2c drivers in this new scheme. Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Cc: Harald Welte Acked-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit 5d4cec2f2fdbb3d830fa014226d0d965df548bad Author: J. Bruce Fields Date: Sat May 1 12:56:06 2010 -0400 nfsd4: fix bare destroy_session null dereference It's legal to send a DESTROY_SESSION outside any session (as the only operation in a compound), in which case cstate->session will be NULL; check for that case. While we're at it, move these checks into a separate helper function. Signed-off-by: J. Bruce Fields commit 2b107d93635616db0c3f893c8cc2e6d5cd8d77b2 Author: Jacob Pan Date: Fri May 7 14:59:45 2010 -0700 x86: Avoid check hlt for newer cpus Check hlt instruction was targeted for some older CPUs. It is an expensive operation in that it takes 4 ticks to break out the check. We can avoid such check completely for newer x86 cpus (family >= 5). [ hpa: corrected family > 5 to family >= 5 ] Signed-off-by: Jacob Pan LKML-Reference: <1273269585-14346-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: H. Peter Anvin commit 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e Merge: 35c4493 1252fa3 Author: Russell King Date: Fri May 7 21:40:43 2010 +0100 Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable commit 35c44933ef10ff4e47c9b28a7e61e648edd38845 Merge: 941f81c a3be632 Author: Russell King Date: Fri May 7 21:39:35 2010 +0100 Merge branch 'gemini_fix' of git://git.berlios.de/gemini-board into devel-stable commit 1252fa3154fae1f9624ea40cbbf0ea5e21319013 Author: Daniel Walker Date: Fri May 7 12:09:52 2010 -0700 Revert "arm: msm: add oprofile pmu support" This reverts commit ee3c454b8da04815c1884ed85fe89d2d131c0e51. As request by Russell King. Signed-off-by: Daniel Walker commit 1affa091975e47d50ce6a88e9b1abfe717c2fe27 Author: Helmut Schaa Date: Fri May 7 11:03:08 2010 +0200 rt2x00: rt2800: use correct txop value in tx descriptor rt2800 devices use a different enumeration to specify what IFS values should be used on frame transmission compared to the other rt2x00 devices. Hence, create a new enum called txop that contains the valid values. Furthermore use the appropriate txop values as found in the ralink drivers: - TXOP_BACKOFF for management frames - TXOP_SIFS for subsequent fragments in a burst - TXOP_HTTXOP for all data frames Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit cbd1ea87a198669537591cef9ee834d6986c169b Author: Juuso Oikarinen Date: Fri May 7 11:39:02 2010 +0300 wl1271: Reduce PSM entry hang over period from 128 => 1 ms Currently, we configure a 128ms hang over period for the PSM entry (the firmware will remain active for 128ms after sending the null func for PSM and getting an ack for it.) This is a huge power consumption issue, and appears unnecessary. So, configure the value to 1 ms. Signed-off-by: Juuso Oikarinen Reviewed-by: Janne Ylalehto Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 0cbb1034396243173fa5acac715fcf416fa76644 Author: Teemu Paasikivi Date: Fri May 7 11:39:01 2010 +0300 wl1271: Increase timeout for command event waiting Incresed the timeout value for command complete event waiting from 100 ms to 750 ms. In some rare cases it can take about 600 ms before complete event for join command is received. This is most propably caused by the firmware being busy with scanning related activities. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 69e5434cd536c7eb4d5be0d0b7db06ed420c1315 Author: Juuso Oikarinen Date: Fri May 7 11:39:00 2010 +0300 wl1271: Fix to join and channel number handling This patch changes the way JOIN's are performed, and channel numbers updated. The reason for this is that the firmware JOIN command clears WPA(2) key material, and if done while associated to a WPA(2) secured AP, will render the data-path unusable. While the channel is not usually changed while associated (and currently we could not even support something like that), after performing a scan operation while associated, mac80211 will re-set the current channel to the driver. This caused our problem. Also, the mac80211 is assuming that the driver channel configuration remains persistent over periods of IDLE. Therefore remove channel resetting to zero from the unjoin function. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 554d7209c87a7b7ec70c14d9ed1c01e05f5dbc23 Author: Juuso Oikarinen Date: Fri May 7 11:38:59 2010 +0300 wl1271: Fix 32 bit register read related endiannes bug Reading single registers did not pay attention to data endianness. This patch fix that. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit d717fd6188b2ea63cf9dc0a870fd312c312841cd Author: Juuso Oikarinen Date: Fri May 7 11:38:58 2010 +0300 wl1271: Add sysfs file to retrieve HW PG-version and ROM-version This patch reads the HW PG version (along with a ROM-version, embedded in the same value) from the wl1271 hardware and publishes the value in a sysfs -file. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 2ff6575b1e497f88acf2c7de7e1ba015267b689d Author: Sujith Date: Fri May 7 13:37:57 2010 +0530 ath9k_htc: Handle IDLE LED properly Switch LED off/on when handling CONF_CHANGE_IDLE. Not doing this would leave the radio LED on even though the chip would be in full sleep mode. Signed-off-by: Sujith Signed-off-by: John W. Linville commit bc6fb35644ee46725f51ef27e901bd5d7e52c101 Author: Luis R. Rodriguez Date: Thu May 6 22:41:14 2010 -0400 ath9k_hw: Update initvals for AR9003 for xb113 Generated using the new shiny intivals-tool [1]: initvals -w -f ar9003 > ar9003_initvals.h The respective checksums are: 0x000000005a76829d ar9300_2p0_radio_postamble 0x000000009d90cb74 ar9300Modes_lowest_ob_db_tx_gain_table_2p0 0x00000000e0bc2c84 ar9300Modes_fast_clock_2p0 0x00000000852fca34 ar9300_2p0_radio_core 0x0000000000000000 ar9300Common_rx_gain_table_merlin_2p0 0x0000000078658fb5 ar9300_2p0_mac_postamble 0x0000000023235333 ar9300_2p0_soc_postamble 0x0000000054d41904 ar9200_merlin_2p0_radio_core 0x00000000618455d4 ar9300_2p0_baseband_postamble 0x000000009aa590a4 ar9300_2p0_baseband_core 0x000000004783d946 ar9300Modes_high_power_tx_gain_table_2p0 0x000000006681db44 ar9300Modes_high_ob_db_tx_gain_table_2p0 0x000000001f318700 ar9300Common_rx_gain_table_2p0 0x000000009990cb74 ar9300Modes_low_ob_db_tx_gain_table_2p0 0x00000000c9d66d40 ar9300_2p0_mac_core 0x0000000039139500 ar9300Common_wo_xlna_rx_gain_table_2p0 0x00000000a0c54980 ar9300_2p0_soc_preamble 0x00000000292e2544 ar9300PciePhy_pll_on_clkreq_disable_L1_2p0 0x000000002d3e2544 ar9300PciePhy_clkreq_enable_L1_2p0 0x00000000293e2544 ar9300PciePhy_clkreq_disable_L1_2p0 [1] http://wireless.kernel.org/en/users/Drivers/ath9k_hw/initvals-tool Cc: Tom Hammel Cc: Enis Akay Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 6f256de70b90aecbb550a2df387684ed2136b792 Author: Luis R. Rodriguez Date: Thu May 6 22:41:13 2010 -0400 ath9k_common: drop incomming frames with an invalid hardware rate ath9k_common (used by ath9k and ath9k_htc) trusts the frames blessed by hardware as OK are infact correct even if the rate seen by the driver is unrecognized. ath9k_common just treats these frames in mac80211 as frames as frames under 1 mbps rate. It seems this might not be the best thing to do as other parts of the frame might not be valid so just drop these frames for now. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 8e1559949928d4d8bfe044bfcf57879faff82e19 Author: Luis R. Rodriguez Date: Thu May 6 22:41:12 2010 -0400 ath9k_common: move the rate status setting into ath9k_process_rate() This has no real functional change, this just moves the setting the the mac80211 rate index into ath9k_process_rate(). This allows us to eventually make ath9k_process_rate() return a negative value in case we have detected a specific case rate situation which should have been ignored. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c809e86c11a64488acc85ddf12ece3c9b879ccb6 Author: John W. Linville Date: Thu May 6 16:49:40 2010 -0400 rtl8180: add software-based support for IBSS mode Device documentation suggests that hardware support for beaconing is available. But I implemented software-based beacon generation as an experiment and it seems better to have that working now rather than waiting for something better to materialize. Signed-off-by: John W. Linville commit 51e080deba57437459571f26a3c6f3db03324c4c Author: John W. Linville Date: Thu May 6 16:26:23 2010 -0400 rtl8180: assign sequence numbers in the driver This is a step towards support for beaconing modes of operation. Signed-off-by: John W. Linville commit a472e71b3c71619087d2485282955c3b62ebfde9 Author: John W. Linville Date: Thu May 6 14:45:17 2010 -0400 mac80211: set IEEE80211_TX_CTL_FIRST_FRAGMENT for beacons Also simplify the flags assignment into a single statement at the end of ieee80211_beacon_get_tim. Signed-off-by: John W. Linville commit 55f9321a024a2d03f71a23b74003792692ca1a38 Author: Ivo van Doorn Date: Thu May 6 14:45:46 2010 +0200 rt2x00: Fix RF3052 channel initialization Update channel initialization for the RF3052 chipset. According to the Ralink drivers, the rt3x array must be used for this chipset, rather then the rt2x array. Furthermore RF3052 supports the 5GHz band, extend the rt3x array with the 5GHz channels, and use them for the RF3052 chip. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 809bfe81ce225d1f5a111840c3d9e30704d98478 Author: Helmut Schaa Date: Thu May 6 12:29:44 2010 +0200 rt2x00: rt2800: don't overwrite SIFS values on erp changes The SIFS value is a constant and doesn't need to be updated on erp changes. Furthermore the code used 10us for both, the OFDM SIFS and CCK SIFS time which broke CTS protected 11g connections (see patch "rt2x00: rt2800: update initial SIFS values" for details). Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit a21c2ab4210a89a71a0a99685acf16ae126b2eee Author: Helmut Schaa Date: Thu May 6 12:29:04 2010 +0200 rt2x00: rt2800: update initial SIFS values Currently the CCK and OFDM SIFS value is set to 32us. This value is neither used by the Ralink driver nor specified in 802.11. Instead of using 10us for CCK SIFS (as defined in 802.11) use 16us like in the Ralink drivers. And indeed using a SIFS value of 10us breaks connectivity with 11g + CTS protected connections. Add a comment to the code why we don't use 10us for CCK SIFS value. The OFDM SIFS value is set to 16us (as defined in 802.11 and also used by the Ralink drivers). Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 9c6dda4e2dfea970a7105e3805f0195bc3079f2f Author: Sujith Date: Thu May 6 14:45:47 2010 +0530 ath9k_htc: Fix beaconing in IBSS mode The current way of managing beaconing in ad-hoc mode has a subtle race - the beacon obtained from mac80211 is freed in the SWBA handler rather than the TX completion routine. But transmission of beacons goes through the normal SKB queue maintained in hif_usb, leading to a situation where __skb_dequeue() in the TX completion handler goes kaput. Fix this by simply getting a beacon from mac80211 for every SWBA and free it in its completion routine. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0aaffa9b9699894aab3266195a529baf9f96ac29 Author: Johannes Berg Date: Wed May 5 15:28:27 2010 +0200 mac80211: improve HT channel handling Currently, when one interface switches HT mode, all others will follow along. This is clearly undesirable, since the new one might switch to no-HT while another one is operating in HT. Address this issue by keeping track of the HT mode per interface, and allowing only changes that are compatible, i.e. switching into HT40+ is not possible when another interface is in HT40-, in that case the second one needs to fall back to HT20. Also, to allow drivers to know what's going on, store the per-interface HT mode (channel type) in the virtual interface's bss_conf. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f444de05d20e27cdd960c13fcbcfca3099f03143 Author: Johannes Berg Date: Wed May 5 15:25:02 2010 +0200 cfg80211/mac80211: better channel handling Currently (all tested with hwsim) you can do stupid things like setting up an AP on a certain channel, then adding another virtual interface and making that associate on another channel -- this will make the beaconing to move channel but obviously without the necessary IEs data update. In order to improve this situation, first make the configuration APIs (cfg80211 and nl80211) aware of multi-channel operation -- we'll eventually need that in the future anyway. There's one userland API change and one API addition. The API change is that now SET_WIPHY must be called with virtual interface index rather than only wiphy index in order to take effect for that interface -- luckily all current users (hostapd) do that. For monitor interfaces, the old setting is preserved, but monitors are always slaved to other devices anyway so no guarantees. The second userland API change is the introduction of a per virtual interface SET_CHANNEL command, that hostapd should use going forward to make it easier to understand what's going on (it can automatically detect a kernel with this command). Other than mac80211, no existing cfg80211 drivers are affected by this change because they only allow a single virtual interface. mac80211, however, now needs to be aware that the channel settings are per interface now, and needs to disallow (for now) real multi-channel operation, which is another important part of this patch. One of the immediate benefits is that you can now start hostapd to operate on a hardware that already has a connection on another virtual interface, as long as you specify the same channel. Note that two things are left unhandled (this is an improvement -- not a complete fix): * different HT/no-HT modes currently you could start an HT AP and then connect to a non-HT network on the same channel which would configure the hardware for no HT; that can be fixed fairly easily * CSA An AP we're connected to on a virtual interface might indicate switching channels, and in that case we would follow it, regardless of how many other interfaces are operating; this requires more effort to fix but is pretty rare after all Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit ac8dd506e40ee2c7fcc61654a44c32555a0a8d6c Author: Johannes Berg Date: Wed May 5 09:44:02 2010 +0200 mac80211: fix BSS info reconfiguration When reconfiguring an interface due to a previous hardware restart, mac80211 will currently include the new IBSS flag on non-IBSS interfaces which may confuse drivers. Instead of doing the ~0 trick, simply spell out which things are going to be reconfigured. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit bac6fafd4d6a0af26aeb37277a39607f7ce0be77 Author: David Kilroy Date: Tue May 4 22:54:41 2010 +0100 orinoco: refactor xmit path ... so orinoco_usb can share some common functionality. Handle 802.2 encapsulation and MIC calculation in that function. The 802.3 header is prepended to the SKB. The calculated MIC is written to a specified buffer. Also modify the transmit control word that will be passed onto the hardware to specify whether the MIC is present, and the key used. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 3ef83d745bf5220bef3a0fd11b96eb9ac64c8e8e Author: Felix Fietkau Date: Tue May 4 09:58:57 2010 +0200 ath9k: fix another source of corrupt frames Atheros hardware supports receiving frames that span multiple descriptors and buffers. In this case, the rx status of every descriptor except for the last one is invalid and may contain random data. Because the driver does not support this, it needs to drop such frames. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f3926b49b7122f66f8f2a1da4ae3275b112ab3e7 Author: Christian Lamparter Date: Sat May 1 18:18:18 2010 +0200 ar9170usb: remove deprecated aggregation code This patch removes the incomplete AMPDU implementation in ar9170usb. The code in question is: * too big and complex (more than 550 SLOC.) This is enough to qualify for a new separate code file! * unbalanced quantity & quality over-engineered areas like: * xmit scheduling and queuing frames for multiple HT peers * redundant frame sorting are confronted by gaping holes: * accurate transmission feedback * firmware error-handling and device reset * HT rate control algorithm * error-prone Since its inclusion, hardly anything was done to fix any of the outlined flaws from the initial commit message. => This also indicates poor maintainability. * relies heavily on several spinlocks. As a result of this shortcomings, the code is slow and does not even support the most basic 11n requirement: HT station mode. Therefore, I request to purge my heap of **** from the kernel: "ar9170: implement transmit aggregation". The next item on the agenda is: (re-)start from scratch with an adequate design to accommodate the special requirements and features of the available frameworks and tools. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 6f485b41875dbf5160c1990322469c1f65f77b28 Author: Joern Engel Date: Fri May 7 19:38:40 2010 +0200 logfs: handle powerfail on NAND flash The write buffer may not have been written and may no longer be written due to an interrupted write in the affected page. Signed-off-by: Joern Engel commit 1cf4a0632c24ea61162ed819bde358bc94c55510 Author: Arnaldo Carvalho de Melo Date: Fri May 7 14:07:05 2010 -0300 perf list: Improve the raw hw event descriptor documentation It was x86 specific and imcomplete at that, improve the situation by making it clear where the example provided applies and by adding the URLs for the Intel and AMD manuals where this is discussed in depth. Acked-by: Robert Richter Cc: Cyrill Gorcunov Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi Cc: Robert Richter Reported-by: Robert Richter Signed-off-by: Arnaldo Carvalho de Melo commit d0bbc24d2ab78d9efc61bc80cfc85f59626ba5af Author: Jassi Brar Date: Tue Apr 27 15:57:17 2010 +0900 ASoC: SMDK64XX: Switch to IISv4 CPU driver Switch the MACHINE driver to use IISv4 CPU dai. Remove BROKEN dependency now that we have proper CPU driver available. Also, disable build for SMDK6400, since the S3C6400 doesn't have IISv4 controller. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown commit af56b1c27b909e06318d26416d7b21fe6483224a Author: Jassi Brar Date: Tue Apr 27 15:57:11 2010 +0900 ASoC: S3C64XX: IISv4: Add CPU driver Add the CPU driver for the IISv4 block found on S3C6410. For now, the driver is almost a copy of s3c64xx-i2s.c but it should diverge as more IISv4 specific stuff is added. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit bd843edf81dc1200f71b61d4804af0e2918e8ae3 Author: Peter Ujfalusi Date: Fri May 7 14:24:11 2010 +0300 ASoC: tpa6130a2: Fix for the custom kcontrol functions Since the functions arre only used for volume register, change their name, and also fix them to properly handle the cases, when via soc core the volume is limited. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 826e962c4689172e25acde72eafebc063253b69d Author: Peter Ujfalusi Date: Fri May 7 14:24:10 2010 +0300 Revert "ASoC: tpa6130a2: Support for limiting gain" This reverts commit 6f3991152f20933b77eff30413e893bf1a15e578. Since core has now support for limiting the volume on controls this patch is not needed. Furthermore, this patch actually prevents the core to set new volume on the TPA. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 637d3847ba0ca2c7780e6521cbe75568d19ff0db Author: Peter Ujfalusi Date: Fri May 7 14:05:49 2010 +0300 ASoC: core: Support for limiting the volume Add support for the core to limit the maximum volume on an existing control. The function will modify the soc_mixer_control.max value of the given control. The new value must be lower than the original one (chip maximum) If there is a need for limiting a gain on a given control, than machine drivers can do the following in their snd_soc_dai_link.init function: snd_soc_limit_volume(codec, "TPA6140A2 Headphone Playback Volume", 21); This will modify the original 31 (chip maximum) to 21, so user space will not be able to set the gain higher than this. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 305787649826d6c84a6f9f71bc3318460610aba4 Merge: c480617 aeb29a8 Author: Mark Brown Date: Fri May 7 16:38:26 2010 +0100 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35 commit c4806174c516d26bf4a72db1789cfc96e4950d07 Author: Jassi Brar Date: Fri May 7 10:21:39 2010 +0900 ARM: S3C2412: DMA: Remove I2S FIFO address The S3C DMA API doesn't make use of hw_addr.to/from and also the FIFO addresses are provided from the I2S drivers. So these fields are redundant. This patch removes the hw_addr.to/from fields for I2S and the inclusion of header, paving way for the header to be moved closer to the I2S controller drivers. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Signed-off-by: Mark Brown commit ccf31c10f125ab5233c8517f91d4b3bd0bd60936 Author: Dan Carpenter Date: Fri May 7 10:59:06 2010 +0200 logfs: handle errors from get_mtd_device() The get_mtd_device() function returns error pointers on failure and if we don't handle it, it leads to a crash. Signed-off-by: Dan Carpenter Signed-off-by: Joern Engel commit 58e323cf5e4ed621a6e88263aca40c3d9c3d9bfd Author: Joern Engel Date: Fri May 7 14:15:04 2010 +0200 logfs: remove unused variable Signed-off-by: Joern Engel commit e0e33280fedcfa9dd70a54085c4d44d9d53b788f Author: David S. Miller Date: Fri May 7 02:55:33 2010 -0700 Revert "microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides." This reverts commit 39e0786d3cf39c6d2f47b4818ae2da8b8ebc9ce2. On request from microblaze developers, they are going to handle this differently. Signed-off-by: David S. Miller commit 4d1c52b02d977d884abb21d0bbaba6b5d6bc8374 Author: Lin Ming Date: Fri Apr 23 13:56:12 2010 +0800 perf, x86: implement group scheduling transactional APIs Convert to the transactional PMU API and remove the duplication of group_sched_in(). Reviewed-by: Stephane Eranian Signed-off-by: Lin Ming Signed-off-by: Peter Zijlstra Cc: David Miller Cc: Paul Mackerras LKML-Reference: <1272002172.5707.61.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit 6bde9b6ce0127e2a56228a2071536d422be31336 Author: Lin Ming Date: Fri Apr 23 13:56:00 2010 +0800 perf: Add group scheduling transactional APIs Add group scheduling transactional APIs to struct pmu. These APIs will be implemented in arch code, based on Peter's idea as below. > the idea behind hw_perf_group_sched_in() is to not perform > schedulability tests on each event in the group, but to add the group > as a whole and then perform one test. > > Of course, when that test fails, you'll have to roll-back the whole > group again. > > So start_txn (or a better name) would simply toggle a flag in the pmu > implementation that will make pmu::enable() not perform the > schedulablilty test. > > Then commit_txn() will perform the schedulability test (so note the > method has to have a !void return value. > > This will allow us to use the regular > kernel/perf_event.c::group_sched_in() and all the rollback code. > Currently each hw_perf_group_sched_in() implementation duplicates all > the rolllback code (with various bugs). ->start_txn: Start group events scheduling transaction, set a flag to make pmu::enable() not perform the schedulability test, it will be performed at commit time. ->commit_txn: Commit group events scheduling transaction, perform the group schedulability as a whole ->cancel_txn: Stop group events scheduling transaction, clear the flag so pmu::enable() will perform the schedulability test. Reviewed-by: Stephane Eranian Reviewed-by: Frederic Weisbecker Signed-off-by: Lin Ming Cc: David Miller Cc: Paul Mackerras Signed-off-by: Peter Zijlstra LKML-Reference: <1272002160.5707.60.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit ab608344bcbde4f55ec4cd911b686b0ce3eae076 Author: Peter Zijlstra Date: Thu Apr 8 23:03:20 2010 +0200 perf, x86: Improve the PEBS ABI Rename perf_event_attr::precise to perf_event_attr::precise_ip and widen it to 2 bits. This new field describes the required precision of the PERF_SAMPLE_IP field: 0 - SAMPLE_IP can have arbitrary skid 1 - SAMPLE_IP must have constant skid 2 - SAMPLE_IP requested to have 0 skid 3 - SAMPLE_IP must have 0 skid And modify the Intel PEBS code accordingly. The PEBS implementation now supports up to precise_ip == 2, where we perform the IP fixup. Also s/PERF_RECORD_MISC_EXACT/&_IP/ to clarify its meaning, this bit should be set for each PERF_SAMPLE_IP field known to match the actual instruction triggering the event. This new scheme allows for a PEBS mode that uses the buffer for more than a single event. Signed-off-by: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit 2b0b5c6fe9b383f3cf35a0a6371c9d577bd523ff Author: Peter Zijlstra Date: Thu Apr 8 23:03:20 2010 +0200 perf, x86: Consolidate some code repetition Remove some duplicated logic. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 1e9a6d8d44cb6dcd2799b36ceb23007e6a423bfe Author: Peter Zijlstra Date: Tue May 4 16:30:21 2010 +0200 perf, x86: Remove PEBS SAMPLE_RAW support Its broken, we really should get PERF_SAMPLE_REGS sorted. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit a1f2b70a942b8d858a0ab02567da3999b60a99b2 Author: Robert Richter Date: Tue Apr 13 22:23:15 2010 +0200 perf, x86: Use weight instead of cmask in for_each_event_constraint() There may exist constraints with a cmask set to zero. In this case for_each_event_constraint() will not work properly. Now weight is used instead of the cmask for loop exit detection. Weight is always a value other than zero since the default contains the HWEIGHT from the counter mask and in other cases a value of zero does not fit too. This is in preparation of ibs event constraints that wont have a cmask. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1271190201-25705-7-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 31fa58af57c41d2912debf62d47d5811062411f1 Author: Robert Richter Date: Tue Apr 13 22:23:14 2010 +0200 perf, x86: Pass enable bit mask to __x86_pmu_enable_event() To reuse this function for events with different enable bit masks, this mask is part of the function's argument list now. The function will be used later to control ibs events too. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1271190201-25705-6-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 9d0fcba67e47ff398a6fa86476d4884d472dc98a Author: Robert Richter Date: Tue Apr 13 22:23:12 2010 +0200 perf, x86: Call x86_setup_perfctr() from .hw_config() The perfctr setup calls are in the corresponding .hw_config() functions now. This makes it possible to introduce config functions for other pmu events that are not perfctr specific. Also, all of a sudden the code looks much nicer. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1271190201-25705-4-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit c1726f343b3bfc2ee037e191907c632a31903021 Author: Robert Richter Date: Tue Apr 13 22:23:11 2010 +0200 perf, x86: Move x86_setup_perfctr() Move x86_setup_perfctr(), no other changes made. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1271190201-25705-3-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 4261e0e0efd9e04b6c69e0773c3cf4d6f337c416 Author: Robert Richter Date: Tue Apr 13 22:23:10 2010 +0200 perf, x86: Move perfctr init code to x86_setup_perfctr() Split __hw_perf_event_init() to configure pmu events other than perfctrs. Perfctr code is moved to a separate function x86_setup_perfctr(). This and the following patches refactor the code. Split in multiple patches for better review. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1271190201-25705-2-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit a0507c84bf47dfd204299774f45fd16da33f0619 Author: Peter Zijlstra Date: Thu May 6 15:42:53 2010 +0200 perf: Annotate perf_event_read_group() vs perf_event_release_kernel() Stephane reported a lockdep warning while using PERF_FORMAT_GROUP. The issue is that perf_event_read_group() takes faults while holding the ctx->mutex, while perf_event_release_kernel() can be called from munmap(). Which makes for an AB-BA deadlock. Except we can never establish the deadlock because we'll only ever call perf_event_release_kernel() after all file descriptors are dead so there is no concurrency possible. Reported-by: Stephane Eranian Cc: Paul Mackerras Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit cce913178118b0b36742eb7544c2b38a0c957ee7 Merge: d9f599e 4fd38e4 Author: Ingo Molnar Date: Fri May 7 11:30:29 2010 +0200 Merge branch 'perf/urgent' into perf/core Merge reason: Resolve patch dependency Signed-off-by: Ingo Molnar commit 4fd38e4595e2f6c9d27732c042a0e16b2753049c Author: Peter Zijlstra Date: Thu May 6 17:31:38 2010 +0200 perf: Fix exit() vs PERF_FORMAT_GROUP Both Stephane and Corey reported that PERF_FORMAT_GROUP didn't work as expected if the task the counters were attached to quit before the read() call. The cause is that we unconditionally destroy the grouping when we remove counters from their context. Fix this by only doing this when we free the counter itself. Reported-by: Corey Ashford Reported-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1273160566.5605.404.camel@twins> Signed-off-by: Ingo Molnar commit 27a9da6538ee18046d7bff8e36a9f783542c54c3 Author: Peter Zijlstra Date: Tue May 4 20:36:56 2010 +0200 sched: Remove rq argument to the tracepoints struct rq isn't visible outside of sched.o so its near useless to expose the pointer, also there are no users of it, so remove it. Acked-by: Steven Rostedt Signed-off-by: Peter Zijlstra LKML-Reference: <1272997616.1642.207.camel@laptop> Signed-off-by: Ingo Molnar commit 48652ced1533c3372f996a0d83b6e73b1f1c9381 Merge: 99bd5e2 66f41d4 Author: Ingo Molnar Date: Fri May 7 11:27:54 2010 +0200 Merge commit 'v2.6.34-rc6' into sched/core commit 4726f2a617ebd868a4fdeb5679613b897e5f1676 Author: Yong Zhang Date: Tue May 4 14:16:48 2010 +0800 lockdep: Reduce stack_trace usage When calling check_prevs_add(), if all validations passed add_lock_to_list() will add new lock to dependency tree and alloc stack_trace for each list_entry. But at this time, we are always on the same stack, so stack_trace for each list_entry has the same value. This is redundant and eats up lots of memory which could lead to warning on low MAX_STACK_TRACE_ENTRIES. Use one copy of stack_trace instead. V2: As suggested by Peter Zijlstra, move save_trace() from check_prevs_add() to check_prev_add(). Add tracking for trylock dependence which is also redundant. Signed-off-by: Yong Zhang Cc: David S. Miller Signed-off-by: Peter Zijlstra LKML-Reference: <20100504065711.GC10784@windriver.com> Signed-off-by: Ingo Molnar commit 7aed3b34fb0a98e89d0e999f5833ceebdb3876b9 Author: Paul Mundt Date: Fri May 7 17:58:55 2010 +0900 sh: shuffle the elfcorehdr handling over to the crash dump code. The elfcorehdr parsing was just tossed in setup.c, but nothing outside of the crash dump code/vmcore bits require it, so we just move it out of the way, as per ppc. Signed-off-by: Paul Mundt commit aa424bbb8cf5f7f3c6a70065bcb28a6e6af7897d Author: Paul Mundt Date: Fri May 7 17:14:00 2010 +0900 sh: Ensure that X2 TLB settings are reflected in vmcore. This rolls in the X2TLB config settings for vmcore. Signed-off-by: Paul Mundt commit d523e1ae6addd4f18a609da39f23719eaecfedf0 Author: Paul Mundt Date: Fri May 7 16:39:09 2010 +0900 sh: flag kdump as broken on SMP for now. There's still quite a bit of shootdown logic that needs to be hacked up to support SMP for kdump properly, so just add in a BROKEN_ON_SMP dependency for now. Signed-off-by: Paul Mundt commit 080e71e13d99d850875c0335c364766162eae7c6 Author: Paul Mundt Date: Fri May 7 15:10:42 2010 +0900 sh: bump up extra LMB reservations in bootmem init. This bumps up the extra LMB reservations in ordering so that they're accounted for prior to iterating over the region list. This ensures that reservations are visible both within the LMB and bootmem context. Signed-off-by: Paul Mundt commit 36fa06d6b5ef1874d012c04b23d5b8982b1f8dea Author: Paul Mundt Date: Fri May 7 15:10:07 2010 +0900 sh: convert initrd reservation to LMB. This switches over from bootmem -> LMB for the initrd area reservation. Signed-off-by: Paul Mundt commit a5ec39507129a086d8838228ac1ca0a2eab38f91 Author: Paul Mundt Date: Fri May 7 14:54:55 2010 +0900 sh: convert kexec crash kernel management to LMB. This migrates the crash kernel handling off of bootmem and over to LMB. Signed-off-by: Paul Mundt commit fc390cde362309f6892bb719194f242c466a978b Author: Paul E. McKenney Date: Thu May 6 11:42:52 2010 -0700 rcu: need barrier() in UP synchronize_sched_expedited() If synchronize_sched_expedited() is ever to be called from within kernel/sched.c in a !SMP PREEMPT kernel, the !SMP implementation needs a barrier(). Signed-off-by: Paul E. McKenney Signed-off-by: Tejun Heo commit a33fa66bcf365ffe5b79d1ae1d3582cc261ae56e Author: Michael Chan Date: Thu May 6 08:58:13 2010 +0000 bnx2: Add prefetches to rx path. Add prefetches of the skb and the next rx descriptor to speed up rx path. Use prefetchw() for the skb [suggested by Eric Dumazet]. The rx descriptor is in skb->data which is mapped for streaming mode DMA. Eric Dumazet pointed out that we should not prefetch the data before dma_sync. So we prefetch only if dma_sync is no_op on the system. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c67938a9e071fa51c91ed17a14382e128368d115 Author: Michael Chan Date: Thu May 6 08:58:12 2010 +0000 bnx2: Add GRO support. And turn on NETIF_F_GRO by default [requested by DaveM]. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 5eceff736644ee45b528ed8261facaf217ba134e Author: Tobias Klauser Date: Thu May 6 05:43:04 2010 +0000 tehuti: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit e56d0b01ed1f6298839ddd4007d5ae72cfe30ca2 Author: Tobias Klauser Date: Thu May 6 05:41:44 2010 +0000 sunhme: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 627ad5951b5f26585ed11ac3afb2aa4a872aec23 Author: Tobias Klauser Date: Thu May 6 05:41:31 2010 +0000 smc9194: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 8462d14e471fc5761e37d1b89282966a5b504468 Author: Tobias Klauser Date: Thu May 6 05:41:12 2010 +0000 ethoc: Remove unnecessary memset of napi member in netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set the napi member it to 0 explicitely. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 079ceb44e9b3432fb8e8f7d08207faae69407c89 Author: Tobias Klauser Date: Thu May 6 05:40:58 2010 +0000 bcm63xx_enet: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 2039623a0b0c6eb3da2b4524d75b0cf0ccadf976 Author: Tobias Klauser Date: Thu May 6 05:40:29 2010 +0000 KS8695: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 468003f571b73588482ba058194e73d0689b94e6 Author: Tobias Klauser Date: Thu May 6 05:39:46 2010 +0000 3c523: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 91991146bc2bbc07a0f6b5252ff991bd0e91fb7d Author: Tobias Klauser Date: Thu May 6 05:39:11 2010 +0000 3c507: Remove unnecessary memset of netdev private data The memory for the private data is allocated using kzalloc in alloc_etherdev (or alloc_netdev_mq respectively) so there is no need to set it to 0 again. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit eecfd7c4e36ff532d895885971d01d049bd3e014 Author: Eric Dumazet Date: Thu May 6 22:07:48 2010 -0700 rps: Various optimizations Introduce ____napi_schedule() helper for callers in irq disabled contexts. rps_trigger_softirq() becomes a leaf function. Use container_of() in process_backlog() instead of accessing per_cpu address. Use a custom inlined version of __napi_complete() in process_backlog() to avoid one locked instruction : only current cpu owns and manipulates this napi, and NAPI_STATE_SCHED is the only possible flag set on backlog. we can use a plain write instead of clear_bit(), and we dont need an smp_mb() memory barrier, since RPS is on, backlog is protected by a spinlock. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 39e0786d3cf39c6d2f47b4818ae2da8b8ebc9ce2 Author: David S. Miller Date: Thu May 6 22:01:53 2010 -0700 microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides. NET_IP_ALIGN defaults to 2, no need to override. NET_SKB_PAD is now 64, which is much larger than microblaze's L1_CACHE_SIZE so no need to override that either. Signed-off-by: David S. Miller commit 18e8c134f4e984e6639e62846345192816f06d5c Author: Eric Dumazet Date: Thu May 6 21:58:51 2010 -0700 net: Increase NET_SKB_PAD to 64 bytes eth_type_trans() & get_rps_cpus() currently need two 64bytes cache lines in packet to compute rxhash. Increasing NET_SKB_PAD from 32 to 64 reduces the need to one cache line only, and makes RPS faster. NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d6bc0149d8f2300bffa03ea6fea3ca39744277a6 Author: Bjørn Mork Date: Thu May 6 03:44:35 2010 +0000 ipv6: udp: make short packet logging consistent with ipv4 Adding addresses and ports to the short packet log message, like ipv4/udp.c does it, makes these messages a lot more useful: [ 822.182450] UDPv6: short packet: From [2001:db8:ffb4:3::1]:47839 23715/178 to [2001:db8:ffb4:3:5054:ff:feff:200]:1234 This requires us to drop logging in case pskb_may_pull() fails, which also is consistent with ipv4/udp.c Signed-off-by: Bjørn Mork Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit a2a47c6c3d1a7c01da4464b3b7be93b924f874c1 Author: Ky Srinivasan Date: Thu May 6 12:08:41 2010 -0700 x86: Detect running on a Microsoft HyperV system This patch integrates HyperV detection within the framework currently used by VmWare. With this patch, we can avoid having to replicate the HyperV detection code in each of the Microsoft HyperV drivers. Reworked and tweaked by Greg K-H to build properly. Signed-off-by: K. Y. Srinivasan LKML-Reference: <20100506190841.GA1605@kroah.com> Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Vadim Rozenfeld Cc: Avi Kivity Cc: Gleb Natapov Cc: Frederic Weisbecker Cc: Alexey Dobriyan Cc: "K.Prasad" Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Paul Mackerras Cc: Alan Cox Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman Signed-off-by: H. Peter Anvin commit 0c3767b161a91eab5b23d602d374b9c070c067a9 Author: Ben Dooks Date: Fri May 7 10:01:28 2010 +0900 ARM: n30: Just call s3c24xx_init_irq() directly from machine definition The n30_init_irq() call is simply a call to s3c24xx_init_irq, so just remove it and update the machine definitions to call the IRQ initialision call directly. Signed-off-by: Ben Dooks commit 8a19ebb0938752af8da142c4731f310bb8f9d130 Author: Ben Dooks Date: Fri May 7 09:59:11 2010 +0900 ARM: n30: Fixup gpiolib calls for mmc power Move to using gpio_request() and gpio_set_value() for the MMC power control calls. Signed-off-by: Ben Dooks commit 271d323237a1ab96b74c69fa48a8612963245266 Author: Pinkava J Date: Thu May 6 15:23:24 2010 +0200 ARM: n30: Add support for power on/off on Acer n30 / Acer n35 MMC card reader Signed-off-by: Jiri Pinkava Signed-off-by: Ben Dooks commit 50cdba782c3de35bf6d454096213c986146f46a5 Author: Pinkava J Date: Thu May 6 15:22:28 2010 +0200 ARM: n30: Add support for MMC card reader on Acer n30 / Acer n35 Signed-off-by: Jiri Pinkava Signed-off-by: Ben Dooks commit aeb1b7e49f97e96e8b63c76c22f6fe6186a46ff3 Author: Pinkava J Date: Thu May 6 15:21:50 2010 +0200 ARM: n35: Enable wake-up by Power button on Acer n35 Signed-off-by: Jiri Pinkava Signed-off-by: Ben Dooks commit 319887ee800f889e4c81d73f0ee4bcf532f9c34d Author: Pinkava J Date: Thu May 6 15:21:16 2010 +0200 ARM: n35: Add support for LEDs on Acer n35 Signed-off-by: Jiri Pinkava Signed-off-by: Ben Dooks commit 8ecad34918174580b069f7d4dcef3f46a099e8f7 Author: Pinkava J Date: Thu May 6 15:20:36 2010 +0200 ARM: n30: Add RTC platform device for Acer n30 / Acer n35 Signed-off-by: Jiri Pinkava Signed-off-by: Ben Dooks commit be7c4cf632f47d798ad6a27da15de0195ddf6f30 Author: Pinkava J Date: Thu May 6 15:19:19 2010 +0200 ARM: n30: fix: suspended wrong USB port on Acer n35 There is bug in USB setup code for Acer n35 (it is related directly to s3c2410, see doc). We want suspend host port (is not connected) but device port should be active. Signed-off-by: Jiri Pinkava Signed-off-by: Ben Dooks commit ff3c25fa1b7f0a3c7b112c25af6d259cb8c59bc1 Author: Pinkava J Date: Thu May 6 15:18:06 2010 +0200 ARM: n30: Enable Acer n35 if Acer n30 is selected All code already present for Acer n35 is useless unless MACH_N35 is defined. Signed-off-by: Jiri Pinkava [ben-linux@fluff.org: minor edit of subject] Signed-off-by: Ben Dooks commit d9f599e1e6d019968b35d2dc63074b9e8964fa69 Author: Dan Carpenter Date: Sat Mar 20 17:39:11 2010 +0300 perf: Fix check at end of event search The original code doesn't work because "call" is never NULL there. Signed-off-by: Dan Carpenter LKML-Reference: <20100320143911.GF5331@bicker> Signed-off-by: Steven Rostedt commit 83c36ccfe4d849f482ea0a62402c7624f4e59f0e Author: James Morris Date: Fri May 7 09:20:03 2010 +1000 Revert "ima: remove ACPI dependency" This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae. Previous revert was a prereq. Signed-off-by: James Morris commit ec4a162af388a2716c5314c4aff7029071d09f57 Author: James Morris Date: Fri May 7 09:19:29 2010 +1000 Revert "TPM: ACPI/PNP dependency removal" This reverts commit b89e66e1e396f7b5436af154e58209320cc08aed. > > When CONFIG_PM is not set: > > > > drivers/built-in.o: In function `acpi_init': > > bus.c:(.init.text+0x2d84): undefined reference to `pm_flags' > > bus.c:(.init.text+0x2d91): undefined reference to `pm_flags' > > CONFIG_ACPI depends on CONFIG_PM, > so acpi/bus.c should not be compiled for CONFIG_PM=n > > Hmm, is is somebody doing something strange, like "select ACPI" > without guaranteeing that all of ACPI's dependencies are satisfied? Signed-off-by: James Morris commit 243bc65447a74fbc674fc7fab6f212cce62e0152 Author: Sekhar Nori Date: Tue May 4 14:11:36 2010 +0530 davinci: edma: fix coding style issue related to usage of braces In the edma driver, there are couple of instances where braces are used for a single statement 'if' construct. There are other instances where 'else' part of the if-else construct does not use braces even if the 'if' part is a multi-line statement. This patch fixes both. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 3f68b98a75381f785f4e13085296c52c75ea29ac Author: Sekhar Nori Date: Tue May 4 14:11:35 2010 +0530 davinci: edma: use a more intuitive name for edma_info 'edma_info' structure inside the edma driver represents a single instance of edma channel controller. Call it 'edma_cc' instead. This also avoids readers confusing it with an instance of edma_soc_info structre which carries the platform data for a single channel controller instance. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit e2800007f3b9aab51c1fe866034db576d3a9fd83 Author: Cyril Chemparathy Date: Sun May 2 14:28:14 2010 -0400 Davinci: serial - conditional reset via pwremu With this patch, AR7 type uart ports are not reset via pwremu registers. This allows davinci_serial_init() reuse on tnetv107x soc. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 9ee1acefa86083c6acf4112983b88a0057eb7785 Author: Cyril Chemparathy Date: Sun May 2 14:28:13 2010 -0400 Davinci: serial - use ioremap() This patch implements davinci serial cleanups towards having this code reusable on tnetv107x. The change reuses the platform data membase field to hold the remapped space. By disabling the UPF_IOREMAP flag in the platform data, we prevent the 8250 driver from repeating the ioremap. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit da0122ca8b7804b9cd8fa7eff466bafba27f09a3 Author: Cyril Chemparathy Date: Sun May 2 14:28:12 2010 -0400 Davinci: serial - remove unnecessary define The uart pdata array is already terminated by a zero flag field. This patch reuses this terminator and eliminates DAVINCI_MAX_NR_UARTS definition. This way, future platforms can have different number of uarts initialized via davinci_serial_init(). Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit c78a5bc2e77e8fc5be29cda5b28c9b9afd0f4b6d Author: Cyril Chemparathy Date: Sat May 1 18:38:28 2010 -0400 Davinci: watchdog reset separation across socs The earlier watchdog reset mechanism had a couple of limitations. First, it embedded a reference to "davinci_wdt_device" inside common code. This forced all derived platforms (da8xx and tnetv107x) to define such a device. This also would have caused problems in including multiple socs in a single build due to symbol redefinition. With this patch, davinci_watchdog_reset() now takes the platform device as an argument. The davinci_soc_info struct has been extended to include a reset function and a watchdog platform_device. arch_reset() then uses these elements to reset the system in a SoC specific fashion. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 5b3a05ca911688c53680f2b020a1512b9da29c89 Author: Cyril Chemparathy Date: Sat May 1 18:38:27 2010 -0400 Davinci: eliminate pinmux offset verbosity Pinmux registers are sequential, and do not need to be enumerated out as they currently are. This reduces code volume and keeps things simple. If some future SoC comes up with a discontiguous register map, PINMUX() can then be expanded with local token pasting. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit b27b6d03f245e5eaf6473da58a2612077fb7cfe7 Author: Cyril Chemparathy Date: Sat May 1 18:37:55 2010 -0400 Davinci: gpio - fine grained locking This patch eliminates the global gpio_lock, and implements a per-controller lock instead. This also switches to irqsave/irqrestore locks in case gpios are manipulated in isr. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 686b634a07451fc4fe3b712fe211bfa861a53241 Author: Cyril Chemparathy Date: Sat May 1 18:37:54 2010 -0400 Davinci: gpio - controller type support This patch allows for gpio controllers that deviate from those found on traditional davinci socs. davinci_soc_info has an added field to indicate the soc-specific gpio controller type. The gpio initialization code then bails out if necessary. More elements (tnetv107x) to be added later into enum davinci_gpio_type. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit c12f415a9144a76dc99df34f56ce3022207ad1d0 Author: Cyril Chemparathy Date: Sat May 1 18:37:53 2010 -0400 Davinci: gpio - register layout invariant inlines This patch renders the inlined gpio accessors in gpio.h independent of the underlying controller's register layout. This is done by including three new fields in davinci_gpio_controller to hold the addresses of the set, clear, and in data registers. Other changes: 1. davinci_gpio_regs structure definition moved to gpio.c. This structure is no longer common across all davinci socs (davinci_gpio_controller is). 2. controller base address calculation code (gpio2controller()) moved to gpio.c as this was no longer necessary for the inline implementation. 3. modified inline range checks to use davinci_soc_info.gpio_num instead of DAVINCI_N_GPIO. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 99e9e52de635728d7c89a0fdf79b307f3082cf3a Author: Cyril Chemparathy Date: Sat May 1 18:37:52 2010 -0400 Davinci: gpio - structs and functions renamed Renamed gpio types to something more sensible: struct gpio_controller --> struct davinci_gpio_regs struct davinci_gpio --> struct davinci_gpio_controller gpio2controller() --> gpio2regs() irq2controller() --> irq2regs() This change also moves davinci_gpio_controller definition to gpio.h. Eventually, the gpio registers structure will be moved to gpio.c and no longer a common cross-soc definition. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit ba4a984e838dfb1c46135ff8cadeea5f8ca5fd0a Author: Cyril Chemparathy Date: Sat May 1 18:37:51 2010 -0400 Davinci: gpio - minor cleanup macroized repeated container_of()s to improve readability. unified direction in/out functions. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit 7a9978a1e2225507025a8b90b4289d506a416bd9 Author: Sergei Shtylyov Date: Wed Apr 21 18:11:33 2010 +0400 DaVinci: move IDE platform device to its proper place The IDE platform device is registered in three different places (2 board files for DM644x and in dm646x.c for DM646x) while both the IDE base address and the IDE IRQ are the same for both SoCs -- therefore, the proper place for the IDE platform seems to be in devices.c. Merge the IDE platform data and registration code and create davinci_init_ide() in place of dm646x_init_ide()... Signed-off-by: Sergei Shtylyov Signed-off-by: Kevin Hilman commit 280faffb4e059b3f453e297af7060d9c277c0ca9 Author: Thomas Koeller Date: Wed Apr 21 15:33:32 2010 +0200 davinci: mach/common.h: add missing includes linux/compiler.h is required for __iomem linux/types.h is required u32 Signed-off-by: Thomas Koeller Signed-off-by: Kevin Hilman commit d6961e6889a26de427aa6e0df823c789cf4a848f Author: Cyril Chemparathy Date: Wed Apr 14 14:44:49 2010 -0400 Davinci: configurable pll divider mask This patch allows socs to override the divider ratio mask by setting an optional field (div_ratio_mask) in the pll_data structure. Signed-off-by: Cyril Chemparathy Tested-by: Sandeep Paulraj Signed-off-by: Kevin Hilman commit ce100669d2ee202acac94d39f1a585c6b066cecc Author: Thomas Koeller Date: Thu Apr 8 17:01:56 2010 +0200 davinci: DM365: Allow use of GPIO64_57 Extended the MUX configuration to allow use of GPIO terminals 64..57. Signed-off-by: Thomas Koeller Signed-off-by: Kevin Hilman commit 002cb2d2f1dde524b2aef6e43922984f6d1c8adc Author: Sergei Shtylyov Date: Fri Apr 16 21:29:20 2010 +0400 DA830 EVM: use DA8XX_AEMIF_*_BASE #define's The board file #define's its own version of EMIFA base addresses, while there are DA8XX_AEMIF_*_BASE macros #define'd in . Start using them instead. Signed-off-by: Sergei Shtylyov Signed-off-by: Kevin Hilman commit 7034217467abe91b5bc63fc2993bb8eec1cf3c9f Author: Sergei Shtylyov Date: Fri Apr 16 21:29:11 2010 +0400 DaVinci: move AEMIF #define's to the proper headers Currently each DaVinci board file #define's its own version of the EMIFA base addresses (all named DAVINCI_ASYNC_EMIF_*_BASE), which leads to duplication. Move these #define's to the SoC specific headers, changing their prefixes from 'DAVINCI' to the 'DM355', 'DM644X', and 'DM646X' since all these base addresses are SoC specific... And while at it, rename DM646X_ASYNC_EMIF_DATA_CE0_BASE to DM646X_ASYNC_EMIF_CS2_SPACE_BASE in order to match the DM646x datasheet. Signed-off-by: Sergei Shtylyov Signed-off-by: Kevin Hilman commit ef03592a1a8112309f1fca1c11fbaef8ab541ef2 Author: Cyril Chemparathy Date: Thu Mar 25 17:43:53 2010 -0400 Davinci: tnetv107x cpu types Added tnetv107x cpu type definitions and cpu identification macros. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 6cc20cd8ed876ce21b558006f18d4c86f2efbdfd Author: Cyril Chemparathy Date: Thu Mar 25 17:43:51 2010 -0400 Davinci: tnetv107x IRQ definitions IRQ numbers as defined for tnetv107x cp_intc. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 7520f4eded66091b59c9aa3054c6fc8843a6c9a6 Author: Cyril Chemparathy Date: Thu Mar 25 17:43:50 2010 -0400 Davinci: tnetv107x LPSC modules Added definitions for LPSC modules in the tnetv107x SOC Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 0e23f71d60bdb4c202402c5f5c709deacc5d0f17 Author: Cyril Chemparathy Date: Thu Mar 25 17:43:49 2010 -0400 Davinci: tnetv107x pin list Added list of muxed pins on the tnetv107x SOC. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 3821d10a538ac9d750987badd404c8f860ffa774 Author: Cyril Chemparathy Date: Thu Mar 25 17:43:48 2010 -0400 Davinci: promote da8xx_pinmux_setup() Rename da8xx_pinmux_setup() to davinci_cfg_reg_list() and promote it for use in other SOCs that may need the ability to configure multiple pins in one shot. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 52958be3ad6e2b72a5943718f339ed4e11685739 Author: Cyril Chemparathy Date: Thu Mar 25 17:43:47 2010 -0400 Davinci: support LPSC SwRstDisable state The current clock control code always gates the clock (PSC state Disable = 2) on clk_disable(). Some on-chip peripherals (e.g. LCD controller on TNETV107X) need to be put into SwRstDisable = 0 on clock disable, to maintain hardware sanity. This patch extends the davinci_psc_config() arguments to pass in the desired module state instead of a boolean enable/disable. Further, clk_disable() now checks for the PSC_SWRSTDISABLE clk flag before selecting the target state. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 449ef7f6a9c732657938b222f8804d3e34a3603e Author: Cyril Chemparathy Date: Thu Mar 25 17:43:46 2010 -0400 Davinci: cpintc host map configuration Host map configuration instructs the interrupt controller to route interrupt channels to FIQ or IRQ lines. Currently, DA8xx family of devices leave these registers at their reset-default values. TNETV107X however does not have sane reset defaults, and therefore this architecture needs to reconfigure the host-map such that channels 0 and 1 go to FIQ, and the remaining channels raise IRQs. This patch adds an optional host map argument to cp_intc_init() for this. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 8ca2e597fc8f3337cef1f8febab482fe8c52b004 Author: Cyril Chemparathy Date: Thu Mar 25 17:43:45 2010 -0400 Davinci: enable timer clock before use timer_init() programs timer64 hardware. The module should ideally be brought out of reset before this happens. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit b722049d7e60356fe04bcac6065a7c8b1c64c06f Author: Cyril Chemparathy Date: Thu Mar 25 17:43:44 2010 -0400 Davinci: allow SOCs based on other ARM CPUs Preliminary modification prior to adding support for TNETV107X based on ARM1176. This change allows for CPUs other than ARM926T to be used for Davinci derivative SoCs. Existing devices (DA8x and DMx) operate unchanged. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 9c0a342c45b2d98209ac473ea7a429ddd5c1b473 Author: Sekhar Nori Date: Sun Mar 7 18:05:54 2010 +0530 rtc: omap: let device wakeup capability be configured from chip init logic The rtc-omap driver currently hardcodes the RTC wakeup capability to be "not capable". While this seems to be true for existing OMAP1 boards which are not wired for this, the DA850/OMAP-L138 SoC, the RTC can always be wake up source from its "deep sleep" mode. This patch lets the wakeup capability to be set from platform data and does not override the setting from the driver. For DA850/OMAP-L138, this is done from arch/arm/mach-davinci/devices-da8xx.c:da8xx_register_rtc() Note that this patch does not change the behavior on any existing OMAP1 board since the platform device registration sets the wakeup capability to 0 by default. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 8ecf6c54d44c535b2296319aa58567ea9a1db026 Author: Miguel Aguilar Date: Thu Nov 5 08:51:34 2009 -0600 RTC: DaVinci RTC driver This driver features: * Alarm support. * Periodic interrupt by using a timer include into the RTC module. * The update interrupt is not supported by this RTC module. This driver was tested on a DM365 EVM by using the rtc-test application from the Documentation/rtc.txt. Signed-off-by: Miguel Aguilar Signed-off-by: Kevin Hilman Acked-by: Alessandro Zummo commit a7e05065f562ae347db36b0ef644525cd1e89ecd Author: Anuj Aggarwal Date: Mon Mar 8 15:05:58 2010 +0530 davinci: edma: clear interrupt status for interrupt enabled channels only Currently, the ISR in the EDMA driver clears the pending interrupt for all channels without regard to whether that channel has a registered callback or not. This causes problems for devices like DM355/DM365 where the multimedia accelerator uses EDMA by polling on the interrupt pending bits of some of the EDMA channels. Since these channels are actually allocated through the Linux EDMA driver (by an out-of-kernel module), the same shadow region is used by Linux and accelerator. There a race between the Linux ISR and the polling code running on the accelerator on the IPR (interrupt pending register). This patch fixes the issue by making the ISR clear the interrupts only for those channels which have interrupt enabled. The channels which are allocated for the purpose of being polled on by the accelerator will not have a callback function provided and so will not have IER (interrupt enable register) bits set. Tested on DM365 and OMAP-L137/L138 with audio and MMC/SD (as EDMA users). Signed-off-by: Anuj Aggarwal Signed-off-by: Sekhar Nori CC: Archith John Bency Signed-off-by: Kevin Hilman commit d154fed7234331dc29240deb04f92f382000e66b Author: Vipin Bhandari Date: Wed Mar 10 14:03:02 2010 +0530 davinci: da830/omap-l137 evm: use 8-wire MMC/SD card support The merge for 2.6.34 brings in 8-bit support to the DaVinci MMC/SD driver. This patch updates the platform data for DA830/OMAP-L137 EVM to use 8-wire support available in the driver. Signed-off-by: Vipin Bhandari Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 8ccfd3f074f75135971905d2413811729e19580e Author: Vipin Bhandari Date: Wed Mar 10 14:03:01 2010 +0530 davinci: da830/omap-l137 evm: add support for GPIO based MMC/SD card detection The DA830/OMAP-L137 EVM has GPIO based card detection logic, but the current code does not use it. Add support for GPIO based card detection to avoid reading the card to see if a card is present or not. Signed-off-by: Vipin Bhandari Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 21ce873d211a42e315558d6ae09a8bb04508a592 Author: Kevin Hilman Date: Thu Feb 25 16:49:56 2010 -0800 davinci: sparse: gpio: void casting Cleanup usage of void pointers when using genirq. genirq API takes and returns void *, where this GPIO API is using those as __iomem pointers. Signed-off-by: Kevin Hilman commit 28552c2eae472a0a52d1cdb02eb32766c7f690e1 Author: Kevin Hilman Date: Thu Feb 25 15:36:38 2010 -0800 davinci: misc cleanups from sparse - Convert data/functions to static - include headers for missing declarations - pointer cleanups: struct foo *__iomem f --> struct foo __iomem *f; Signed-off-by: Kevin Hilman commit af7dc2281fd3cedc04cb51bcc0887cdaf65c3fcc Author: Rabin Vincent Date: Thu May 6 11:14:17 2010 +0100 ARM: 6104/1: nomadik-gpio: use clk API Add clocks with appropriate names in platforms that use it, and use the clk API in nomadik-gpio. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit dc6048c7f97beaf8c5bb97ed772f43330d04727a Author: Rabin Vincent Date: Thu May 6 10:47:25 2010 +0100 ARM: 6103/1: nomadik: define clocks statically Add a table for clocks to be defined statically, so that new clocks can be added without having to call nmdk_clk_create() for each of them. Remove the now unused nmdk_clk_create() function. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 2210d6453b4d888c122b2b1c236f50b0a2d30bfa Author: Rabin Vincent Date: Thu May 6 10:45:18 2010 +0100 ARM: 6102/1: nomadik-gpio: set a default trigger for interrupts Set a default trigger type for interrupts, otherwise if request_irq is called without specifiying a trigger type, the interrupt will not actually be enabled. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 7a852d8060e1bb3a5e621caaebea86c43cf4a62d Author: Rabin Vincent Date: Thu May 6 10:43:55 2010 +0100 ARM: 6101/1: nomadik-gpio: don't enable in set_type On this peripheral, setting the trigger type enables the interrupt, and the current set_type() implementation unconditionally enables the interrupt, even if it is called when the interrupt is disabled. Fix set_type() to: - if the interrupt is disabled, defer the actual trigger setting to when it is unmasked - if the interrupt is enabled, change the type immediately by clearing the old type and then re-enabling with the new type. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 040e5ecddaa72f1f982b83cb205509bc9ce7f91e Author: Rabin Vincent Date: Thu May 6 10:42:42 2010 +0100 ARM: 6100/1: nomadik-gpio: factor out helper to enable/disable irqs Remove some nearly-duplicated code to make the following patch simpler. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 6b07aaedc029d507501a931aabfd3d0a70f1828f Author: Rabin Vincent Date: Thu May 6 10:40:47 2010 +0100 ARM: 6099/1: nomadik-gpio: fix mask/unmask Mask/unmask should modify the interrupt mask register (RIMSC and FIMSC) not the wakeup mask registers (RWIMSC and FWIMSC). Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit cc631fb732b8ccd6a0cc45557475ea09b0c21a68 Author: Paul E. McKenney Date: Thu May 6 18:49:21 2010 +0200 sched: correctly place paranioa memory barriers in synchronize_sched_expedited() The memory barriers must be in the SMP case, not in the !SMP case. Also add a barrier after the atomic_inc() in order to ensure that other CPUs see post-synchronize_sched_expedited() actions as following the expedited grace period. Signed-off-by: Paul E. McKenney Signed-off-by: Tejun Heo commit 94458d5ecb3da844823cc191e73e5c5ead98a464 Author: Tejun Heo Date: Thu May 6 18:49:21 2010 +0200 sched: kill paranoia check in synchronize_sched_expedited() The paranoid check which verifies that the cpu_stop callback is actually called on all online cpus is completely superflous. It's guaranteed by cpu_stop facility and if it didn't work as advertised other things would go horribly wrong and trying to recover using synchronize_sched() wouldn't be very meaningful. Kill the paranoid check. Removal of this feature is done as a separate step so that it can serve as a bisection point if something actually goes wrong. Signed-off-by: Tejun Heo Acked-by: Peter Zijlstra Cc: Ingo Molnar Cc: Dipankar Sarma Cc: Josh Triplett Cc: Paul E. McKenney Cc: Oleg Nesterov Cc: Dimitri Sivanich commit 969c79215a35b06e5e3efe69b9412f858df7856c Author: Tejun Heo Date: Thu May 6 18:49:21 2010 +0200 sched: replace migration_thread with cpu_stop Currently migration_thread is serving three purposes - migration pusher, context to execute active_load_balance() and forced context switcher for expedited RCU synchronize_sched. All three roles are hardcoded into migration_thread() and determining which job is scheduled is slightly messy. This patch kills migration_thread and replaces all three uses with cpu_stop. The three different roles of migration_thread() are splitted into three separate cpu_stop callbacks - migration_cpu_stop(), active_load_balance_cpu_stop() and synchronize_sched_expedited_cpu_stop() - and each use case now simply asks cpu_stop to execute the callback as necessary. synchronize_sched_expedited() was implemented with private preallocated resources and custom multi-cpu queueing and waiting logic, both of which are provided by cpu_stop. synchronize_sched_expedited_count is made atomic and all other shared resources along with the mutex are dropped. synchronize_sched_expedited() also implemented a check to detect cases where not all the callback got executed on their assigned cpus and fall back to synchronize_sched(). If called with cpu hotplug blocked, cpu_stop already guarantees that and the condition cannot happen; otherwise, stop_machine() would break. However, this patch preserves the paranoid check using a cpumask to record on which cpus the stopper ran so that it can serve as a bisection point if something actually goes wrong theree. Because the internal execution state is no longer visible, rcu_expedited_torture_stats() is removed. This patch also renames cpu_stop threads to from "stopper/%d" to "migration/%d". The names of these threads ultimately don't matter and there's no reason to make unnecessary userland visible changes. With this patch applied, stop_machine() and sched now share the same resources. stop_machine() is faster without wasting any resources and sched migration users are much cleaner. Signed-off-by: Tejun Heo Acked-by: Peter Zijlstra Cc: Ingo Molnar Cc: Dipankar Sarma Cc: Josh Triplett Cc: Paul E. McKenney Cc: Oleg Nesterov Cc: Dimitri Sivanich commit 3fc1f1e27a5b807791d72e5d992aa33b668a6626 Author: Tejun Heo Date: Thu May 6 18:49:20 2010 +0200 stop_machine: reimplement using cpu_stop Reimplement stop_machine using cpu_stop. As cpu stoppers are guaranteed to be available for all online cpus, stop_machine_create/destroy() are no longer necessary and removed. With resource management and synchronization handled by cpu_stop, the new implementation is much simpler. Asking the cpu_stop to execute the stop_cpu() state machine on all online cpus with cpu hotplug disabled is enough. stop_machine itself doesn't need to manage any global resources anymore, so all per-instance information is rolled into struct stop_machine_data and the mutex and all static data variables are removed. The previous implementation created and destroyed RT workqueues as necessary which made stop_machine() calls highly expensive on very large machines. According to Dimitri Sivanich, preventing the dynamic creation/destruction makes booting faster more than twice on very large machines. cpu_stop resources are preallocated for all online cpus and should have the same effect. Signed-off-by: Tejun Heo Acked-by: Rusty Russell Acked-by: Peter Zijlstra Cc: Oleg Nesterov Cc: Dimitri Sivanich commit 1142d810298e694754498dbb4983fcb6cb7fd884 Author: Tejun Heo Date: Thu May 6 18:49:20 2010 +0200 cpu_stop: implement stop_cpu[s]() Implement a simplistic per-cpu maximum priority cpu monopolization mechanism. A non-sleeping callback can be scheduled to run on one or multiple cpus with maximum priority monopolozing those cpus. This is primarily to replace and unify RT workqueue usage in stop_machine and scheduler migration_thread which currently is serving multiple purposes. Four functions are provided - stop_one_cpu(), stop_one_cpu_nowait(), stop_cpus() and try_stop_cpus(). This is to allow clean sharing of resources among stop_cpu and all the migration thread users. One stopper thread per cpu is created which is currently named "stopper/CPU". This will eventually replace the migration thread and take on its name. * This facility was originally named cpuhog and lived in separate files but Peter Zijlstra nacked the name and thus got renamed to cpu_stop and moved into stop_machine.c. * Better reporting of preemption leak as per Peter's suggestion. Signed-off-by: Tejun Heo Acked-by: Peter Zijlstra Cc: Oleg Nesterov Cc: Dimitri Sivanich commit aeb29a82de7c80d4d0253b042f17eb1f725b08f1 Merge: 39b8eab 2f00547 Author: Takashi Iwai Date: Thu May 6 17:06:27 2010 +0200 Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc commit 2f005471e2e2f2c7fa5898153387d421f7d24ad6 Author: Peter Ujfalusi Date: Thu May 6 12:04:25 2010 +0300 ASoC: tlv320dac33: Use codec defaults for LOM/LOP and DAC power Do not change the codec defaults for the following registers: 0x40, 0x41: Line output gains, do not use amplification 0x42: LOM/LOP Voltage hold, and selection 0x44: LOM inversion control It has been found, that the values configured to these registers can cause amplification, which can make the output of DAC33 distorted. The codec reset values are considered safe in all environmnts. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 6f3991152f20933b77eff30413e893bf1a15e578 Author: Peter Ujfalusi Date: Thu May 6 10:37:18 2010 +0300 ASoC: tpa6130a2: Support for limiting gain Add support for platform dependent gain limiting on the tpa6130a2 (and tpa6140a2) Headset amplifier. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 5193d62f1824cdfd72b5523be2b1cdb8049225ad Author: Jarkko Nikula Date: Wed May 5 13:02:03 2010 +0300 ASoC: tlv320aic3x: Add platform data and reset gpio handling Handle the reset GPIO within the codec driver in order to follow the startup protocol for the tlv320aic3x codecs. Signed-off-by: Jarkko Nikula Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit bae663bc635e2726c7c5228dbf0f2051e16d1c81 Author: Robert Richter Date: Wed May 5 17:47:17 2010 +0200 oprofile/x86: make AMD IBS hotplug capable Current IBS code is not hotplug capable. An offline cpu might not be initialized or deinitialized properly. This patch fixes this by removing on_each_cpu() functions. The IBS init/deinit code is executed in the per-cpu functions model->setup_ctrs() and model->cpu_down() which are also called by hotplug notifiers. model->cpu_down() replaces model->exit() that became obsolete. Cc: Andi Kleen Signed-off-by: Robert Richter commit f70e2e06196ad4c1c762037da2f75354f6c16b81 Author: David Howells Date: Fri Apr 30 14:32:39 2010 +0100 KEYS: Do preallocation for __key_link() Do preallocation for __key_link() so that the various callers in request_key.c can deal with any errors from this source before attempting to construct a key. This allows them to assume that the actual linkage step is guaranteed to be successful. Signed-off-by: David Howells Signed-off-by: James Morris commit 043b4d40f53131c5f72eca2a46555fe35328a930 Merge: 2928238 722154e Author: James Morris Date: Thu May 6 22:21:04 2010 +1000 Merge branch 'master' into next Conflicts: security/keys/keyring.c Resolved conflict with whitespace fix in find_keyring_by_name() Signed-off-by: James Morris commit 3de668ee8d5b1e08da3200f926ff5a28aeb99bc2 Author: Robert Richter Date: Mon May 3 15:00:25 2010 +0200 oprofile/x86: notify cpus only when daemon is running This patch moves the cpu notifier registration from nmi_init() to nmi_setup(). The corresponding unregistration function is now in nmi_shutdown(). Thus, the hotplug code is only active, if the oprofile daemon is running. Cc: Andi Kleen Signed-off-by: Robert Richter commit 49100c98359a56ea4e8c9a76e3d625cdb25f25f5 Author: Jarkko Nikula Date: Wed May 5 11:14:22 2010 +0300 ASoC: omap: Add basic audio support for Nokia RX-51/N900 This patch adds support for integrated stereo speakers and digital microphone found on Nokia RX-51 hardware. This is a cut down version based on Maemo kernel sources and earlier patchset by Eduardo Valentin et al. http://mailman.alsa-project.org/pipermail/alsa-devel/2009-October/022033.html Signed-off-by: Jarkko Nikula Cc: Eduardo Valentin Cc: Peter Ujfalusi Acked-by: Eduardo Valentin Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 575400bf5d57f53a767bc215bd709e65e5b27a5c Author: Tobias Klauser Date: Wed May 5 22:12:20 2010 +0000 net: emaclite: Use resource_size Use the resource_size function instead of manually calculating the resource size. This reduces the chance of introducing off-by-one errors. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 627c8a041f7aaaea93c766f69bd61d952a277586 Author: Bruce Allan Date: Wed May 5 22:00:27 2010 +0000 e1000e: Reset 82577/82578 PHY before first PHY register read Reset the PHY before first accessing it. Doing so, ensure that the PHY is in a known good state before we read/write PHY registers. This fixes a driver probe failure. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 6dfaa76994e5d49a82afb415bbe1362e901b2b95 Author: Bruce Allan Date: Wed May 5 22:00:06 2010 +0000 e1000e: reset MAC-PHY interconnect on 82577/82578 during Sx->S0 During Sx->S0 transitions, the interconnect between the MAC and PHY on 82577/82578 can remain in SMBus mode instead of transitioning to the PCIe-like mode required during normal operation. Toggling the LANPHYPC Value bit essentially resets the interconnect forcing it to the correct mode. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ffb273623bc506d854902a415ef241b79232f93a Author: David S. Miller Date: Thu May 6 01:20:10 2010 -0700 netpoll: Use 'bool' for netpoll_rx() return type. Signed-off-by: David S. Miller commit f6dc31a85cd46a959bdd987adad14c3b645e03c1 Author: WANG Cong Date: Thu May 6 00:48:51 2010 -0700 bonding: make bonding support netpoll Based on Andy's work, but I modified a lot. Similar to the patch for bridge, this patch does: 1) implement the 2 methods to support netpoll for bonding; 2) modify netpoll during forwarding packets via bonding; 3) disable netpoll support of bonding when a netpoll-unabled device is added to bonding; 4) enable netpoll support when all underlying devices support netpoll. Cc: Andy Gospodarek Cc: Jeff Moyer Cc: Matt Mackall Cc: Neil Horman Cc: Jay Vosburgh Cc: David Miller Signed-off-by: WANG Cong Signed-off-by: David S. Miller commit c06ee961d3c0e51009cbd0e123b61fbb97f37d0b Author: WANG Cong Date: Thu May 6 00:48:24 2010 -0700 bridge: make bridge support netpoll Based on the previous patch, make bridge support netpoll by: 1) implement the 2 methods to support netpoll for bridge; 2) modify netpoll during forwarding packets via bridge; 3) disable netpoll support of bridge when a netpoll-unabled device is added to bridge; 4) enable netpoll support when all underlying devices support netpoll. Cc: David Miller Cc: Neil Horman Cc: Stephen Hemminger Cc: Matt Mackall Signed-off-by: WANG Cong Signed-off-by: David S. Miller commit 0e34e93177fb1f642cab080e0bde664c06c7183a Author: WANG Cong Date: Thu May 6 00:47:21 2010 -0700 netpoll: add generic support for bridge and bonding devices This whole patchset is for adding netpoll support to bridge and bonding devices. I already tested it for bridge, bonding, bridge over bonding, and bonding over bridge. It looks fine now. To make bridge and bonding support netpoll, we need to adjust some netpoll generic code. This patch does the following things: 1) introduce two new priv_flags for struct net_device: IFF_IN_NETPOLL which identifies we are processing a netpoll; IFF_DISABLE_NETPOLL is used to disable netpoll support for a device at run-time; 2) introduce one new method for netdev_ops: ->ndo_netpoll_cleanup() is used to clean up netpoll when a device is removed. 3) introduce netpoll_poll_dev() which takes a struct net_device * parameter; export netpoll_send_skb() and netpoll_poll_dev() which will be used later; 4) hide a pointer to struct netpoll in struct netpoll_info, ditto. 5) introduce ->real_dev for struct netpoll. 6) introduce a new status NETDEV_BONDING_DESLAE, which is used to disable netconsole before releasing a slave, to avoid deadlocks. Cc: David Miller Cc: Neil Horman Signed-off-by: WANG Cong Signed-off-by: David S. Miller commit 08259594e047170923ef11d1482648642bfe606f Author: Greg Rose Date: Wed May 5 19:57:49 2010 +0000 ixgbevf: Cache PF ack bit in interrupt When the PF acks a message from the VF the VF gets an interrupt. It must cache the ack bit so that polling SW will not miss the ack. Also avoid reading the message buffer on acks because that also will clear the ack bit. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8a07a22d856f37e580557c1a13c8eb8662f9cc11 Author: Greg Rose Date: Wed May 5 19:57:30 2010 +0000 ixgbe: Streamline MC filter setup for VFs The driver was calling the set Rx mode function for every multicast filter set by the VF. When starting many VMs where each might have multiple VLAN interfaces this would result in the function being called hundreds or even thousands of times. This is unnecessary for the case of the imperfect filters used in the MTA and has been streamlined to be more efficient. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 73422913cab53307214cd13c4fa2c11bf222c2ab Author: Greg Rose Date: Wed May 5 19:57:10 2010 +0000 ixgbe: Remove unneeded register writes in VF VLAN setup The driver is unnecessarily writing values to VLAN control registers. These writes already done elsewhere and are superfluous here. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 58544feb67eac49d55cc3408aea1ae42521af90d Merge: 2873957 55afbd0 Author: David S. Miller Date: Thu May 6 00:26:49 2010 -0700 Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit 2aae2d918d88fdf0f8c066520cda0a30409db23f Author: Bob Moore Date: Thu May 6 13:59:07 2010 +0800 ACPICA: Update version to 20100428. Version 20100428. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit b47cf58edfa15cb8f384a4a5e7e7d65babb602f6 Author: Bob Moore Date: Tue Apr 27 11:54:40 2010 +0800 ACPICA: Update/clarify some parameter names associated with acpi_handle Simple rename of some parameters to standardize them. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit ada241dcec7eb21ff1690a1ba6213299b743bb5b Author: Bob Moore Date: Tue Apr 27 11:48:02 2010 +0800 ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep Suspend has other meanings in ACPI context, name was misleading. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 17b82327f3e7ab5a068f8019768008ee82d912be Author: Lin Ming Date: Tue Apr 27 11:46:25 2010 +0800 ACPICA: Prevent possible allocation overrun during object copy Original code did not handle the case where the object to be copied was a namespace node. Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 3fe50208b29b2463eb6c181c1433dd1beb39f282 Author: Bob Moore Date: Tue Apr 27 11:41:19 2010 +0800 ACPICA: Split large file, evgpeblk Create two new files, evgpeinit.c and evgpeutil.c. Updated unix and linux makefiles. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 186c307f008d2a53961cd970aaf7cb9c33e79cb1 Author: Bob Moore Date: Tue Apr 27 11:32:28 2010 +0800 ACPICA: Add GPE support for dynamically loaded ACPI tables For all GPEs, including FADT-based and GPE Block Devices, execute any _PRW methods in the new table, and process any _Lxx/_Exx GPE methods in the new table. Any runtime GPE that is referred to by an _Lxx/_Exx method in the new table is immediately enabled. ACPICA BZ 833. http://www.acpica.org/bugzilla/show_bug.cgi?id=833 Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit b9ee2043096b02e5da8c62f9a8a8f2e172b3606b Author: Bob Moore Date: Tue Apr 27 11:16:14 2010 +0800 ACPICA: Clarify/rename some root table descriptor fields Original fields were not very descriptive and led to maintenance problems. New fields should help to understand the existing code. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit ef5dbbccbbfa7d2211fa8efcc095a9f4a7912dda Author: Takashi Iwai Date: Thu May 6 08:40:25 2010 +0200 ALSA: hda - Remove superfluous external amp setup for ALC888 We had a fixed external amp setup enabled for ALC888, but this seems unnecessary. The amps are controlled rather by GPIOs. Let's remove it now. Signed-off-by: Takashi Iwai commit 20d157aef2e5bc6ac8995e8babefdc6e1cfaaadf Merge: 7b2bfdb 8f0f5ff Author: Takashi Iwai Date: Thu May 6 08:39:43 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 4f47b4c9f0b711bf84adb8c27774ae80d346b628 Author: Eric W. Biederman Date: Wed May 5 13:22:25 2010 -0700 x86, acpi/irq: Define gsi_end when X86_IO_APIC is undefined My recent changes introducing a global gsi_end variable failed to take into account the case of using acpi on a system not built to support IO_APICs, causing the build to fail. Define gsi_end to 15 when CONFIG_X86_IO_APIC is not set to avoid compile errors. Signed-off-by: Eric W. Biederman Cc: Yinghai Lu LKML-Reference: Signed-off-by: Ingo Molnar commit 9b7a37853a8cd69829eb1d9715a6c09aae01eeec Author: Paul Mundt Date: Thu May 6 15:09:45 2010 +0900 sh: Make initrd detection more robust. Various boot loaders go to various extents to thwart the initrd detection logic (mostly on account of not being able to be bothered with adhering to the established boot ABI), so we make the detection logic a bit more robust. This makes it possible to work around the SDK7786's firmware's attempts to thwart compressed image booting. Victory is mine. Signed-off-by: Paul Mundt commit 2873957df0ead5b53fa00fddfb52ca3df38af4a9 Author: Nick Nunley Date: Tue May 4 21:58:07 2010 +0000 igb: reduce cache misses on tx cleanup This patch reduces the number of skb cache misses in the clean_tx_irq path, and results in an overall increase in tx packet throughput. Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a84afa40e07b6882ca46a7287d8ca4a8c5430f60 Author: Sebastien Jan Date: Wed May 5 08:45:54 2010 +0000 ks8851: companion eeprom access through ethtool Accessing ks8851 companion eeprom permits modifying the ks8851 stored MAC address. Example how to change the MAC address using ethtool, to set the 01:23:45:67:89:AB MAC address: $ echo "0:AB8976452301" | xxd -r > mac.bin $ sudo ethtool -E eth0 magic 0x8870 offset 2 < mac.bin Signed-off-by: Sebastien Jan Signed-off-by: David S. Miller commit a4bdfff74464f86d7e3b8feaf42d18960adc5514 Author: Sebastien Jan Date: Wed May 5 08:45:53 2010 +0000 ks8851: Low level functions for read/write to companion eeprom Low-level functions provide 16bits words read and write capability to ks8851 companion eeprom. Signed-off-by: Sebastien Jan Signed-off-by: David S. Miller commit 7d9974666e0dc2cbbeac80fa4d550df0bbea6fad Author: Sebastien Jan Date: Wed May 5 08:45:52 2010 +0000 ks8851: Add caching of CCR register CCR register contains information on companion eeprom availability. Signed-off-by: Sebastien Jan Signed-off-by: David S. Miller commit d951f7250305adaea5f25398b70023681183d0cb Author: Tom Herbert Date: Wed May 5 18:15:21 2010 +0000 forcedeth: Account for consumed budget in napi poll Repeated calls to nv_rx_process in napi poll routine do not take portion of budget that has been consumed in previous calls. Fix by subtracting the number of packets processed. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 0294b6f78f2dd9d94fa0deec28e8845a7fb43ac3 Author: David Daney Date: Wed May 5 13:03:13 2010 +0000 netdev: octeon_mgmt: Remove some gratuitous blank lines. Signed-off-by: David Daney Signed-off-by: David S. Miller commit 4e4a4f1478fdb303c9d99c69cfb4e973526f0c99 Author: David Daney Date: Wed May 5 13:03:12 2010 +0000 netdev: octeon_mgmt: Try not to drop TX packets when stopping the queue. Stop the queue when we add the packet that will fill it instead of dropping the packet Signed-off-by: David Daney Signed-off-by: David S. Miller commit b635e06993076c3c8f8cc766b183be7da3baafdb Author: David Daney Date: Wed May 5 13:03:11 2010 +0000 netdev: octeon_mgmt: Free TX skbufs in a timely manner. We also reduce the high water mark to 1 so skbufs are not stranded for long periods of time. Since we are cleaning after each packet, no need to do it in the transmit path. Signed-off-by: David Daney Signed-off-by: David S. Miller commit a0cfa850ac639759cd68a121920f3e474ce9dfb1 Author: David Daney Date: Wed May 5 13:03:10 2010 +0000 netdev: octeon_mgmt: Fix race manipulating irq bits. Don't re-read the interrupt status register, clear the exact bits we will be testing. Signed-off-by: David Daney Signed-off-by: David S. Miller commit 4d30b8013b2d82138d6900965fe9fcd062f2d06d Author: David Daney Date: Wed May 5 13:03:09 2010 +0000 netdev: octeon_mgmt: Fix race condition freeing TX buffers. Under heavy load the TX cleanup tasklet and xmit threads would race and try to free too many buffers. Signed-off-by: David Daney Signed-off-by: David S. Miller commit 62538d2490d071e822d85651445c8a0bb4ed5a4b Author: David Daney Date: Wed May 5 13:03:08 2010 +0000 netdev: octeon_mgmt: Use proper MAC addresses. The original implementation incorrectly uses netdev->dev_addrs. Use netdev->uc instead. Also use netdev_for_each_uc_addr to iterate over the addresses. Fix comment. Signed-off-by: David Daney Signed-off-by: David S. Miller commit 7f01648aa32185b8047aea384237ad58e430e07f Author: Greg Rose Date: Tue May 4 22:12:06 2010 +0000 ixgbe: Add support for VF MAC and VLAN configuration Add support for the "ip link set" and "ip link show" commands that allow configuration of the virtual functions' MAC and port VLAN via user space command line. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit f04127760e582a9dccb22dfceb41cd1dad676794 Author: Greg Rose Date: Tue May 4 22:11:46 2010 +0000 ixgbe: Add boolean parameter to ixgbe_set_vmolr Add a boolean parameter to ixgbe-set_vmolr so that the caller can specify whether the pool should accept untagged packets. Required for a follow on patch to enable administrative configuration of port VLAN for virtual functions. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit eab2abf5826b78b126826cc70e564c44816396da Author: Jesse Brandeburg Date: Tue May 4 22:26:03 2010 +0000 e1000/e1000e: implement a simple interrupt moderation Back before e1000-7.3.20, the e1000 driver had a simple algorithm that managed interrupt moderation. The driver was updated in 7.3.20 to have the new "adaptive" interrupt moderation but we have customer requests to redeploy the old way as an option. This patch adds the old functionality back. The new functionality can be enabled via module parameter or at runtime via ethtool. Module parameter: (InterruptThrottleRate=4) to use this new moderation method. Ethtool method: ethtool -C ethX rx-usecs 4 Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit edf15c17420fed108046da50b3d3ae53dfa0e0ae Author: Alexander Duyck Date: Tue May 4 22:25:42 2010 +0000 e1000e: increase rx fifo size to 36K on 82574 and 82583 This change increases the RX fifo size to 36K for standard frames and decreases the TX fifo size to 4K. The reason for this change is that on slower systems the RX is much more likely to backfill and need space than the TX is. As long as the TX fifo is twice the size of the MTU we should have more than enough TX fifo. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit f85e4dfac666e41b91e2b77fa563398e9379d5eb Author: Tom Herbert Date: Wed May 5 14:03:32 2010 +0000 e1000e: Save irq into netdev structure Set net->devirq to pdev->irq. This should be consistent with other drivers. Signed-off-by: Tom Herbert Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c72ea83d39efa71bf0e3fc1125e780071a79f1bc Author: Tom Herbert Date: Wed May 5 14:03:11 2010 +0000 e1000e: Remove unnessary log message Remove e_info message printed whenever TSO is enabled or disabled. This is not very useful and just clutters dmesg. Signed-off-by: Tom Herbert Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 50849d792b97c546c45a6652a16ba9be7d635c69 Author: Tom Herbert Date: Wed May 5 14:02:49 2010 +0000 e1000e: reduce writes of RX producer ptr Reduce number of writes to RX producer pointer. When alloc'ing RX buffers, only write the RX producer pointer once every E1000_RX_BUFFER_WRITE (16) buffers created. Signed-off-by: Tom Herbert Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 9ed318d546a29d7a591dbe648fd1a2efe3be1180 Author: Tom Herbert Date: Wed May 5 14:02:27 2010 +0000 e1000e: save skb counts in TX to avoid cache misses In e1000_tx_map, precompute number of segements and bytecounts which are derived from fields in skb; these are stored in buffer_info. When cleaning tx in e1000_clean_tx_irq use the values in the associated buffer_info for statistics counting, this eliminates cache misses on skb fields. Signed-off-by: Tom Herbert Acked-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4447957a825031b3faf3b5bc2013afe35eff492b Author: Tom Herbert Date: Wed May 5 17:57:16 2010 +0000 bnx2x: Fix check to get RX hash Flag used in check to get rxhash out of the descriptor is incorrect one. Fix to use the proper features flag. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 292823814261e085cdcef06b6b691e6c2563fbd4 Author: Tetsuo Handa Date: Thu May 6 00:18:15 2010 +0900 TOMOYO: Use mutex_lock_interruptible. Some of TOMOYO's functions may sleep after mutex_lock(). If OOM-killer selected a process which is waiting at mutex_lock(), the to-be-killed process can't be killed. Thus, replace mutex_lock() with mutex_lock_interruptible() so that the to-be-killed process can immediately return from TOMOYO's functions. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 4fcfce9f33cd2e173f83c20e93c8b0a9397bf0bc Author: Yauhen Kharuzhy Date: Wed Aug 19 16:31:06 2009 +0300 serial: Use s3c2440 driver for S3C2416 SoC UARTs in the S3C2416 are almost same as in S3C2443 and can be handled by s3c2440 serial driver. Signed-off-by: Yauhen Kharuzhy Signed-off-by: Ben Dooks commit 5faf5011841dc2a4797093b845e49bc40b4b4666 Author: Yauhen Kharuzhy Date: Wed Aug 19 16:31:05 2009 +0300 ARM: S3C: Add S3C2416 detection to uncompress code Add S3C2416 serial port setup to uncompress code. Signed-off-by: Yauhen Kharuzhy Signed-off-by: Ben Dooks commit 1d3ef014b5fe959a789c2df708713d58c9491c3b Author: Ben Dooks Date: Thu May 6 11:32:14 2010 +0900 ARM: S3C24XX: Remove _INP macros in Remove the _INP definitions, they are all zero and also unused Signed-off-by: Ben Dooks commit 9772b7586efb189ac2dcac1d6f7d09c6d879ac64 Author: Ben Dooks Date: Thu May 6 11:23:35 2010 +0900 ARM: S3C24XX: Remove S3C2410_GPJ numbering Remove the old S3C2410_GPJ as we will be moving to the new gpiolib based driver code and these numbers will become invalid. Signed-off-by: Ben Dooks commit 31da46d9f11ccdb11d7f2f07421f5cccb64fbbd6 Author: Ben Dooks Date: Thu May 6 11:21:05 2010 +0900 ARM: S3C24XX: Wrapper s3c2410_gpio_setpin and s3c2410_gpio_pullup() Change s3c2410_gpio_setpin() and s3c2410_gpio_pullup() to use the new s3c_ gpio configuration calls until all their users are converted. Signed-off-by: Ben Dooks commit fb3787470ee6fee5900026170c05261c8c090a06 Author: Ben Dooks Date: Thu May 6 11:03:50 2010 +0900 ARM: S3C2410: Remove the users of s3c2410_gpio_pullup() Remove the last s3c2410_gpio_pullup() users in arch/arm/mach-s3c2410 Note, since mach-h1940.c is setting output and a pull-up, the call has vbeen chanerd to S3C_GPIO_PULL_NONE instead of S3C_GPIO_PULL_UP. Signed-off-by: Ben Dooks commit 64f508da584f983642eb8cf808fcca68f9efa44a Author: Ben Dooks Date: Thu May 6 10:59:55 2010 +0900 ARM: mini2440: Move to using gpiolib API and s3c_gpio functions Move the mach-mini2440 to using the gpiolib API for GPIOS it directly uses, and s3c_gpio calls for configuration. Signed-off-by: Ben Dooks commit 9933847b29bb3d3447d19236375ccc84bfbcf3df Author: Ben Dooks Date: Thu May 6 10:50:42 2010 +0900 ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg() Add s3c_gpio_getcfg() and change anything using s3c2410_gpio_getcfg() to use this instead. Signed-off-by: Ben Dooks commit 97a339995fa6224487dc026e466f5bd1bbcaa3b2 Author: Ben Dooks Date: Thu May 6 10:27:16 2010 +0900 ARM: SAMSUNG: Add GPIO configuration read calls Add the necessary 1,2 and 4 bit configuration read calls for the new gpio code to allow removal of the old s3c24xx gpio code. Signed-off-by: Ben Dooks commit 2b9e4688fad8867b6e918610f396af3ab9246898 Author: David Howells Date: Fri Apr 30 14:32:34 2010 +0100 KEYS: Better handling of errors from construct_alloc_key() Errors from construct_alloc_key() shouldn't just be ignored in the way they are by construct_key_and_link(). The only error that can be ignored so is EINPROGRESS as that is used to indicate that we've found a key and don't need to construct one. We don't, however, handle ENOMEM, EDQUOT or EACCES to indicate allocation failures of one sort or another. Reported-by: Vegard Nossum Signed-off-by: David Howells Signed-off-by: James Morris commit 553d603c8fce8cf727eb26e4bf6b9549cd4623f1 Author: David Howells Date: Fri Apr 30 14:32:28 2010 +0100 KEYS: keyring_serialise_link_sem is only needed for keyring->keyring links keyring_serialise_link_sem is only needed for keyring->keyring links as it's used to prevent cycle detection from being avoided by parallel keyring additions. Signed-off-by: David Howells Signed-off-by: James Morris commit 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 Merge: 4e5d6f7 7ebd467 Author: James Morris Date: Thu May 6 10:56:07 2010 +1000 Merge branch 'master' into next commit bdfae149c5b7430b9a26371f14b2d385fd3a4389 Author: Steve French Date: Thu May 6 00:38:16 2010 +0000 [CIFS] Remove unused cifs_oplock_cachep CC: Jeff Layton Signed-off-by: Steve French commit 5690a6267f0f0f15a01eeed143828726627c6ae6 Author: Ben Dooks Date: Tue May 4 17:14:10 2010 +0900 ARM: S3C24XX: Remove s3c2410_gpio_getirq() Remove s3c2410_gpio_getirq() as the only users is the pm code, and it can be replicated by using gpio_to_irq(). Signed-off-by: Ben Dooks commit e6528d5e8730b1f75acf035d7c11e06657963581 Author: Ben Dooks Date: Tue May 4 15:07:43 2010 +0900 ARM: S3C24XX: Remove s3c2410_gpio_getpull() Remove the unused s3c2410_gpio_getpull() Signed-off-by: Ben Dooks commit eee2b94f01f7379940a656af8ef097749ce025b5 Author: Ben Dooks Date: Tue May 4 15:01:44 2010 +0900 ARM: S3C24XX: Remove s3c2410_gpio_setcfg() Remove the implementation of s3c2410_gpio_setcfg() as it should now be functionally equivalent to s3c_gpio_cfgpin(), and add a wrapper for those drivers that are still using this call. Signed-off-by: Ben Dooks commit 40b956f026a3303a67d2ab7fffa2331f72e1e019 Author: Ben Dooks Date: Tue May 4 14:38:49 2010 +0900 ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin() The s3c_gpio_cfgpin() call should be functionally equivalent, so replace the s3c2410_gpio_cfgpin() calls in the s3c24xx code with s3c_gpio_cfgpin to allow moving away from a fixed GPIO number to register address mapping Signed-off-by: Ben Dooks commit 82a4b6dcc72da33943b16338f607e7e148d177e4 Author: Ben Dooks Date: Tue May 4 13:22:58 2010 +0900 ARM: S3C24XX: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull() Start moving code that is using the old s3c2410_gpio API to using the newer s3c_gpio variants by finding all the usages of s3c2410_gpio_pullup() which disable the pin's pull up and replacing them. sed 's/s3c2410_gpio_pullup\(.*\), 1/s3c_gpio_cfgpull\1, S3C_GPIO_PULL_NONE/g' Signed-off-by: Ben Dooks commit 27da04049cabdf6a28288aaf083cfea64f7f9805 Author: Ben Dooks Date: Tue May 4 13:20:12 2010 +0900 ARM: S3C2410: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull() Start moving code that is using the old s3c2410_gpio API to using the newer s3c_gpio variants by finding all the usages of s3c2410_gpio_pullup() which disable the pin's pull up and replacing them. sed 's/s3c2410_gpio_pullup\(.*\), 1/s3c_gpio_cfgpull\1, S3C_GPIO_PULL_NONE/g' Signed-off-by: Ben Dooks commit 7614e1d9b9cad40ac9c90d934d2da64b36f354d1 Author: Ben Dooks Date: Tue May 4 12:53:11 2010 +0900 ARM: VR1000: Update mach-vr1000.c to use gpiolib API Change mach-vr1000.c to use gpiolib for gpio control. Signed-off-by: Ben Dooks commit 408c8b8ca46c16fa09a6795613db74a8d2de7980 Author: Ben Dooks Date: Tue May 4 12:49:04 2010 +0900 ARM: BAST: Update mach-bast to use gpiolib API Change mach-bast .c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks commit 96efa8dac85372fdddb1682949b468226126e333 Author: Ben Dooks Date: Tue May 4 12:36:33 2010 +0900 ARM: n30: Update mach-n30 to use gpiolib API Change mach-n30.c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks commit 2d2e0c89982c532f9da6891a733b7be43c7048ce Author: Ben Dooks Date: Tue May 4 12:32:16 2010 +0900 ARM: QT2410: Update mach-qt2410 to use gpiolib API Change mach-qt2410.c to use gpiolib for the GPIO lines that are directly manipulated by it. Signed-off-by: Ben Dooks commit db61ac54c9bea389b98f88cb4a23f8dd1edde07f Author: Ben Dooks Date: Tue May 4 11:40:51 2010 +0900 ARM: H1940: Change mach-h1940 to use gpiolib API Change mach-h1940 to use the gpiolib calls instead of s3c2410_gpio directly. Signed-off-by: Ben Dooks commit afc84ad11b5c1247c2d0df06f10df69ea7206f6a Author: Ben Dooks Date: Tue May 4 11:30:42 2010 +0900 ARM: JIVE: Update mach-jive to use gpiolib API Change mach-jive to use gpiolib for the GPIO lines that are directly manipulated by it. Note, we ignore any errors from gpio_request(), unlikely to see any. Signed-off-by: Ben Dooks commit f4146a65fbdc5274a437f77ff2f3b4889c0edd0e Author: Ben Dooks Date: Tue May 4 11:23:05 2010 +0900 ARM: H1940: Change h1940-bluetooth to use gpiolib API Change the h1940-bluetooth driver to use gpiolib to set the output state of GPH1. Signed-off-by: Ben Dooks commit 7ced5eab39809539e8fc7f3fb561bd3001d535e7 Author: Ben Dooks Date: Mon May 3 17:19:49 2010 +0900 ARM: S3C24XX: Add extended GPIO used on S3C2443 and beyond Add the GPIO banks that are used on the S3C2443 and above to the list of available GPIOS. Currently we do not have any limit on the SoC GPIO, so these are being registered whether the SoC has them or not. It is currently up to the user not to try and use them. Signed-off-by: Ben Dooks commit 1ec7269fd8b05044f2cb4059b679e053d57460f5 Author: Ben Dooks Date: Mon May 3 14:39:45 2010 +0900 ARM: S3C24XX: Add the gpio pull configuration for pull-up Add the necessary gpio configuration helper for the devices which have a single-bit pull-up resistor disabled. Signed-off-by: Ben Dooks commit 9bbb851c7079ff670ba3fe6c7ce93bb5daa9a694 Author: Ben Dooks Date: Fri Apr 30 19:30:35 2010 +0900 ARM: S3C24XX: Add initial s3c_gpio configuration code Add support for s3c_gpio_setcfg() and s3c_gpio_setpull() implementations to get ready for removal of the specific code being used by s3c24xx. Also rename the s3c_gpio_setcfg_s3c24xx_banka to s3c_gpio_setcfg_s3c24xx_a as seen in the header file to correct a build warning. Signed-off-by: Ben Dooks commit 26efa0bac9dc3587ee8892c06642735bcded59e5 Author: Jeff Layton Date: Sat Apr 24 07:57:49 2010 -0400 cifs: have decode_negTokenInit set flags in server struct ...rather than the secType. This allows us to get rid of the MSKerberos securityEnum. The client just makes a decision at upcall time. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 198b5682781b97251afd9025dbf559a77969abdd Author: Jeff Layton Date: Sat Apr 24 07:57:48 2010 -0400 cifs: break negotiate protocol calls out of cifs_setup_session So that we can reasonably set up the secType based on both the NegotiateProtocol response and the parsed mount options. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 2861a185e3ac2ebe5958a2039b66062445bf4f7d Merge: ec7d2f2 8316324 Author: David S. Miller Date: Wed May 5 15:09:05 2010 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit be4c9bad9d0edb6bc3bd8fffc2f98e0e2112da39 Author: Roland Dreier Date: Wed May 5 14:45:40 2010 -0700 MAINTAINERS: Add cxgb4 and iw_cxgb4 entries Signed-off-by: Roland Dreier commit c0c79c31c9d5fcc19812c6c35f842baf50ee788a Author: Joern Engel Date: Wed May 5 22:33:36 2010 +0200 logfs: fix sync Rather self-explanatory. Signed-off-by: Joern Engel commit bba0b5c2c27e6dadc93c476f8a4b49d108b66292 Author: Joern Engel Date: Wed May 5 22:32:52 2010 +0200 logfs: fix compile failure When CONFIG_BLOCK is not enabled: fs/logfs/super.c:142: error: implicit declaration of function 'bdev_get_queue' fs/logfs/super.c:142: error: invalid type argument of '->' (have 'int') Found by Randy Dunlap Signed-off-by: Joern Engel commit 83163244f845c296a118ce85c653872dbff6abfe Merge: 0a12761 adfba3c Author: John W. Linville Date: Wed May 5 16:14:16 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c commit adfba3c7c026a6a5560d2a43fefc9b198cb74462 Author: Johannes Berg Date: Wed May 5 15:33:55 2010 +0200 mac80211: use fixed channel in ibss join when appropriate "mac80211: improve IBSS scanning" was missing a hunk. This adds that hunk as originally intended. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f2c98382fee41848265c9bee1754b483045a740e Author: John W. Linville Date: Tue May 4 15:48:48 2010 -0400 rtl8187: use SET_IEEE80211_PERM_ADDR Signed-off-by: John W. Linville Acked-by: Hin-Tak Leung commit 668eb65f092902eb7dd526af73d4a7f025a94612 Author: Thiago Farina Date: Sun Jan 24 11:03:50 2010 -0500 tracing: Fix "integer as NULL pointer" warning. kernel/trace/trace_output.c:256:24: warning: Using plain integer as NULL pointer Signed-off-by: Thiago Farina LKML-Reference: <1264349038-1766-3-git-send-email-tfransosi@gmail.com> Signed-off-by: Steven Rostedt commit 2e26ca7150a4f2ab3e69471dfc65f131e7dd7a05 Author: Steven Rostedt Date: Wed May 5 10:52:31 2010 -0400 tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header When more than one header is included under CREATE_TRACE_POINTS the DECLARE_TRACE() macro is not defined back to its original meaning and the second include will fail to initialize the TRACE_EVENT() and DECLARE_TRACE() correctly. To fix this the tracepoint.h file moves the define of DECLARE_TRACE() out of the #ifdef _LINUX_TRACEPOINT_H protection (just like the define of the TRACE_EVENT()). This way the define_trace.h will undef the DECLARE_TRACE() at the end and allow new headers to start from scratch. This patch also requires fixing the include/events/napi.h It currently uses DECLARE_TRACE() and should be converted to a TRACE_EVENT() format. But I'll leave that change to the authors of that file. But since the napi.h file depends on using the CREATE_TRACE_POINTS and does not define its own DEFINE_TRACE() it must use the define_trace.h method instead. Cc: Neil Horman Cc: David S. Miller Cc: Mathieu Desnoyers Signed-off-by: Steven Rostedt commit 1f138f13890afc824443a9cfcebe9ecae7727666 Author: Arnaud Patard Date: Thu Apr 22 10:47:45 2010 +0200 ARM: S3C24XX: s3c24xx_mci_set_platdata should be marked __init The s3c24xx_mci_set_platdata() is init time only, so should be marked as __init Signed-off-by: Arnaud Patard [ben-linux@fluff.org: update description] Signed-off-by: Ben Dooks commit f44c67cdc3182dd59cae299488687c6280027410 Author: Arnaud Patard Date: Thu Apr 22 10:47:44 2010 +0200 ARM: S3C24XX: fix s3c2410fb platdata passing Setting s3c2410fb_mach_info displays field with a struct marked as __initdata means it won't be available later for ioctls like FBIOPUT_VSCREENINFO and they will fail. Copying in s3c24xx_fb_set_platdata() is fixing this issue. Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks commit 17dcd13a3793d434c030dcf9c52ad0d43493b2a0 Author: Arnaud Patard Date: Thu Apr 22 10:47:43 2010 +0200 ARM: h1940: fix touchscreen support The touchscreen is using the adc device so it needs to be in the device list Signed-off-by: Arnaud Patard Signed-off-by: Ben Dooks commit 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 Author: Tetsuo Handa Date: Wed Apr 28 14:17:42 2010 +0900 TOMOYO: Use GFP_NOFS rather than GFP_KERNEL. In Ubuntu, security_path_*() hooks are exported to Unionfs. Thus, prepare for being called from inside VFS functions because I'm not sure whether it is safe to use GFP_KERNEL or not. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 4778e0e8c64f683a71632dba1cff1f85f76f83c4 Author: Arnaldo Carvalho de Melo Date: Wed May 5 11:23:27 2010 -0300 perf tools: Fixup minor doc formatting issues Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 9e32a3cb0661a6a30e0fd2b77ce85293805e6337 Author: Arnaldo Carvalho de Melo Date: Wed May 5 11:20:05 2010 -0300 perf list: Add explanation about raw hardware event descriptors Using explanation given by Ingo Molnar in the oprofile mailing list. Suggested-by: Nick Black Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Nick Black Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8a7c251871eff512fb380ea0e86c77ed901520fe Author: Jassi Brar Date: Tue Apr 27 15:57:05 2010 +0900 ASoC: S3C: I2S: Move set_sysclk to common code Now that we can specify feature of a particular controller, we can avoid multiple copies of same code by defining the CDCLKCON bit feature in controller specific code and detecting that flag in the code common to all controllers. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9e991a4bf3290b0787d33fa72144f6eec656f20d Author: Jassi Brar Date: Tue Apr 27 15:56:56 2010 +0900 ASoC: S3C: I2Sv2: New field for controller feature In order to make s3c-i2s-v2.c manage controllers with minor quirks and variation in features, we define a per-block flag that indicates the availability/lack of a particular feature to the s3c-i2s-v2.c While adding support for new SoCs' I2S, check for the blocks of older SoCs that have similar feature and set the flag for that feature. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d47ef9c79dd46c1b33696f01b6cf744b77150379 Author: Jassi Brar Date: Tue Apr 27 15:56:51 2010 +0900 ASoC: S3C64XX: I2S: Use s3c2412 defines Now that the fields are defined for s3c2412, use them and avoid having multiple copies of same defines. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5728242789d3538abcfdcb28e01798801efd9988 Author: Jassi Brar Date: Tue Apr 27 15:56:45 2010 +0900 ASoC: S3C: I2Sv2: Unify i2s_get_clock callback Now that we have two callbacks s3c2412_i2s_get_clock & s3c64xx_i2s_get_clock doing exactly the same thing, we can define one generic s3c_i2sv2_get_clock and discard other two copies. Also, switch the users to make calls to the newly defined and generic s3c_i2sv2_get_clock Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit db620b1c2fb172346dc54eb62bba9b4a117d173b Author: Tom Zanussi Date: Tue May 4 22:20:16 2010 -0500 perf/record: simplify TRACE_INFO tracepoint check Fix a couple of inefficiencies and redundancies related to have_tracepoints() and its use when checking whether to write TRACE_INFO. First, there's no need to use get_tracepoints_path() in have_tracepoints() - we really just want the part that checks whether any attributes correspondo to tracepoints. Second, we really don't care about raw_samples per se - tracepoints are always raw_samples. In any case, the have_tracepoints() check should be sufficient to decide whether or not to write TRACE_INFO. Cc: Frederic Weisbecker Cc: Ingo Molnar , Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Acked-by: Frederic Weisbecker LKML-Reference: <1273030770.6383.6.camel@tropicana> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit 21a7ad08e274ce7b669b165d65e0bab8391552a6 Author: Jassi Brar Date: Tue Apr 27 15:56:39 2010 +0900 ASoC: S3C: I2Sv2: Discard redundant field iis_clk No need to keep redundant field iis_clk in s3c_i2sv2_info. iis_cclk and iis_pclk is all we need. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d79696ff443eb16a1a13bd7db030a25fee9f44a7 Author: Jassi Brar Date: Tue Apr 27 15:56:34 2010 +0900 ASoC: S3C2412: I2S: Return correct source clock Until now, s3c2412_get_iisclk would return NULL since iis_clk was never initialized. Return appropriate pointer as per the selection made for source clock. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit ce76f9fd34d4d39fbda330f14b327273551e2f54 Author: Jassi Brar Date: Tue Apr 27 15:56:27 2010 +0900 ASoC: S3C2412: I2S: Debug IMS field The IMS field of s3c2412/13 is essentially the same as that of s3c64xx. That is, the IISMOD[11] bit decides Master/Slave mode and IISMOD[10] bit selects source clock for signal generation. For that reason, remove improper defines for IISMOD[11:10] field mask and define two 1bit fields that can be set independent of each other. As a consequence, corresponding fields for PLAT_S3C64XX too get to use these new defines. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b720d56294187ea4167a20e59c4ea0bb4f064132 Author: Jassi Brar Date: Tue Apr 27 15:56:03 2010 +0900 ASoC: SAMSUNG: I2S: Add bit definitions Define more bit definitions in the order of mainline support for the SoC. Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d07e7ce9b6fd1a4ff0a6b40c74fbecdc584a135b Author: Jassi Brar Date: Tue Apr 27 15:55:21 2010 +0900 ASoC: S3C: I2Sv2: Move defines closer to driver The header for I2Sv2 linux/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h contains only controller specific definitions and nothing SoC specific. So, it could be moved to sound/soc/s3c24xx/ Signed-off-by: Jassi Brar Acked-by: Ben Dooks Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 985d8c4c9eb18bd7b295c73a5ab1fc990e5ed182 Author: Mark Brown Date: Mon May 3 16:25:52 2010 +0100 ASoC: Add debug output tracing all cache register writes Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 9890948d857c2120c234b0ca91a80416e8f747fb Author: Arnaldo Carvalho de Melo Date: Tue May 4 20:58:51 2010 -0300 perf report: Make dso__calc_col_width agree with hist_entry__dso_snprintf The first was always using the ->long_name, while the later used ->short_name if verbose was not set, resulting in the dso column to be much wider than needed most of the time. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 762253741942d8ddbaca1c1ee62d7ed57544332b Author: Harro Haan Date: Mon Mar 1 17:54:55 2010 +0100 ARM: 5966/1: at91_udc HW glitch Add some delay to avoid reading CSR TXCOUNT too early after updating it. For more info about this HW glitch see: http://lists.arm.linux.org.uk/lurker/message/20090325.150843.f515c02f.en.html http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100129/10ba0f8b/attachment.el http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100203/09cdb3b4/attachment.el http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100203/08b5b249/attachment.el First applied: "Fix soft lockup in at91 udc driver" http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=5965 Signed-off-by: Anti Sullin Signed-off-by: Harro Haan Acked-by: Remy Bohmer Acked-by: Andrew Victor Signed-off-by: Russell King commit ec7d2f2cf3a1b76202986519ec4f8ec75b2de232 Author: Eric Dumazet Date: Wed May 5 01:07:37 2010 -0700 net: __alloc_skb() speedup With following patch I can reach maximum rate of my pktgen+udpsink simulator : - 'old' machine : dual quad core E5450 @3.00GHz - 64 UDP rx flows (only differ by destination port) - RPS enabled, NIC interrupts serviced on cpu0 - rps dispatched on 7 other cores. (~130.000 IPI per second) - SLAB allocator (faster than SLUB in this workload) - tg3 NIC - 1.080.000 pps without a single drop at NIC level. Idea is to add two prefetchw() calls in __alloc_skb(), one to prefetch first sk_buff cache line, the second to prefetch the shinfo part. Also using one memset() to initialize all skb_shared_info fields instead of one by one to reduce number of instructions, using long word moves. All skb_shared_info fields before 'dataref' are cleared in __alloc_skb(). Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8753d29fd5daf890004a38c80835e1eb3acda394 Author: Jiri Pirko Date: Wed May 5 00:56:33 2010 -0700 pppoe: remove unnecessary checks in pppoe_flush_dev pernet memory is guaranteed to exist when notifiers are called. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae Author: Mimi Zohar Date: Tue May 4 18:16:30 2010 -0400 ima: remove ACPI dependency The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI. This patch prereq's 'TPM: ACPI/PNP dependency removal' http://lkml.org/lkml/2010/5/4/378. Signed-off-by: Mimi Zohar Reported-by: Jean-Christophe Dubois Acked-by: Serge Hallyn Tested-by: Serge Hallyn Signed-off-by: James Morris commit b89e66e1e396f7b5436af154e58209320cc08aed Author: Rajiv Andrade Date: Tue May 4 18:49:20 2010 -0300 TPM: ACPI/PNP dependency removal This patch pushes the ACPI dependency into the device driver code itself. Now, even without ACPI/PNP enabled, the device can be registered using the TIS specified memory space. This will however result in the lack of access to the bios event log, being the only implication of such ACPI removal. Signed-off-by: Rajiv Andrade Acked-by: Mimi Zohar Signed-off-by: James Morris commit 7b20bd5fb902088579af4e70f7f802b93181a628 Author: Eric W. Biederman Date: Tue Mar 30 01:07:16 2010 -0700 x86, irq: Kill io_apic_renumber_irq Now that the generic irq layer is performing the exact same remapping as io_apic_renumber_irq we can kill this weird es7000 specific function. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-15-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 988856ee1623bd37e384105f7bb2b7fe44c009f6 Author: Eric W. Biederman Date: Tue Mar 30 01:07:15 2010 -0700 x86, acpi/irq: Handle isa irqs that are not identity mapped to gsi's. ACPI irq source overrides are allowed for the 16 isa irqs and are allowed to map any gsi to any isa irq. A few motherboards have been seen to take advantage of this and put the isa irqs on the 2nd or 3rd ioapic. This causes some problems, most notably the fact that we can not use any gsi < 16. To correct this move the gsis that are not isa irqs and have a gsi number < 16 into the linux irq space just past gsi_end. This is what the es7000 platform is doing today. Moving only the low 16 gsis above the rest of the gsi's only penalizes weird platforms, leaving sane acpi implementations with a 1-1 mapping of gsis and irqs. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-14-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 4afc51a835d3aeba11c35090f524e05c84586d27 Author: Eric W. Biederman Date: Tue Mar 30 01:07:14 2010 -0700 x86, ioapic: Simplify probe_nr_irqs_gsi. Use the global gsi_end value now that all ioapics have valid gsi numbers instead of a combination of acpi_probe_gsi and walking all of the ioapics and couting their number of entries by hand if acpi_probe_gsi gave us an answer we did not like. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-13-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit d464207c4fdd70c2a0febd4f9c58206fa915bb36 Author: Eric W. Biederman Date: Tue Mar 30 01:07:13 2010 -0700 x86, ioapic: Optimize pin_2_irq Now that all ioapics have valid gsi_base values use this to accellerate pin_2_irq. In the case of acpi this also ensures that pin_2_irq will compute the same irq value for an ioapic pin as acpi will. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-12-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 7716a5c4ff5f1f3dc5e9edcab125cbf7fceef0af Author: Eric W. Biederman Date: Tue Mar 30 01:07:12 2010 -0700 x86, ioapic: Move nr_ioapic_registers calculation to mp_register_ioapic. Now that all ioapic registration happens in mp_register_ioapic we can move the calculation of nr_ioapic_registers there from enable_IO_APIC. The number of ioapic registers is already calucated in mp_register_ioapic so all that really needs to be done is to save the caluclated value in nr_ioapic_registers. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-11-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit cf7500c0ea133d66f8449d86392d83f840102632 Author: Eric W. Biederman Date: Tue Mar 30 01:07:11 2010 -0700 x86, ioapic: In mpparse use mp_register_ioapic Long ago MP_ioapic_info was the primary way of setting up our ioapic data structures and mp_register_ioapic was a compatibility shim for acpi code. Now the situation is reversed and and mp_register_ioapic is the primary way of setting up our ioapic data structures. Keep the setting up of ioapic data structures uniform by having mp_register_ioapic call mp_register_ioapic. This changes a few fields: - type: is now hardset to MP_IOAPIC but type had to bey MP_IOAPIC or MP_ioapic_info would not have been called. - flags: is now hard coded to MPC_APIC_USABLE. We require flags to contain at least MPC_APIC_USEBLE in MP_ioapic_info and we don't ever examine flags so dropping a few flags that might possibly exist that we have never used is harmless. - apicaddr: Unchanged - apicver: Read from the ioapic instead of using the cached hardware value in the MP table. The real hardware value will be more accurate. - apicid: Now verified to be unique and changed if it is not. If the BIOS got this right this is a noop. If the BIOS did not fixing things appears to be the better solution. This adds gsi_base and gsi_end values to our ioapics defined with the mpatable, which will make our lives simpler later since we can always assume gsi_base and gsi_end are valid. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-10-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 5777372af5c929b8f3c706ed7b295b7279537c88 Author: Eric W. Biederman Date: Tue Mar 30 01:07:10 2010 -0700 x86, ioapic: Teach mp_register_ioapic to compute a global gsi_end Add the global variable gsi_end and teach mp_register_ioapic to keep it uptodate as we add more ioapics into the system. ioapics can only be added early in boot so the code that runs later can treat gsi_end as a constant. Remove the have hacks in sfi.c to second guess mp_register_ioapic by keeping t's own running total of how many gsi's have been seen, and instead use the gsi_end. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-9-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit eddb0c55a14074d6bac8c2ef169aefd7e2c6f139 Author: Eric W. Biederman Date: Tue Mar 30 01:07:09 2010 -0700 x86, ioapic: Fix the types of gsi values This patches fixes the types of gsi_base and gsi_end values in struct mp_ioapic_gsi, and the gsi parameter of mp_find_ioapic and mp_find_ioapic_pin A gsi is cannonically a u32, not an int. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-8-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 4b6b19a1c7302477653d799a53d48063dd53d555 Author: Eric W. Biederman Date: Tue Mar 30 01:07:08 2010 -0700 x86, ioapic: Fix io_apic_redir_entries to return the number of entries. io_apic_redir_entries has a huge conceptual bug. It returns the maximum redirection entry not the number of redirection entries. Which simply does not match what the name of the function. This just caught me and it caught Feng Tang, and Len Brown when they wrote sfi_parse_ioapic. Modify io_apic_redir_entries to actually return the number of redirection entries, and fix the callers so that they properly handle receiving the number of the number of redirection table entries, instead of the number of redirection table entries less one. While the usage in sfi.c does not show up in this patch it is fixed by virtue of the fact that io_apic_redir_entries now has the semantics sfi_parse_ioapic most reasonably expects. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-7-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 9638fa521e42c9281c874c6b5a382b1ced4ee496 Author: Eric W. Biederman Date: Tue Mar 30 01:07:07 2010 -0700 x86, ioapic: Only export mp_find_ioapic and mp_find_ioapic_pin in io_apic.h Multiple declarations of the same function in different headers is a pain to maintain. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-6-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 0fd52670fb6400be0996ac492b5ed77f3d83d69a Author: Eric W. Biederman Date: Tue Mar 30 01:07:06 2010 -0700 x86, acpi/irq: Generalize mp_config_acpi_legacy_irqs Remove the assumption that there is not an override for isa irq 0. Instead lookup the gsi and from that lookup the ioapic and pin of each isa irq indivdually. In general this should not have any behavioural affect but in perverse cases this gets all of the details correct, instead of doing something weird. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-5-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 9d2062b879495649bb525cf7979126da2e45d288 Author: Eric W. Biederman Date: Tue Mar 30 01:07:05 2010 -0700 x86, acpi/irq: Fix acpi_sci_ioapic_setup so it has both bus_irq and gsi Currently acpi_sci_ioapic_setup calls mp_override_legacy_irq with bus_irq == gsi, which is wrong if we are comming from an override Instead pass the bus_irq into acpi_sci_ioapic_setup. This fix was inspired by a similar fix from: Yinghai Lu Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-4-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 414d3448dbcb40807a1265ace64b2576ef919fbe Author: Eric W. Biederman Date: Tue Mar 30 01:07:04 2010 -0700 x86, acpi/irq: pci device dev->irq is an isa irq not a gsi Strictly speaking on x86 (where acpi is used) dev->irq must be a dual i8259 irq input aka an isa irq. Therefore we should translate that isa irq into a gsi before passing it to a function that takes a gsi. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-3-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 9a0a91bb56d2915cdb8585717de38376ad20fef9 Author: Eric W. Biederman Date: Tue Mar 30 01:07:03 2010 -0700 x86, acpi/irq: Teach acpi_get_override_irq to take a gsi not an isa_irq In perverse acpi implementations the isa irqs are not identity mapped to the first 16 gsi. Furthermore at least the extended interrupt resource capability may return gsi's and not isa irqs. So since what we get from acpi is a gsi teach acpi_get_overrride_irq to operate on a gsi instead of an isa_irq. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-2-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 2c2df8418ac7908eec4558407b83f16739006c54 Author: Eric W. Biederman Date: Tue Mar 30 01:07:02 2010 -0700 x86, acpi/irq: Introduce apci_isa_irq_to_gsi There are a number of cases where the current code makes the assumption that isa irqs identity map to the first 16 acpi global system intereupts. In most instances that assumption is correct as that is the required behaviour in dual i8259 mode and the default behavior in ioapic mode. However there are some systems out there that take advantage of acpis interrupt remapping for the isa irqs to have a completely different mapping of isa_irq to gsi. Introduce acpi_isa_irq_to_gsi to perform this mapping explicitly in the code that needs it. Initially this will be just the current assumed identity mapping to ensure it's introduction does not cause regressions. Signed-off-by: Eric W. Biederman LKML-Reference: <1269936436-7039-1-git-send-email-ebiederm@xmission.com> Signed-off-by: H. Peter Anvin commit 03d646e62b06e9364e2dbb939d67934c6c9826cd Author: Li Zefan Date: Mon Dec 21 14:27:24 2009 +0800 tracing: Make the documentation clear on trace_event boot option Make it clear that event-list is a comma separated list of events. Reported-by: KOSAKI Motohiro Signed-off-by: Li Zefan LKML-Reference: <4B2F154C.2060503@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 24797535e18ae219be1fc2632959327075bef5da Author: Prasad Joshi Date: Tue May 4 22:13:59 2010 +0200 logfs: initialize li->li_refcount li_refcount was not re-initialized in function logfs_init_inode(), small patch that will fix the problem Signed-off-by: Prasad Joshi Signed-off-by: Joern Engel commit e5e5b31e8c729b6bae569bec0790c655ee0121a1 Author: Peter Ujfalusi Date: Tue May 4 11:08:18 2010 +0300 ASoC: tpa6130a2: TLV mapping for tpa6140a2 Both tpa6130a2, and tpa6140a2 is supported by the same driver, but the gain dB scaling is different on the amplifiers. Provide different mixer control for the chips with correct TLV mapping. User space will see: "TPA6130A2 Headphone Playback Volume" in case of 6130 "TPA6140A2 Headphone Playback Volume" in case of 6140 The way machine drivers are using this amplifier remained the same. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit c693bf90cf968204f46edb820269ed380d9b7bba Author: John W. Linville Date: Tue May 4 15:46:15 2010 -0400 rtl8180: use SET_IEEE80211_PERM_ADDR Signed-off-by: John W. Linville commit 05ebad852901cf9127a743df6ea10c0e8b1590c3 Author: Joern Engel Date: Tue May 4 19:41:09 2010 +0200 logfs: commit reservations under space pressure Ensures we only return -ENOSPC when there really is no space. Signed-off-by: Joern Engel commit 20503664b008e17976bff1fdbc693c77ebd6f6c9 Author: Joern Engel Date: Mon May 3 20:54:34 2010 +0200 logfs: survive logfs_buf_recover read errors Refusing to mount beats a kernel crash. Signed-off-by: Joern Engel commit 4677d4a53e0d565742277e8913e91c821453e63e Author: Borislav Petkov Date: Mon May 3 14:57:11 2010 +0200 arch, hweight: Fix compilation errors Fix function prototype visibility issues when compiling for non-x86 architectures. Tested with crosstool (ftp://ftp.kernel.org/pub/tools/crosstool/) with alpha, ia64 and sparc targets. Signed-off-by: Borislav Petkov LKML-Reference: <20100503130736.GD26107@aftab> Signed-off-by: H. Peter Anvin commit df624ca5413d84b3082246de384823fbe8fed6e4 Author: Gertjan van Wingerde Date: Mon May 3 22:43:05 2010 +0200 rt2x00: Register frame length in TX entry descriptor instead of L2PAD. And use it consistently in the chipset drivers. Preparation for further clean ups. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit a21ee724034b21d51d74eec8e426702a627eb465 Author: Gertjan van Wingerde Date: Mon May 3 22:43:04 2010 +0200 rt2x00: Fix HT40+/HT40- setting in rt2800. Inspection of the Ralink vendor driver shows that the TX_BAND_CFG register and BBP register 3 are about HT40- indication, not about HT40+ indication. Inverse the meaning of these fields in the code. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 79a854f1e1a4482243fe4a2b199e199225b87bf6 Author: Gertjan van Wingerde Date: Mon May 3 22:43:03 2010 +0200 rt2x00: Enable RT30xx by default. Now that RT30xx support is at the same level as RT28xx support we can enable these devices by default. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit c2661486ebacc9c2a86757d8ff1d40b3efe8a08b Author: Gertjan van Wingerde Date: Mon May 3 22:43:02 2010 +0200 rt2x00: Remove rt2x00pci.h include from rt2800lib. PCI specific code has been remove quite some time ago. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 3d79b2a9eeaa066b35c49fbb17e3156a3c482c3e Author: Reinette Chatre Date: Mon May 3 10:55:07 2010 -0700 iwlwifi: recalculate average tpt if not current We currently have this check as a BUG_ON, which is being hit by people. Previously it was an error with a recalculation if not current, return that code. The BUG_ON was introduced by: commit 3110bef78cb4282c58245bc8fd6d95d9ccb19749 Author: Guy Cohen Date: Tue Sep 9 10:54:54 2008 +0800 iwlwifi: Added support for 3 antennas ... the portion adding the BUG_ON is reverted since we are encountering the error and BUG_ON was created with assumption that error is not encountered. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 591d8dd71cc265465ac706ac11e5f613c6181a43 Author: Rabin Vincent Date: Mon May 3 08:46:51 2010 +0100 ARM: 6090/1: ux500: add U5500 support Add basic support for the U5500 platform. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit cb165c52561fd5947747fdbdb0c7ad22c6138175 Author: Rabin Vincent Date: Mon May 3 08:42:07 2010 +0100 ARM: 6089/1: ux500: rename cpu-u8500.c to cpu-db8500.c Move the DB8500-specific file to a more appropriate name. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 817412d3a1391d4667494f16cd49455c62453c78 Author: Rabin Vincent Date: Mon May 3 08:31:35 2010 +0100 ARM: 6088/1: ux500: use UX500_* macros instead of U8500_* So that the correct addresses get used on U5500. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 41ac329f607add059ae8b063375c5d9d6e7471cf Author: Rabin Vincent Date: Mon May 3 08:28:05 2010 +0100 ARM: 6087/1: ux500: move sys_timer to cpu.c Move the common system timer setup code to cpu.c. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 5b1f7ddf18b75adeb433ef9d91a2e4bd7580facc Author: Rabin Vincent Date: Mon May 3 08:25:52 2010 +0100 ARM: 6086/1: ux500: move gpio devices to devices-db8500.c The GPIO layout is different on DB5500, so move the current one to devices-db8500.c. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit f9faf23799d0726afb56ee6c6c53fbea00ec7de3 Author: Rabin Vincent Date: Mon May 3 08:24:37 2010 +0100 ARM: 6085/1: ux500: reorganize i2c devices Move common i2c devices to devices.c and DB8500-specific I2C devices to devices-db8500.c. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 4b27aa4140c20380a67ecefaa48cf3714cc0b8ea Author: Rabin Vincent Date: Mon May 3 08:18:38 2010 +0100 ARM: 6084/1: ux500: move UART devices to devices.c The three PL011 UARTs are common among Ux500 SoCs, so move them to devices.c. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 9e4e7fe1a97191e373257ab59e3d6bbcce9a9f1e Author: Rabin Vincent Date: Mon May 3 08:03:52 2010 +0100 ARM: 6083/1: ux500: put DB8500-specific devices in devices-db8500.c Add devices-db8500.c for DB8500-specific devices, starting with SSP0. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit d48fd006e6d9394e9abd14f4747034f73bb6a386 Author: Rabin Vincent Date: Mon May 3 07:46:56 2010 +0100 ARM: 6082/1: ux500: put common devices into devices.c Introduce devices.c, for placing devices common among Ux500 SoCs. Start with the PL031 device. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit d67d1127a625cc5ebc3802180b19cc74f35b5578 Author: Rabin Vincent Date: Mon May 3 07:43:48 2010 +0100 ARM: 6081/1: ux500: move gpio macros to common header Move GPIO macros to a common header, and allow them to use the correct macros for the appropriate SoC, and be named accordingly. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 178980f98eef58607647eb66e178bf984bf81f4c Author: Rabin Vincent Date: Mon May 3 07:39:02 2010 +0100 ARM: 6080/1: ux500: move irq and common maps to cpu.c Move IRQ initialization and common io mapping setup code to cpu.c, renaming U8500* to UX500* along the way. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 39a982b4cda1b9c129094a411962348827412d50 Author: Rabin Vincent Date: Mon May 3 07:38:06 2010 +0100 ARM: 6079/1: ux500: allow choice of the DEBUG_LL UART Allow the UART used for DEBUG_LL to be selected. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit c9c0957286e73d01e98503f714d32180e6963757 Author: Rabin Vincent Date: Mon May 3 07:34:53 2010 +0100 ARM: 6078/1: ux500: add per-SoC register definitions Split up all the hardware register definitions previously found in hardware.h into per-SoC files db8500-regs.h and db5500-regs.h. Rename a couple of macros to prepare for sharing code between the variants. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit f38406bbfc5e1d4bd9726454ecb60ba52aa9da11 Author: Rabin Vincent Date: Mon May 3 07:27:31 2010 +0100 ARM: 6077/1: ux500: add SOC Kconfig variables This adds the different config options for SoCs DB8500 and DB5500 and refines the SoC/CPU detection code to support the DB5500 as well via these. The selection between DB5500 and DB8500 is currently a simple compile-time choice. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit c4f3b5a2d70eae4abb8bcaaf8dc3f067ff1714e8 Merge: 777d041 02bf60a Author: Ingo Molnar Date: Tue May 4 18:31:47 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 956097912c40a03bf22603a3be73503fd9ea9e44 Author: Borislav Petkov Date: Sun May 2 08:03:54 2010 +0200 ring-buffer: Wrap open-coded WARN_ONCE Wrap open-coded WARN_ONCE functionality into the equivalent macro. Signed-off-by: Borislav Petkov LKML-Reference: <20100502060354.GA5281@liondog.tnic> Signed-off-by: Steven Rostedt commit e8faff7330a3501eafc9bfe5f4f15af444be29f5 Author: Claudio Scordino Date: Mon May 3 13:31:28 2010 +0100 ARM: 6092/1: atmel_serial: support for RS485 communications Final version of the patch that adds support for RS485 communications to the atmel_serial driver. The patch has been already sent and discussed on both linux-kernel and linux-arm-kernel mailing lists several times. Many people collaborated to improve and test the code: Tested-by: Sebastian Heutling Tested-by: Bernhard Roth Reviewed-by: Ryan Mallon Signed-off-by: Claudio Scordino Signed-off-by: Michael Trimarchi Signed-off-by: Rick Bronson Signed-off-by: Sebastian Heutling Signed-off-by: Russell King commit 4c18e77f718cdda33363132127db4df795eadbd9 Author: viresh kumar Date: Mon May 3 09:24:30 2010 +0100 ARM: 6091/1: ST SPEAr: Adding support for shared irq layer Multiple peripherals in SPEAr share common hardware interrupt lines. This patch adds support for a shared irq layer, which registers hardware irqs by itself and exposes virtual irq numbers to peripherals. Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 5306293c9cd2caf41849cc909281bda628bb989e Merge: dbd65a7 66f41d4 Author: J. Bruce Fields Date: Tue May 4 11:27:05 2010 -0400 Merge commit 'v2.6.34-rc6' Conflicts: fs/nfsd/nfs4callback.c commit 4dbf6bc239c169b032777616806ecc648058f6b2 Author: Steven Rostedt Date: Tue May 4 11:24:01 2010 -0400 tracing: Convert nop macros to static inlines The ftrace.h file contains several functions as macros when the functions are disabled due to config options. This patch converts most of them to static inlines. There are two exceptions: register_ftrace_function() and unregister_ftrace_function() This is because their parameter "ops" must not be evaluated since code using the function is allowed to #ifdef out the creation of the parameter. This also fixes an error caused by recent changes: kernel/trace/trace_irqsoff.c: In function 'start_irqsoff_tracer': kernel/trace/trace_irqsoff.c:571: error: expected expression before 'do' Reported-by: Ingo Molnar Signed-off-by: Steven Rostedt commit dbd65a7e44fff4741a0b2c84bd6bace85d22c242 Author: Benny Halevy Date: Mon May 3 19:31:33 2010 +0300 nfsd4: use local variable in nfs4svc_encode_compoundres 'cs' is already computed, re-use it. Signed-off-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 02bf60aad7d5912dfcdbe0154f1bd67ea7a8301e Author: Anton Blanchard Date: Tue May 4 21:19:15 2010 +1000 perf: Fix performance issue with perf report On a large machine we spend a lot of time in perf_header__find_attr when running perf report. If we are parsing a file without PERF_SAMPLE_ID then for each sample we call perf_header__find_attr and loop through all counter IDs, never finding a match. As the machine gets larger there are more per cpu counters and we spend an awful lot of time in there. The patch below initialises each sample id to -1ULL and checks for this in perf_header__find_attr. We may need to do something more intelligent eventually (eg a hash lookup from counter id to attr) but this at least fixes the most common usage of perf report. Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Frederic Weisbecker Cc: Eric B Munson Acked-by: Eric B Munson LKML-Reference: <20100504111915.GB14636@kryten> Signed-off-by: Anton Blanchard -- Signed-off-by: Arnaldo Carvalho de Melo commit 11d232ec285b07860670277c8ab3f6076f7bce1e Author: Arnaldo Carvalho de Melo Date: Tue May 4 10:48:22 2010 -0300 perf inject: Add missing bits New commands need to have Documentation and be added to command-list.txt so that they can appear when 'perf' is called withouth any subcommand: [root@doppio linux-2.6-tip]# perf usage: perf [--version] [--help] COMMAND [ARGS] The most commonly used perf commands are: annotate Read perf.data (created by perf record) and display annotated code archive Create archive with object files with build-ids found in perf.data file bench General framework for benchmark suites buildid-cache Manage build-id cache. buildid-list List the buildids in a perf.data file diff Read two perf.data files and display the differential profile inject Filter to augment the events stream with additional information kmem Tool to trace/measure kernel memory(slab) properties kvm Tool to trace/measure kvm guest os list List all symbolic event types lock Analyze lock events probe Define new dynamic tracepoints record Run a command and record its profile into perf.data report Read perf.data (created by perf record) and display the profile sched Tool to trace/measure scheduler properties (latencies) stat Run a command and gather performance counter statistics test Runs sanity tests. timechart Tool to visualize total system behavior during a workload top System profiling tool. trace Read perf.data (created by perf record) and display trace output See 'perf help COMMAND' for more information on a specific command. [root@doppio linux-2.6-tip]# The new 'perf inject' command hadn't so it wasn't appearing on that list. Also fix the long option, that should have no spaces in it, rename the faulty one to be '--build-ids', instead of '--inject build-ids'. Reported-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d30d64c6da3ec7a0708bfffa7e05752d5b9a1093 Author: Robert Richter Date: Mon May 3 15:52:26 2010 +0200 oprofile/x86: reordering some functions Reordering some functions. Necessary for the next patch. No functional changes. Cc: Andi Kleen Signed-off-by: Robert Richter commit de654649737696ecf32873c341b305e30f3dc777 Author: Robert Richter Date: Mon May 3 14:41:22 2010 +0200 oprofile/x86: stop disabled counters in nmi handler This patch adds checks to the nmi handler. Now samples are only generated and counters reenabled, if the counters are running. Otherwise the counters are stopped, if oprofile is using the nmi. In other cases it will ignore the nmi notification. Cc: Andi Kleen Signed-off-by: Robert Richter commit 6ae56b55bc364bc2f2342f599b46581627ba22da Author: Robert Richter Date: Thu Apr 29 14:55:55 2010 +0200 oprofile/x86: protect cpu hotplug sections This patch reworks oprofile cpu hotplug code as follows: Introduce ctr_running variable to check, if counters are running or not. The state must be known for taking a cpu on or offline and when switching counters during counter multiplexing. Protect on_each_cpu() sections with get_online_cpus()/put_online_cpu() functions. This is necessary if notifiers or states are modified. Within these sections the cpu mask may not change. Switch only between counters in nmi_cpu_switch(), if counters are running. Otherwise the switch may restart a counter though they are disabled. Add nmi_cpu_setup() and nmi_cpu_shutdown() to cpu hotplug code. The function must also be called to avoid uninitialzed counter usage. Cc: Andi Kleen Signed-off-by: Robert Richter commit 216f3d9b4e5121feea4b13fae9d4c83e8d7e1c8a Author: Robert Richter Date: Mon May 3 11:58:46 2010 +0200 oprofile/x86: remove CONFIG_SMP macros CPU notifier register functions also exist if CONFIG_SMP is disabled. This change is part of hotplug code rework and also necessary for later patches. Cc: Andi Kleen Signed-off-by: Robert Richter commit 2623a1d55a6260c855e1f6d1895900b50b40a896 Author: Robert Richter Date: Mon May 3 19:44:32 2010 +0200 oprofile/x86: fix uninitialized counter usage during cpu hotplug This fixes a NULL pointer dereference that is triggered when taking a cpu offline after oprofile was initialized, e.g.: $ opcontrol --init $ opcontrol --start-daemon $ opcontrol --shutdown $ opcontrol --deinit $ echo 0 > /sys/devices/system/cpu/cpu1/online See the crash dump below. Though the counter has been disabled the cpu notifier is still active and trying to use already freed counter data. This fix is for linux-stable. To proper fix this, the hotplug code must be rewritten. Thus I will leave a WARN_ON_ONCE() message with this patch. BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] op_amd_stop+0x2d/0x8e PGD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/system/cpu/cpu1/online CPU 1 Modules linked in: Pid: 0, comm: swapper Not tainted 2.6.34-rc5-oprofile-x86_64-standard-00210-g8c00f06 #16 Anaheim/Anaheim RIP: 0010:[] [] op_amd_stop+0x2d/0x8e RSP: 0018:ffff880001843f28 EFLAGS: 00010006 RAX: 0000000000000000 RBX: 0000000000000000 RCX: dead000000200200 RDX: ffff880001843f68 RSI: dead000000100100 RDI: 0000000000000000 RBP: ffff880001843f48 R08: 0000000000000000 R09: ffff880001843f08 R10: ffffffff8102c9a5 R11: ffff88000184ea80 R12: 0000000000000000 R13: ffff88000184f6c0 R14: 0000000000000000 R15: 0000000000000000 FS: 00007fec6a92e6f0(0000) GS:ffff880001840000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000000 CR3: 000000000163b000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper (pid: 0, threadinfo ffff88042fcd8000, task ffff88042fcd51d0) Stack: ffff880001843f48 0000000000000001 ffff88042e9f7d38 ffff880001843f68 <0> ffff880001843f58 ffffffff8132a602 ffff880001843f98 ffffffff810521b3 <0> ffff880001843f68 ffff880001843f68 ffff880001843f88 ffff88042fcd9fd8 Call Trace: [] nmi_cpu_stop+0x21/0x23 [] generic_smp_call_function_single_interrupt+0xdf/0x11b [] smp_call_function_single_interrupt+0x22/0x31 [] call_function_single_interrupt+0x13/0x20 [] ? wake_up_process+0x10/0x12 [] ? default_idle+0x22/0x37 [] c1e_idle+0xdf/0xe6 [] ? atomic_notifier_call_chain+0x13/0x15 [] cpu_idle+0x4b/0x7e [] start_secondary+0x1ae/0x1b2 Code: 89 e5 41 55 49 89 fd 41 54 45 31 e4 53 31 db 48 83 ec 08 89 df e8 be f8 ff ff 48 98 48 83 3c c5 10 67 7a 81 00 74 1f 49 8b 45 08 <42> 8b 0c 20 0f 32 48 c1 e2 20 25 ff ff bf ff 48 09 d0 48 89 c2 RIP [] op_amd_stop+0x2d/0x8e RSP CR2: 0000000000000000 ---[ end trace 679ac372d674b757 ]--- Kernel panic - not syncing: Fatal exception in interrupt Pid: 0, comm: swapper Tainted: G D 2.6.34-rc5-oprofile-x86_64-standard-00210-g8c00f06 #16 Call Trace: [] panic+0x9e/0x10c [] ? up+0x34/0x39 [] ? kmsg_dump+0x112/0x12c [] oops_end+0x81/0x8e [] no_context+0x1f3/0x202 [] __bad_area_nosemaphore+0x1ba/0x1e0 [] ? enqueue_task_fair+0x16d/0x17a [] ? activate_task+0x42/0x53 [] ? try_to_wake_up+0x272/0x284 [] bad_area_nosemaphore+0xe/0x10 [] do_page_fault+0x1c8/0x37c [] ? enqueue_task_fair+0x16d/0x17a [] page_fault+0x1f/0x30 [] ? wake_up_process+0x10/0x12 [] ? op_amd_stop+0x2d/0x8e [] ? op_amd_stop+0x1c/0x8e [] nmi_cpu_stop+0x21/0x23 [] generic_smp_call_function_single_interrupt+0xdf/0x11b [] smp_call_function_single_interrupt+0x22/0x31 [] call_function_single_interrupt+0x13/0x20 [] ? wake_up_process+0x10/0x12 [] ? default_idle+0x22/0x37 [] c1e_idle+0xdf/0xe6 [] ? atomic_notifier_call_chain+0x13/0x15 [] cpu_idle+0x4b/0x7e [] start_secondary+0x1ae/0x1b2 ------------[ cut here ]------------ WARNING: at /local/rrichter/.source/linux/arch/x86/kernel/smp.c:118 native_smp_send_reschedule+0x27/0x53() Hardware name: Anaheim Modules linked in: Pid: 0, comm: swapper Tainted: G D 2.6.34-rc5-oprofile-x86_64-standard-00210-g8c00f06 #16 Call Trace: [] ? native_smp_send_reschedule+0x27/0x53 [] warn_slowpath_common+0x77/0xa4 [] warn_slowpath_null+0xf/0x11 [] native_smp_send_reschedule+0x27/0x53 [] resched_task+0x60/0x62 [] check_preempt_curr_idle+0x10/0x12 [] try_to_wake_up+0x1f5/0x284 [] default_wake_function+0xd/0xf [] pollwake+0x57/0x5a [] ? default_wake_function+0x0/0xf [] __wake_up_common+0x46/0x75 [] __wake_up+0x38/0x50 [] printk_tick+0x39/0x3b [] update_process_times+0x3f/0x5c [] tick_periodic+0x5d/0x69 [] tick_handle_periodic+0x21/0x71 [] smp_apic_timer_interrupt+0x82/0x95 [] apic_timer_interrupt+0x13/0x20 [] ? panic_blink_one_second+0x0/0x7b [] ? panic+0x10a/0x10c [] ? up+0x34/0x39 [] ? kmsg_dump+0x112/0x12c [] ? oops_end+0x81/0x8e [] ? no_context+0x1f3/0x202 [] ? __bad_area_nosemaphore+0x1ba/0x1e0 [] ? enqueue_task_fair+0x16d/0x17a [] ? activate_task+0x42/0x53 [] ? try_to_wake_up+0x272/0x284 [] ? bad_area_nosemaphore+0xe/0x10 [] ? do_page_fault+0x1c8/0x37c [] ? enqueue_task_fair+0x16d/0x17a [] ? page_fault+0x1f/0x30 [] ? wake_up_process+0x10/0x12 [] ? op_amd_stop+0x2d/0x8e [] ? op_amd_stop+0x1c/0x8e [] ? nmi_cpu_stop+0x21/0x23 [] ? generic_smp_call_function_single_interrupt+0xdf/0x11b [] ? smp_call_function_single_interrupt+0x22/0x31 [] ? call_function_single_interrupt+0x13/0x20 [] ? wake_up_process+0x10/0x12 [] ? default_idle+0x22/0x37 [] ? c1e_idle+0xdf/0xe6 [] ? atomic_notifier_call_chain+0x13/0x15 [] ? cpu_idle+0x4b/0x7e [] ? start_secondary+0x1ae/0x1b2 ---[ end trace 679ac372d674b758 ]--- Cc: Andi Kleen Cc: stable Signed-off-by: Robert Richter commit 5bdb7934ca4115a12c7d585c5a45312b1c36909b Author: Robert Richter Date: Wed Mar 31 11:58:36 2010 +0200 oprofile/x86: remove duplicate IBS capability check The check is already done in ibs_exit(). Signed-off-by: Robert Richter commit da759fe5be24ec3b236a76c007b460cf6caf2009 Author: Robert Richter Date: Fri Feb 26 10:54:56 2010 +0100 oprofile/x86: move IBS code Moving code to make future changes easier. This groups all IBS code together. Signed-off-by: Robert Richter commit 8617f98c001d00b176422d707e6a67b88bcd7e0d Author: Robert Richter Date: Fri Feb 26 17:20:55 2010 +0100 oprofile/x86: return -EBUSY if counters are already reserved In case a counter is already reserved by the watchdog or perf_event subsystem, oprofile ignored this counters silently. This case is handled now and oprofile_setup() now reports an error. Signed-off-by: Robert Richter commit 83300ce0df6b72e156b386457aa0f0902b8c0a98 Author: Robert Richter Date: Tue Mar 23 20:01:54 2010 +0100 oprofile/x86: moving shutdown functions Moving some code in preparation of the next patch. Signed-off-by: Robert Richter commit d0e4120fda6f87eead438eed4d49032e12060e58 Author: Robert Richter Date: Tue Mar 23 19:33:21 2010 +0100 oprofile/x86: reserve counter msrs pairwise For AMD's and Intel's P6 generic performance counters have pairwise counter and control msrs. This patch changes the counter reservation in a way that both msrs must be registered. It joins some counter loops and also removes the unnecessary NUM_CONTROLS macro in the AMD implementation. Signed-off-by: Robert Richter commit 8f5a2dd83a1f8e89fdc17eb0f2f07c2e713e635a Author: Robert Richter Date: Tue Mar 23 19:09:51 2010 +0100 oprofile/x86: rework error handler in nmi_setup() This patch improves the error handler in nmi_setup(). Most parts of the code are moved to allocate_msrs(). In case of an error allocate_msrs() also frees already allocated memory. nmi_setup() becomes easier and better extendable. Signed-off-by: Robert Richter commit 30ba3ead05763b172acaa65ae1be71af2a878940 Author: Sriramakrishnan Govindarajan Date: Mon May 3 23:47:12 2010 -0700 Input: add keypad driver for keys interfaced to TCA6416 This patch implements a simple Keypad driver that functions as an I2C client. It handles key press events for keys connected to TCA6416 I2C based IO expander. Signed-off-by: Sriramakrishnan Signed-off-by: Dmitry Torokhov commit 777d0411cd1e384115985dac5ccd42031e3eee2b Author: Frederic Weisbecker Date: Mon May 3 15:39:45 2010 +0200 hw_breakpoints: Fix percpu build failure Fix this build error: kernel/hw_breakpoint.c:58:1: error: pasting "__pcpu_scope_" and "*" does not give a valid preprocessing token It happens if CONFIG_DEBUG_FORCE_WEAK_PER_CPU, because we concatenate someting with the name and we have the "*" in the name. Cc: Frederic Weisbecker Cc: Will Deacon Cc: Paul Mundt Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Jason Wessel LKML-Reference: <20100503133942.GA5497@nowhere> Signed-off-by: Ingo Molnar commit 0a12761bcd5646691c5d16dd93df84d1b8849285 Author: David S. Miller Date: Mon May 3 23:33:05 2010 -0700 forcedeth: Kill NAPI config options. All distributions enable it, therefore no significant body of users are even testing the driver with it disabled. And making NAPI configurable is heavily discouraged anyways. I left the MSI-X interrupt enabling thing in an "#if 0" block so hopefully someone can debug that and it can get re-enabled. Probably it was just one of the NVIDIA chipset MSI erratas that we work handle these days in the PCI quirks (see drivers/pci/quirks.c and stuff like nvenet_msi_disable()). Signed-off-by: David S. Miller commit 16b32e0c9eec1bb8d53deedcd9f4704a114d84bb Author: Eric Miao Date: Mon May 3 23:29:58 2010 -0700 Input: remove obsolete {corgi,spitz,tosa}kbd.c Signed-off-by: Eric Miao Signed-off-by: Dmitry Torokhov commit 53f224cc5f8f650f8e8d86abbe990c93f12834c8 Author: Tom Herbert Date: Mon May 3 19:08:45 2010 +0000 forcedeth: GRO support Add GRO support to forcedeth. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 93bb64eac10aad3dae6178d7da94765f207d121f Author: Eric Dumazet Date: Mon May 3 23:18:14 2010 -0700 net: skb_free_datagram_locked() fix Commit 4b0b72f7dd617b ( net: speedup udp receive path ) introduced a bug in skb_free_datagram_locked(). We should not skb_orphan() skb if we dont have the guarantee we are the last skb user, this might happen with MSG_PEEK concurrent users. To keep socket locked for the smallest period of time, we split consume_skb() logic, inlined in skb_free_datagram_locked() Reported-by: Stephen Hemminger Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 54d47a2be5e7f928fb77b2f5a0761f6bd3c9dbff Author: Frederic Weisbecker Date: Tue May 4 04:54:47 2010 +0200 lockdep: No need to disable preemption in debug atomic ops No need to disable preemption in the debug_atomic_* ops, as we ensure interrupts are disabled already. So let's use the __this_cpu_ops() rather than this_cpu_ops() that enclose the ops in a preempt disabled section. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra commit fa9a97dec611c5356301645d576b523ce3919eba Author: Frederic Weisbecker Date: Tue May 4 04:52:48 2010 +0200 lockdep: Actually _dec_ in debug_atomic_dec Fix a silly copy-paste mistake that was making debug_atomic_dec use this_cpu_inc instead of this_cpu_dec. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra commit ba697f40dbb704956a4cf67a7845b538015a01ea Author: Frederic Weisbecker Date: Tue May 4 04:47:25 2010 +0200 lockdep: Provide off case for redundant_hardirqs_on increment We forgot to provide a !CONFIG_DEBUG_LOCKDEP case for the redundant_hardirqs_on stat handling. Manage that in the headers with a new __debug_atomic_inc() helper. Fixes: kernel/lockdep.c:2306: error: 'lockdep_stats' undeclared (first use in this function) kernel/lockdep.c:2306: error: (Each undeclared identifier is reported only once kernel/lockdep.c:2306: error: for each function it appears in.) Reported-by: Ingo Molnar Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra commit f5460618405eec8c3300947a499011528a115acd Merge: 4f70ecc 0e3aef8 Author: David S. Miller Date: Mon May 3 16:20:44 2010 -0700 Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev Add missing linux/vmalloc.h include to net/sctp/probe.c Signed-off-by: David S. Miller commit 4f70ecca9c57731b4acbe5043eb22e4416bd2368 Author: Eric Dumazet Date: Mon May 3 10:50:14 2010 +0000 net: rcu fixes Add hlist_for_each_entry_rcu_bh() and hlist_for_each_entry_continue_rcu_bh() macros, and use them in ipv6_get_ifaddr(), if6_get_first() and if6_get_next() to fix lockdeps warnings. Signed-off-by: Eric Dumazet Reviewed-by: "Paul E. McKenney" Signed-off-by: David S. Miller commit 097c1bd5673edaf2a162724636858b71f658fdd2 Author: H. Peter Anvin Date: Mon May 3 15:49:31 2010 -0700 x86, cpu: Make APERF/MPERF a normal table-driven flag APERF/MPERF can be handled via the table like all the other scattered CPU flags. Signed-off-by: H. Peter Anvin Cc: Thomas Renninger Cc: Borislav Petkov LKML-Reference: <1270065406-1814-4-git-send-email-bp@amd64.org> commit 52a60ed2da716105de5f906a3630c475264b87d5 Author: David S. Miller Date: Mon May 3 15:48:29 2010 -0700 phy/micrel: Add module device ID table for autoloading. Signed-off-by: David S. Miller commit 0f7ca5917e989c4f77db3e97f92badaf3266d4dc Merge: a2f3be1 d050700 Author: David S. Miller Date: Mon May 3 15:45:52 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit a2f3be17c07ad9bd45ab300f79642ecb39cfb553 Author: Ilpo Järvinen Date: Mon May 3 03:22:18 2010 +0000 unix/garbage: kill copy of the skb queue walker Worse yet, it seems that its arguments were in reverse order. Also remove one related helper which seems hardly worth keeping. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 55afbd0810922afe456f9e4e3abc84d69d3f8a15 Author: Michael S. Tsirkin Date: Thu Apr 29 13:50:48 2010 +0300 macvtap: add ioctl to modify vnet header size This adds TUNSETVNETHDRSZ/TUNGETVNETHDRSZ support to macvtap. Signed-off-by: Michael S. Tsirkin Acked-by: Arnd Bergmann Acked-by: David S. Miller commit 26d27844dfb1d84eafa886f150098c54e192c260 Author: David S. Miller Date: Mon May 3 15:18:22 2010 -0700 Revert "ixgbe: disable MSI-X by default on certain Cisco adapters" This reverts commit d5ffd75a27fade39ba5df3b07290c5a2c297b9bd. As requested by Jeff Kircher. Signed-off-by: David S. Miller commit 941f81c16ec7497ecce6f1f611277d67e89bdfe1 Merge: e220ba6 478ea14 Author: Russell King Date: Mon May 3 22:37:06 2010 +0100 Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable commit d88d95eb1c2a72b6126a550debe0883ff723a948 Author: Borislav Petkov Date: Sat Apr 24 09:56:53 2010 +0200 x86, k8: Fix build error when K8_NB is disabled K8_NB depends on PCI and when the last is disabled (allnoconfig) we fail at the final linking stage due to missing exported num_k8_northbridges. Add a header stub for that. Signed-off-by: Borislav Petkov LKML-Reference: <20100503183036.GJ26107@aftab> Signed-off-by: H. Peter Anvin commit 81c4a8a6733ad2ff49c0e077b51403367601b3e7 Author: Robert Richter Date: Thu Apr 22 19:14:49 2010 +0200 oprofile: update file list in MAINTAINERS file File list now catches: $ xargs | eval ls -d $(cat) | sort -u arch/*/include/asm/oprofile*.h arch/*/oprofile/ drivers/oprofile/ include/linux/oprofile.h arch/alpha/oprofile/ arch/arm/oprofile/ arch/avr32/oprofile/ arch/blackfin/oprofile/ arch/ia64/oprofile/ arch/m32r/oprofile/ arch/microblaze/oprofile/ arch/mips/oprofile/ arch/mn10300/oprofile/ arch/parisc/oprofile/ arch/powerpc/include/asm/oprofile_impl.h arch/powerpc/oprofile/ arch/s390/oprofile/ arch/sh/oprofile/ arch/sparc/oprofile/ arch/x86/oprofile/ drivers/oprofile/ include/linux/oprofile.h Signed-off-by: Robert Richter commit 57475b1a47b3e891ce087ca3c6fc93f5a446a244 Author: Simon Guinot Date: Mon Feb 8 19:08:34 2010 +0100 [ARM] Kirkwood: merge net2big_v2 and net5big_v2 board setups Signed-off-by: Nicolas Pitre commit 3e05ec1b93cd839fa1d1a9961b155b0dbc9a4055 Author: Simon Guinot Date: Mon Jan 4 20:20:07 2010 +0100 [ARM] Kirkwood: add LaCie 5Big Network v2 support Signed-off-by: Nicolas Pitre commit 9414e99672271adcc661f3c160a30b374179b92f Author: Phil Carmody Date: Wed Apr 28 12:09:16 2010 -0500 oprofile: protect from not being in an IRQ context http://lkml.org/lkml/2010/4/27/285 Protect against dereferencing regs when it's NULL, and force a magic number into pc to prevent too deep processing. This approach permits the dropped samples to be tallied as invalid Instruction Pointer events. e.g. output from about 15mins at 10kHz sample rate: Nr. samples received: 2565380 Nr. samples lost invalid pc: 4 Signed-off-by: Phil Carmody Signed-off-by: Robert Richter commit 2a49456fdae0cc9e4286de38b8fcb85f9c7c7559 Author: Simon Guinot Date: Wed Feb 3 01:41:09 2010 +0100 [ARM] Kirkwood: add LaCie 2Big Network v2 support Signed-off-by: Nicolas Pitre commit 18e2842b85a00158054b5751c4e5a1b56906895f Author: Nicolas Pitre Date: Mon May 3 16:43:47 2010 -0400 update MAINTAINERS file I'm no longer at Marvell. Ditto for Lennert. I don't hack on SMC91x much either these days. Signed-off-by: Nicolas Pitre commit 250825008f1f94887bc039e9227a8adfb5ba366e Author: Brian Gerst Date: Sun Mar 21 09:00:46 2010 -0400 x86-32: Don't set ignore_fpu_irq in simd exception Any processor that supports simd will have an internal fpu, and the irq13 handler will not be enabled. Signed-off-by: Brian Gerst LKML-Reference: <1269176446-2489-5-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit e2e75c915de045f0785387dc32f55e92fab0614c Author: Brian Gerst Date: Sun Mar 21 09:00:45 2010 -0400 x86: Merge kernel_math_error() into math_error() Clean up the kernel exception handling and make it more similar to the other traps. Signed-off-by: Brian Gerst LKML-Reference: <1269176446-2489-4-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 9b6dba9e0798325dab427b9d60c61630ccc39b28 Author: Brian Gerst Date: Sun Mar 21 09:00:44 2010 -0400 x86: Merge simd_math_error() into math_error() The only difference between FPU and SIMD exceptions is where the status bits are read from (cwd/swd vs. mxcsr). This also fixes the discrepency introduced by commit adf77bac, which fixed FPU but not SIMD. Signed-off-by: Brian Gerst LKML-Reference: <1269176446-2489-3-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 40d2e76315da38993129090dc5d56377e573c312 Author: Brian Gerst Date: Sun Mar 21 09:00:43 2010 -0400 x86-32: Rework cache flush denied handler The cache flush denied error is an erratum on some AMD 486 clones. If an invd instruction is executed in userspace, the processor calls exception 19 (13 hex) instead of #GP (13 decimal). On cpus where XMM is not supported, redirect exception 19 to do_general_protection(). Also, remove die_if_kernel(), since this was the last user. Signed-off-by: Brian Gerst LKML-Reference: <1269176446-2489-2-git-send-email-brgerst@gmail.com> Signed-off-by: H. Peter Anvin commit 5ccc8dab611fcd1d0961b73e22d6c2d108967862 Author: Arnaud Patard Date: Sat Apr 3 10:31:33 2010 +0200 [ARM] dns323-setup.c: fix WARN() when booting Since commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a, dns323_init() is setting the power led gpio direction with gpio_direction_output() but doesn't request the gpio before (which is not permitted by the gpio layer afaik). This behaviour is triggering a WARN() at boot time. Tested-by: Christian Samsel Cc: Martin Michlmayr Signed-off-by: Arnaud Patard Signed-off-by: Nicolas Pitre [ Part 2: "Attached Text" ] commit d8f089d2ad35861c432618900fa08ca70c168d76 Author: Siddarth Gore Date: Mon Mar 22 02:28:20 2010 -0700 [ARM] Kirkwood: Marvell GuruPlug support GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot References: http://www.globalscaletechnologies.com/t-guruplugdetails.aspx http://plugcomputer.org This patch is for GuruPlug Plus, but it supports Standard version as well. Signed-off-by: Siddarth Gore Signed-off-by: Nicolas Pitre commit 52c773861895faaf544bd398c87ba10dff29f313 Author: John W. Linville Date: Mon May 3 16:12:39 2010 -0400 iwmc3200wifi: fix busted iwm_debugfs_init definition Looks like we missed removing the return statement in the non-CONFIG_IWM_DEBUG dummy implementation of iwm_debugfs_init... Signed-off-by: John W. Linville commit 1d7d969dd0b467ba32cf3829e8bf104a5084150d Merge: 12ef116 f8478df Author: John W. Linville Date: Mon May 3 14:53:49 2010 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 12ef116bf750c221e214e33c61e7f4c98300b5fd Author: Xose Vazquez Perez Date: Mon May 3 13:11:38 2010 +0200 wireless: rt2x00: rt2800usb: be in sync with latest windows drivers. 0x07d1,0x3c17 D-Link Wireless N 150 USB Adapter DWA-125 0x1b75,0x3071 Ovislink Airlive WN-301USB 0x1d4d,0x0011 Pegatron Ralink RT3072 802.11b/g/n Wireless Lan USB Device 0x083a,0xf511 Arcadyan 802.11 USB Wireless LAN Card 0x13d3,0x3322 AzureWave 802.11 n/g/b USB Wireless LAN Card Signed-off-by: Xose Vazquez Perez Signed-off-by: John W. Linville commit 23ff98fc21615e324647af540a4ec1c24f993687 Author: Johannes Berg Date: Mon May 3 09:21:14 2010 +0200 mac80211_hwsim: fix double-scan detection Currently, hwsim will always detect a double scan after the first one has finished ... Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit be4a4b6a5d2f76393f545a2545fbaa1b65577e13 Author: Johannes Berg Date: Mon May 3 08:49:48 2010 +0200 mac80211: improve IBSS scanning When IBSS is fixed to a frequency, it can still scan to try to find the right BSSID. This makes sense if the BSSID isn't also fixed, but it need not scan all channels -- just one is sufficient. Make it do that by moving the scan setup code to ieee80211_request_internal_scan() and include a channel variable setting. Note that this can be further improved to start the IBSS right away if both frequency and BSSID are fixed. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit a75b4363eaafa99d909da4f1192322a78b074c73 Author: Johannes Berg Date: Sat May 1 18:53:51 2010 +0200 mac80211: allow controlling aggregation manually This allows enabling TX and disabling both TX and RX aggregation sessions manually in debugfs. It is very useful for debugging session initiation and teardown problems since with this you don't have to force a lot of traffic to get aggregation and thus have less data to analyse. Also, to debug mac80211 code itself, make hwsim "support" aggregation sessions. It will still just transfer the frame, but go through the setup and teardown handshakes. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 07cefe7ac983374ee4c369f1d4aee3093bf3b44f Author: David Kilroy Date: Sat May 1 14:05:43 2010 +0100 orinoco_usb: implement fw download This involves some refactorring of the common fw download code to substitute ezusb versions of various functions. Note that WPA-enabled firmwares (9.xx series) will not work fully with orinoco_usb yet. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit fc97431a50962e66c052ec6909d4b2582efd3554 Author: David Kilroy Date: Sat May 1 14:05:42 2010 +0100 orinoco_usb: avoid in_atomic We expect to be either in process contect or soft interrupt context. So use in_softirq instead. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 9afac70a7305817b22327ac23cf2d0eb72388229 Author: David Kilroy Date: Sat May 1 14:05:41 2010 +0100 orinoco: add orinoco_usb driver This driver uses the core orinoco modules for the bulk of the functionality. The low level hermes routines (for local bus cards) are replaced, the driver supplies its own ndo_xmit_start function, and locking is done with the _bh variant. Some recent functionality is not available to the USB cards yet (firmware loading and WPA). Out-of-tree driver originally written by Manuel Estrada Sainz. Thanks to Mark Davis for supplying hardware to test the updates. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit bcad6e80f3fb0d6724c3814cf32258bbcf1d67db Author: David Kilroy Date: Sat May 1 14:05:40 2010 +0100 orinoco: encapsulate driver locking Local bus and USB drivers will need to do locking differently. The original orinoco_usb patches had a boolean variable controlling whether spin_lock_bh was used, or irq based locking. This version provides wrappers for the lock functions and the drivers specify the functions pointers needed. This will introduce a performance penalty, but I'm not expecting it to be noticable. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 593ef09c9e70c92c0d76c67a1c03a5d44d3aec82 Author: David Kilroy Date: Sat May 1 14:05:39 2010 +0100 orinoco: allow driver to specify netdev_ops Allow the main drivers to specify a custom version of the net_device_ops structure. This is required by orinoco_usb to supply a separate transmit function. Export existing net_device_ops callbacks so that the drivers can reuse some of the existing code. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit b42f2074dedef559ecf72dce61a6501f9f9b273a Author: David Kilroy Date: Sat May 1 14:05:38 2010 +0100 orinoco: add hermes_ops Pave the way for introducing USB alternative functions. Force callers to dereference ops instead of providing wrappers. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit f7c65594f7148b778f41d591a701e94bb22428e4 Author: Johannes Berg Date: Fri Apr 30 13:48:36 2010 +0200 mac80211: fix ieee80211_find_sta[_by_hw] Both of these functions can currently return a station pointer that, to the driver, is invalid (in IBSS mode only) because adding the station failed. Check for that, and also make ieee80211_find_sta() properly use the per interface station search. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c7ab1a4dcb8fb63364e9460b1182da6eae5f0d16 Author: John W. Linville Date: Thu Apr 29 15:56:25 2010 -0400 b43legacy: Added get_survey callback in order to get channel noise Signed-off-by: John W. Linville commit 354b4f04f2aa9d9652ecd5a4cdace784c7cfcca8 Author: John W. Linville Date: Thu Apr 29 15:56:06 2010 -0400 b43: Added get_survey callback in order to get channel noise Signed-off-by: John W. Linville commit 91639c76bfd9d27ac54a3c521a2559d02f409ebe Author: John W. Linville Date: Wed Apr 28 17:00:52 2010 -0400 rt2x00: remove now unused noise field from struct rxdone_entry_desc Signed-off-by: John W. Linville Acked-by: Gertjan van Wingerde commit 1f55c12cef6d369d76ae13d522edd1c07e667788 Author: John W. Linville Date: Mon May 3 14:46:05 2010 -0400 iwmc3200wifi: cleanup unneeded debugfs error handling "iwl: cleanup: remove unneeded error handling" missed the one in if_sdio_debugfs_init(). I don't think we even need to check -ENODEV ourselves because if DEBUG_FS is not compiled in, all the debugfs utility functions will become no-op. Reported-by: Dan Carpenter Signed-off-by: Zhu Yi Acked-by: Dan Carpenter Signed-off-by: John W. Linville commit e220ba60223a9d63e70217e5b112160df8c21cea Author: Dave Estes Date: Tue Aug 11 17:58:49 2009 -0400 arm: mm: qsd8x50: Fix incorrect permission faults Handle incorrectly reported permission faults for qsd8650. On permission faults, retry MVA to PA conversion. If retry detects translation fault. Report as translation fault. Cc: Jamie Lokier Signed-off-by: Dave Estes commit ee3c454b8da04815c1884ed85fe89d2d131c0e51 Author: Daniel Walker Date: Fri Jan 1 14:52:30 2010 -0800 arm: msm: add oprofile pmu support add oprofile pmu support for msm. Signed-off-by: Daniel Walker commit 4b536b8d909f4e3dfa84fa7a63fbc5896e3490e8 Author: Steve Muckle Date: Mon Dec 29 16:17:22 2008 -0500 arm: msm: define HAVE_CLK for ARCH_MSM MSM supports the interface. Acked-by: David Brown Signed-off-by: Steve Muckle commit 4b53eb4f5d78416456bb969ce30e3bed2731d744 Author: Daniel Walker Date: Fri Jan 1 15:11:43 2010 -0800 arm: msm: allow ARCH_MSM to have v7 cpus ARCH_MSM supports armv7 cpus, so we're pushed the CPU_V6/CPU_V7 selection down into the arch/arm/mach-msm/Kconfig. Also update the description to be a bit more accurate. Signed-off-by: Daniel Walker commit 7d7fb0e6eb78600e5d4fb0f28858e97d38ef6bbf Author: Henrik Kretzschmar Date: Wed Apr 28 12:25:02 2010 +0200 cocbalt_lcdfb: correct sections Since the drivers probe call was changed from .init.text to .devinit.text in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b the fb_fix_screeninfo structure must be changed from .init.data to .devinit.data, too. Signed-off-by: Henrik Kretzschmar Tested-by: Ralf Baechle Signed-off-by: Jiri Kosina commit 63e0c7715aab6085faa487d498889f4361dc6542 Author: Tom Zanussi Date: Mon May 3 00:14:48 2010 -0500 perf: record TRACE_INFO only if using tracepoints and SAMPLE_RAW The current perf code implicitly assumes SAMPLE_RAW means tracepoints are being used, but doesn't check for that. It happily records the TRACE_INFO even if SAMPLE_RAW is used without tracepoints, but when the perf data is read it won't go any further when it finds TRACE_INFO but no tracepoints, and displays misleading errors. This adds a check for both in perf-record, and won't record TRACE_INFO unless both are true. This at least allows perf report -D to dump raw events, and avoids triggering a misleading error condition in perf trace. It doesn't actually enable the non-tracepoint raw events to be displayed in perf trace, since perf trace currently only deals with tracepoint events. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1272865861.7932.16.camel@tropicana> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit fb4b698fc78347419aa9ae7114e1375f92107500 Author: J. Bruce Fields Date: Wed Apr 28 17:45:06 2010 -0400 nfsd: further comment typos Whoops, missed some more. "Reviewed-by, I guess": Chuck Lever Signed-off-by: J. Bruce Fields commit b48fa6b99100dc7772af3cd276035fcec9719ceb Author: Neil Brown Date: Mon Mar 1 16:51:14 2010 +1100 sunrpc: centralise most calls to svc_xprt_received svc_xprt_received must be called when ->xpo_recvfrom has finished receiving a message, so that the XPT_BUSY flag will be cleared and if necessary, requeued for further work. This call is currently made in each ->xpo_recvfrom function, often from multiple different points. In each case it is the earliest point on a particular path where it is known that the protection provided by XPT_BUSY is no longer needed. However there are (still) some error paths which do not call svc_xprt_received, and requiring each ->xpo_recvfrom to make the call does not encourage robustness. So: move the svc_xprt_received call to be made just after the call to ->xpo_recvfrom(), and move it of the various ->xpo_recvfrom methods. This means that it may not be called at the earliest possible instant, but this is unlikely to be a measurable performance issue. Note that there are still other calls to svc_xprt_received as it is also needed when an xprt is newly created. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 26c0c75e69265961e891ed80b38fb62a548ab371 Author: J. Bruce Fields Date: Sat Apr 24 15:35:43 2010 -0400 nfsd4: fix unlikely race in session replay case In the replay case, the renew_client(session->se_client); happens after we've droppped the sessionid_lock, and without holding a reference on the session; so there's nothing preventing the session being freed before we get here. Thanks to Benny Halevy for catching a bug in an earlier version of this patch. Signed-off-by: J. Bruce Fields Acked-by: Benny Halevy commit ad05c03b1c4c1fb4db066a7bd502b674148ccd89 Author: Peter Ujfalusi Date: Fri Apr 30 14:59:36 2010 +0300 ASoC: tlv320dac33: Support for turning off the codec Let the codec to hit OFF instead of STANDBY, when there is no activity. When the codec is off, than the associated regulator can be also turned off (if the number of users on the regulator is 0). After initialization, the codec remains in power off, it is only turned on for reading the ID registers (also testing the regulators). The codec power is enabled, when the codec is moving from BIAS_OFF to BIAS_STANDBY. The codec is turned off, when it hits BIAS_OFF. There are few scenarios, which has to be taken care:: 1. Analog bypass caused BIAS_OFF -> BIAS_ON We need to power on the codec, and do the chip init, but we does not need to execute the playback related configuration 2. Playback caused BIAS_OFF -> BIAS_ON We need to power on the codec, and do the chip init, and also we need to execute the playback related configuration. 3. Playback start, while Analog bypass is on (BIAS_ON -> BIAS_ON) We need to execute the playback related configuration. The codec is already on. 4. Analog bypass enable, while playback (BIAS_ON -> BIAS_ON) Nothing need to be done. 5. Playback start withing soc power down timeout (BIAS_ON -> BIAS_ON) We need to execute the playback related configuration. The codec is still on. Since the power up, and the codec init is optimized, the added overhead in stream start is minimal. Withing this patch, the hard_power function is now only doing what it supposed to: only handle the powers, and GPIO reset line. The codec initialization and state restore has been moved out. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 0b61d2b9f2f78fc55faaedcc37f622ffd4103d14 Author: Peter Ujfalusi Date: Fri Apr 30 14:59:35 2010 +0300 ASoC: tlv320dac33: Manage a pointer for snd_pcm_substream in private structure As a preparation for supporting codec to be turned off, when we are in BIAS_STANDBY. The substream must be easily available in other places than pcm_* callbacks. Manage a pointer in _startup, and _shutdown for this. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 239fe55c7fe17d67403cb1e9222fcaea84248974 Author: Peter Ujfalusi Date: Fri Apr 30 14:59:34 2010 +0300 ASoC: tlv320dac33: Revised module loading, and DAC33 ID read Optimize the way how tlv320dac33 is powered uppon module and soc initialization. Also read the DAC33 ID registers, and update the reg_cache to reflect it. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit ef909d67299498010f07889bd0980c829ae78990 Author: Peter Ujfalusi Date: Fri Apr 30 14:59:33 2010 +0300 ASoC: tlv320dac33: Optimize power up, and restore On power up we only need to initialize the codec, and restore only registers, which are not in either in DAPM nor in the playback start sequence. These are mostly gain related registers. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1b7c9afbfbfde93d4da89dcebfd2314f7d79c064 Author: Peter Ujfalusi Date: Thu Apr 29 10:58:09 2010 +0300 ASoC: TWL4030: Remove OUTL/R outputs OUTL/R are leftovers from the original driver, and they are no longer needed. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7b4c734eead5ef0b1c95ec336ddd28e58e648676 Author: Peter Ujfalusi Date: Thu Apr 29 10:58:08 2010 +0300 ASoC: TWL4030: AIF/APLL fix in DAPM domain This patch orders the APLL and AIF power sequence in case of HiFi (audio in TWL4030 terms) playback/capture. We also need to make sure that the AIF is running during playback/capture, when there is no valid DAPM route available. For this purpose I introduce these virtual widgets: /* To have complete playback route all the time */ DAPM_OUTPUT("Virtual HiFi OUT") /* Will keep AIF/APLL enabled */ /* To have complete capture route all the time */ DAPM_INPUT("Virtual HiFi IN") /* Will keep AIF/APLL enabled */ /* To have complete playback route for the voice module */ DAPM_OUTPUT("Virtual Voice OUT") /* Will keep APLL enabled */ The DAPM_SUPPLY widgets for APLL and AIF are placed in a way, that during any audio activity the needed configuration of AIF and APLL will be enabled (playback, capture, analog loopback, digital loopback, and voice activity). The apll reference counting code has been lifted, and modified from Liam Girdwood's earlier patch. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit e7a297b0d7d6049bd4e423ac1e17da31e4c401b8 Author: Peter P Waskiewicz Jr Date: Fri Apr 30 14:44:50 2010 -0700 genirq: Add CPU mask affinity hint This patch adds a cpumask affinity hint to the irq_desc structure, along with a registration function and a read-only proc entry for each interrupt. This affinity_hint handle for each interrupt can be used by underlying drivers that need a better mechanism to control interrupt affinity. The underlying driver can register a cpumask for the interrupt, which will allow the driver to provide the CPU mask for the interrupt to anything that requests it. The intent is to extend the userspace daemon, irqbalance, to help hint to it a preferred CPU mask to balance the interrupt into. [ tglx: Fixed compile warnings, added WARN_ON, made SMP only ] Signed-off-by: Peter P Waskiewicz Jr Cc: davem@davemloft.net Cc: arjan@linux.jf.intel.com Cc: bhutchings@solarflare.com LKML-Reference: <20100430214445.3992.41647.stgit@ppwaskie-hc2.jf.intel.com> Signed-off-by: Thomas Gleixner commit d9d52b5178af586d679c1052fb161ee05ea2e83f Author: Michael S. Tsirkin Date: Wed Mar 17 17:45:01 2010 +0200 tun: add ioctl to modify vnet header size virtio added mergeable buffers mode where 2 bytes of extra info is put after vnet header but before actual data (tun does not need this data). In hindsight, it would have been better to add the new info *before* the packet: as it is, users need a lot of tricky code to skip the extra 2 bytes in the middle of the iovec, and in fact applications seem to get it wrong, and only work with specific iovec layout. The fact we might need to split iovec also means we might in theory overflow iovec max size. This patch adds a simpler way for applications to handle this, and future proofs the interface against further extensions, by making the size of the virtio net header configurable from userspace. As a result, tun driver will simply skip the extra 2 bytes on both input and output. Signed-off-by: Michael S. Tsirkin Acked-by: David S. Miller commit 0e417fe1f247bb3ac056ee04604332005c334fac Merge: 53ba4f2 913769f Author: Ingo Molnar Date: Mon May 3 09:17:46 2010 +0200 Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into core/locking commit 53ba4f2fa73225113a488584df0d85d3cba52943 Merge: bd6d29c 66f41d4 Author: Ingo Molnar Date: Mon May 3 09:17:01 2010 +0200 Merge commit 'v2.6.34-rc6' into core/locking commit 0806ebd974590ab24ab357d5d87db744e56bfe13 Merge: 090f720 feef47d Author: Ingo Molnar Date: Mon May 3 08:29:35 2010 +0200 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core commit cd7b5396e7e4d10c51116f59f414ff90312af8d4 Author: David S. Miller Date: Sun May 2 22:27:59 2010 -0700 net: Use explicit "unsigned int" instead of plain "unsigned" in netdevice.h Signed-off-by: David S. Miller commit dee42870a423ad485129f43cddfe7275479f11d8 Author: Changli Gao Date: Sun May 2 05:42:16 2010 +0000 net: fix softnet_stat Per cpu variable softnet_data.total was shared between IRQ and SoftIRQ context without any protection. And enqueue_to_backlog should update the netdev_rx_stat of the target CPU. This patch renames softnet_data.total to softnet_data.processed: the number of packets processed in uppper levels(IP stacks). softnet_stat data is moved into softnet_data. Signed-off-by: Changli Gao ---- include/linux/netdevice.h | 17 +++++++---------- net/core/dev.c | 26 ++++++++++++-------------- net/sched/sch_generic.c | 2 +- 3 files changed, 20 insertions(+), 25 deletions(-) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7ef527377b88ff05fb122a47619ea506c631c914 Merge: 47d2964 1183f38 Author: David S. Miller Date: Sun May 2 21:43:40 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 090f7204dfdb5d7f18208ea81dfdba845897cedd Author: Arnaldo Carvalho de Melo Date: Sun May 2 19:46:36 2010 -0300 perf inject: Refactor read_buildid function Into two functions, one that actually reads the build_id for the dso if it wasn't already read, and another taht will inject the event if the build_id is available. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit aec9562f3db8ece218125042e0b2b7ac5b7091e7 Author: Anders Larsen Date: Tue Apr 13 12:05:32 2010 +0100 ARM: 6053/1: AT91: Save power by disabling the processor clock when CPU is idle Disable the processor clock when the CPU is idle. This saves much more power than merely entering 'Wait for Interrupt' mode. Since JTAG-debugging doesn't work when the processor clock is switched off, make it conditional on CONFIG_DEBUG_KERNEL. Signed-off-by: Anders Larsen Acked-by: Andrew Victor Signed-off-by: Russell King commit 478ea14466fb524b4cd90cdf0b8845f8c5ee6015 Author: Anton Vorontsov Date: Thu Mar 25 20:51:49 2010 +0300 ARM: cns3xxx: Add defconfig for CNS3420 validation board Signed-off-by: Anton Vorontsov commit e94cdef039d4b141dffdbf5adde705f8c14dc53f Author: Anton Vorontsov Date: Fri Mar 26 21:19:02 2010 +0300 ARM: cns3xxx: Add CNS3420 Validation Board support This patch adds support for CNS3420VB rev 1.3 boards. With this patch CNS3420VB boards are able to boot up to the userspace, with a console available on UART0. Signed-off-by: Anton Vorontsov commit d94f944e108da21badabd99f527b25e03b677b96 Author: Anton Vorontsov Date: Thu Mar 25 17:12:41 2010 +0300 ARM: cns3xxx: Add basic support for Cavium Networks CNS3xxx processors This patch adds very basic support for ECONA CNS3xxx ARM11 MPcore (ARMv6) dual-core processors. Note that SMP is not yet supported, as well as many peripheral devices. Support for these features will be added later. Signed-off-by: Anton Vorontsov commit 2c9faa060064343a4a0b16f5b77f3c61d1d17e23 Author: Arnaldo Carvalho de Melo Date: Sun May 2 13:37:24 2010 -0300 perf record: Don't exit in live mode when no tracepoints are enabled With this I was able to actually test Tom Zanussi's two previous patches in my usual perf testing ways, i.e. without any tracepoints activated. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 454c407ec17a0c63e4023ac0877d687945a7df4a Author: Tom Zanussi Date: Sat May 1 01:41:20 2010 -0500 perf: add perf-inject builtin Currently, perf 'live mode' writes build-ids at the end of the session, which isn't actually useful for processing live mode events. What would be better would be to have the build-ids sent before any of the samples that reference them, which can be done by processing the event stream and retrieving the build-ids on the first hit. Doing that in perf-record itself, however, is off-limits. This patch introduces perf-inject, which does the same job while leaving perf-record untouched. Normal mode perf still records the build-ids at the end of the session as it should, but for live mode, perf-inject can be injected in between the record and report steps e.g.: perf record -o - ./hackbench 10 | perf inject -v -b | perf report -v -i - perf-inject reads a perf-record event stream and repipes it to stdout. At any point the processing code can inject other events into the event stream - in this case build-ids (-b option) are read and injected as needed into the event stream. Build-ids are just the first user of perf-inject - potentially anything that needs userspace processing to augment the trace stream with additional information could make use of this facility. Cc: Ingo Molnar Cc: Steven Rostedt Cc: Frédéric Weisbecker LKML-Reference: <1272696080-16435-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit 789688faef5b3ba78065beaf2f3d6f1c839f74a3 Author: Tom Zanussi Date: Sat May 1 01:41:19 2010 -0500 perf/live: don't synthesize build ids at the end of a live mode trace It doesn't really make sense to record the build ids at the end of a live mode session - live mode samples need that information during the trace rather than at the end. Leave event__synthesize_build_id() in place, however; we'll still be using that to synthesize build ids in a more timely fashion in a future patch. Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Steven Rostedt LKML-Reference: <1272696080-16435-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Tom Zanussi Signed-off-by: Arnaldo Carvalho de Melo commit fb72014d98afd51e85aab9c061344ef32d615606 Author: Arnaldo Carvalho de Melo Date: Fri Apr 30 19:31:12 2010 -0300 perf tools: Don't use code surrounded by __KERNEL__ We need to refactor code to be explicitely shared by the kernel and at least the tools/ userspace programs, so, till we do that, copy the bare minimum bitmap/bitops code needed by tools/perf. Reported-by: "H. Peter Anvin" Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ef53d702c3614fb919e8a8291033e3dbccfd1aea Author: Jan Engelhardt Date: Thu Jul 9 19:14:18 2009 +0200 netfilter: xtables: dissolve do_match function Signed-off-by: Jan Engelhardt commit c29c949288d343be0d5c4f3091bc87ac047e1a09 Author: Jan Engelhardt Date: Sun May 2 14:04:54 2010 +0200 netfilter: xtables: fix incorrect return code Signed-off-by: Jan Engelhardt commit b5cad0dfd3c80501330215b9a9ae31bcffbd7306 Author: Jan Engelhardt Date: Sun May 2 13:55:21 2010 +0200 netfilter: ip_tables: fix compilation when debug is enabled Signed-off-by: Jan Engelhardt commit 47d29646a2c1c147d8a7598aeac2c87dd71ed638 Author: David S. Miller Date: Sun May 2 02:21:44 2010 -0700 net: Inline skb_pull() in eth_type_trans(). In commit 6be8ac2f ("[NET]: uninline skb_pull, de-bloats a lot") we uninlined skb_pull. But in some critical paths it makes sense to inline this thing and it helps performance significantly. Create an skb_pull_inline() so that we can do this in a way that serves also as annotation. Based upon a patch by Eric Dumazet. Signed-off-by: David S. Miller commit f417cbad7394fdccec850d13d7d5621516d693ce Author: Will Deacon Date: Thu Apr 15 10:16:26 2010 +0100 ARM: 6057/1: Realview: register PMU IRQs during board initialisation This patch updates the initialisation routines for the Realview boards and the Versatile Express board [ca9x4 tile] so that they register their PMU IRQs with the PMU framework in the Kernel. Signed-off-by: Will Deacon Signed-off-by: Russell King commit 59ac59f6f1432aa9417d2592bdfd17c99804dd66 Author: Russell King Date: Thu Feb 11 21:56:07 2010 +0000 ARM: Add Versatile Express SMP support Signed-off-by: Russell King commit fef88f10767cfd9f9b4eebb5d5490214c5e13ad5 Author: Russell King Date: Sun Feb 28 17:26:25 2010 +0000 ARM: Add Versatile Express CA9x4 processor support Signed-off-by: Russell King commit ceade897f31b8bb66f378cc35859fcfd0d46aaa2 Author: Russell King Date: Thu Feb 11 21:44:53 2010 +0000 ARM: Add Versatile Express support Signed-off-by: Russell King commit 9bf5b2ef673237e0e43161c56f70ac8bf24e43f9 Author: Russell King Date: Mon Mar 1 16:18:39 2010 +0000 ARM: Indirect round/set_rate operations through clk structure Signed-off-by: Russell King commit 3081e43b97cb50a80ebd98ce4b60e4853ad38424 Author: Will Deacon Date: Wed Jan 20 19:06:26 2010 +0100 ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU In anticipation of PMU support for Realview boards, the IRQs defined for some of these boards need updating. This patch removes incorrect L220 IRQ definitions, corrects incorrect PMU IRQs and adds any missing IRQs that are required. Signed-off-by: Will Deacon Signed-off-by: Russell King commit d1914c7e75cff736e2c2dac13ad2fe20c2567e68 Author: Russell King Date: Thu Jan 14 20:09:34 2010 +0000 ARM: Make Integrator/Versatile/Reaview VCO code similar Signed-off-by: Russell King commit f5fc00826d1e60af0e22cb9f65b933d823a8ed84 Author: Russell King Date: Thu Jan 14 20:07:35 2010 +0000 ARM: Realview/Versatile: separate out common sched_clock() Provide a common sched_clock() implementation for Versatile and Realview. Signed-off-by: Russell King commit 6be4826e37122b25cb10b215fc84c3a0b1fe1402 Author: Russell King Date: Sun Jan 17 16:20:56 2010 +0000 ARM: Integrator: move 16-bit timer support to Integrator/AP Only Integrator/AP has 16-bit timers, so move the support into the Integrator/AP specific support files. Signed-off-by: Russell King commit 5a46334ac688fb538b335599e1ff3b6cfaf769e9 Author: Russell King Date: Sat Jan 16 23:52:12 2010 +0000 ARM: Integrator: convert Integrator/CP to use SP804 timer support The Integrator/CP board has SP804-compatible timer modules, so use the SP804-compatible code from Versatile and Realview. Signed-off-by: Russell King commit e606a940cba4083b9c382c17251636856e03346b Author: Russell King Date: Sun Jan 17 19:27:09 2010 +0000 ARM: Realview/Versatile/Integrator: remove unused definitions from platform.h Signed-off-by: Russell King commit 4ce1755275c13eb0de90fe23c950bce5e81e680f Author: Russell King Date: Fri Jan 15 18:19:56 2010 +0000 ARM: Realview/Versatile: don't use magic numbers for timer frequency Signed-off-by: Russell King commit fe8e1a57f0ccdaede41618ca9ced7d746b6298d3 Author: Russell King Date: Thu Jan 14 22:37:12 2010 +0000 ARM: Realview/Versatile: remove useless TIMER_RELOAD calculations Realview/Versatile copied the Integrator timer code, including the calculations for ensuring that the reload value fits into the 16-bit counter. However, these platforms have a 32-bit counter which is clocked at a slower rate. The result is that the preprocessor conditions are never triggered: TICKS_PER_uSEC = 1, mSEC_10 = 10000, which is 0x2710 - less than 0x10000. So, remove the unnecessary complexity, reducing the TIMER_RELOAD calculation to just: TICKS_PER_uSEC * mSEC_10 Signed-off-by: Russell King commit e388771458b4ff3ad81ab70e390b24d069647da4 Author: Russell King Date: Thu Jan 14 13:30:16 2010 +0000 ARM: Realview/Versatile: separate out common SP804 timer code Signed-off-by: Russell King commit f4b8b319bf21bf3576014ce7336763cd3e1684ef Author: Russell King Date: Thu Jan 14 12:48:06 2010 +0000 ARM: Realview/Versatile/Integrator: separate out common clock code Signed-off-by: Russell King commit c5a0adb51002e51a4254cb7f0ab7190d41d8b930 Author: Russell King Date: Sat Jan 16 20:16:10 2010 +0000 ARM: ICST: kill duplicate icst code The only difference between ICST307 and ICST525 are the two arrays for calculating the S parameter; the code is now identical. Merge the two files and kill the duplicated code. Signed-off-by: Russell King commit 232eaf7f268f765b52170bec42bfa0c5825aa239 Author: Russell King Date: Sat Jan 16 19:46:19 2010 +0000 ARM: ICST: indirect s2div and idx2s arrays via icst_params Signed-off-by: Russell King commit e73a46a3d3df22b379d8adcb59999eafea1d60d5 Author: Russell King Date: Sat Jan 16 19:49:39 2010 +0000 ARM: ICST: move minimum VCO frequency to icst_params Signed-off-by: Russell King commit 64fceb1dcd1aa6a9f2e53cf8830b38bb007b375b Author: Russell King Date: Sat Jan 16 17:28:44 2010 +0000 ARM: ICST: use Hz instead of kHz This makes the ICST support fit more nicely with the clk API, eliminating the need to *1000 and /1000 in places. Signed-off-by: Russell King commit 4de2edbd15ff70c77e1d018611d06f7801fc2b72 Author: Russell King Date: Sat Jan 16 18:08:47 2010 +0000 ARM: ICST: provide definitions for max/min VCO frequencies Signed-off-by: Russell King commit 643761ac43dfe4bea1195e966fc65a9403cdcb9f Author: Russell King Date: Sat Jan 16 17:15:07 2010 +0000 ARM: ICST: icst.*_ps_to_vco() functions are unused, remove them These functions were originally implemented for the CLCD driver before we had clk API support. Since the CLCD driver does not use these anymore, we can remove them. Signed-off-by: Russell King commit 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 Author: Russell King Date: Sat Jan 16 16:27:28 2010 +0000 ARM: ICST: merge common ICST VCO structures The structures for the ICST307 and ICST525 VCO devices are identical, so merge them together. Signed-off-by: Russell King commit b830b9b5b3d04bc22f0b9ded85b713f7d3c11b7f Author: Russell King Date: Sun Jan 17 20:45:12 2010 +0000 ARM: Integrator: convert to use register definitions Rather than using converted base address plus offset, use the register address itself now that IO_ADDRESS() can cope with these. Signed-off-by: Russell King commit 7d60a044c8226d86fa93c2cf90ccdb97e3ba28fa Author: Russell King Date: Sun Jan 17 20:23:57 2010 +0000 ARM: Integrator: allow IO_ADDRESS() to be used for register addresses Signed-off-by: Russell King commit da7ba956c84d3c85c5ec619af794a6ca0ee3faae Author: Russell King Date: Sun Jan 17 19:59:58 2010 +0000 ARM: Integrator: fix Integrator/CP definitions, move to platform.h Signed-off-by: Russell King commit 43815482370c510c569fd18edb57afcb0fa8cab6 Author: Eric Dumazet Date: Thu Apr 29 11:01:49 2010 +0000 net: sock_def_readable() and friends RCU conversion sk_callback_lock rwlock actually protects sk->sk_sleep pointer, so we need two atomic operations (and associated dirtying) per incoming packet. RCU conversion is pretty much needed : 1) Add a new structure, called "struct socket_wq" to hold all fields that will need rcu_read_lock() protection (currently: a wait_queue_head_t and a struct fasync_struct pointer). [Future patch will add a list anchor for wakeup coalescing] 2) Attach one of such structure to each "struct socket" created in sock_alloc_inode(). 3) Respect RCU grace period when freeing a "struct socket_wq" 4) Change sk_sleep pointer in "struct sock" by sk_wq, pointer to "struct socket_wq" 5) Change sk_sleep() function to use new sk->sk_wq instead of sk->sk_sleep 6) Change sk_has_sleeper() to wq_has_sleeper() that must be used inside a rcu_read_lock() section. 7) Change all sk_has_sleeper() callers to : - Use rcu_read_lock() instead of read_lock(&sk->sk_callback_lock) - Use wq_has_sleeper() to eventually wakeup tasks. - Use rcu_read_unlock() instead of read_unlock(&sk->sk_callback_lock) 8) sock_wake_async() is modified to use rcu protection as well. 9) Exceptions : macvtap, drivers/net/tun.c, af_unix use integrated "struct socket_wq" instead of dynamically allocated ones. They dont need rcu freeing. Some cleanups or followups are probably needed, (possible sk_callback_lock conversion to a spinlock for example...). Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e772c349a11de448f194d0c9f2e7eb23800e1a13 Author: Patrick McHardy Date: Sat May 1 18:29:43 2010 +0200 netfilter: nf_ct_h323: switch "incomplete TPKT" message to pr_debug() The message might be falsely triggered by non-H.323 traffic on port 1720. Signed-off-by: Patrick McHardy commit ccc0197b02178f7e1707e659cbc5242fc94b499a Author: Joern Engel Date: Sat May 1 17:00:34 2010 +0200 logfs: Close i_ino reuse race logfs_seek_hole() may return the same offset it is passed as argument. Found by Prasad Joshi Signed-off-by: Joern Engel commit bd2b3f29594c50d7c5bd864d9af05d440394ee82 Author: Joern Engel Date: Sat May 1 17:33:06 2010 +0200 logfs: fix logfs_seek_hole() logfs_seek_hole(inode, 0x200) would crap itself if the inode contained just 0x1ff (or fewer) blocks. Signed-off-by: Joern Engel commit ad342631f13d40aa787b9e5aaf4800f10d6c3647 Author: Joern Engel Date: Tue Apr 27 13:45:31 2010 +0200 logfs: Return -EINVAL if filesystem image doesn't match Signed-off-by: Joern Engel commit b0c9778b1d07ed3aa7e411db201275553527b1b1 Author: Tejun Heo Date: Fri Apr 9 18:57:01 2010 +0900 percpu: implement kernel memory based chunk allocation Implement an alternate percpu chunk management based on kernel memeory for nommu SMP architectures. Instead of mapping into vmalloc area, chunks are allocated as a contiguous kernel memory using alloc_pages(). As such, percpu allocator on nommu will have the following restrictions. * It can't fill chunks on-demand page-by-page. It has to allocate each chunk fully upfront. * It can't support sparse chunk for NUMA configurations. SMP w/o mmu is crazy enough. Let's hope no one does NUMA w/o mmu. :-P * If chunk size isn't power-of-two multiple of PAGE_SIZE, the unaligned amount will be wasted on each chunk. So, archs which use this better align chunk size. For instructions on how to use this, read the comment on top of mm/percpu-km.c. Signed-off-by: Tejun Heo Reviewed-by: David Howells Cc: Graff Yang Cc: Sonic Zhang commit 9f6455325618821dcf6775d7972881fde32e77c5 Author: Tejun Heo Date: Fri Apr 9 18:57:01 2010 +0900 percpu: move vmalloc based chunk management into percpu-vm.c Separate out and move chunk management (creation/desctruction and [de]population) code into percpu-vm.c which is included by percpu.c and compiled together. The interface for chunk management is defined as follows. * pcpu_populate_chunk - populate the specified range of a chunk * pcpu_depopulate_chunk - depopulate the specified range of a chunk * pcpu_create_chunk - create a new chunk * pcpu_destroy_chunk - destroy a chunk, always preceded by full depop * pcpu_addr_to_page - translate address to physical address * pcpu_verify_alloc_info - check alloc_info is acceptable during init Other than wrapping vmalloc_to_page() inside pcpu_addr_to_page() and dummy pcpu_verify_alloc_info() implementation, this patch only moves code around. This separation is to allow alternate chunk management implementation. Signed-off-by: Tejun Heo Reviewed-by: David Howells Cc: Graff Yang Cc: Sonic Zhang commit 88999a898b565960690f18e4a13a1e8a9fa4dfef Author: Tejun Heo Date: Fri Apr 9 18:57:01 2010 +0900 percpu: misc preparations for nommu support Make the following misc preparations for percpu nommu support. * Remove refernces to vmalloc in common comments as nommu percpu won't use it. * Rename chunk->vms to chunk->data and make it void *. Its use is determined by chunk management implementation. * Relocate utility functions and add __maybe_unused to functions which might not be used by different chunk management implementations. This patch doesn't cause any functional change. This is to allow alternate chunk management implementation for percpu nommu support. Signed-off-by: Tejun Heo Reviewed-by: David Howells Cc: Graff Yang Cc: Sonic Zhang commit 6081089fd6f216b0eb8849205ad0c350cd5ed9bc Author: Tejun Heo Date: Fri Apr 9 18:57:01 2010 +0900 percpu: reorganize chunk creation and destruction Reorganize alloc/free_pcpu_chunk() such that chunk struct alloc/free live in pcpu_alloc/free_chunk() and the rest in pcpu_create/destroy_chunk(). While at it, add missing error handling for chunk->map allocation failure. This is to allow alternate chunk management implementation for percpu nommu support. Signed-off-by: Tejun Heo Reviewed-by: David Howells Cc: Graff Yang Cc: Sonic Zhang commit 020ec6537aa65c18e9084c568d7b94727f2026fd Author: Tejun Heo Date: Fri Apr 9 18:57:00 2010 +0900 percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys() Factor out pcpu_addr_in_first/reserved_chunk() from pcpu_chunk_addr_search() and use it to update per_cpu_ptr_to_phys() such that it handles first chunk differently from the rest. This patch doesn't cause any functional change and is to prepare for percpu nommu support. Signed-off-by: Tejun Heo Reviewed-by: David Howells Cc: Graff Yang Cc: Sonic Zhang commit 0e3aef8d09a8c11e3fb83cdcb24b5bc7421b3726 Author: Vlad Yasevich Date: Fri Apr 30 22:41:10 2010 -0400 sctp: Tag messages that can be Nagle delayed at creation. When we create the sctp_datamsg and fragment the user data, we know exactly if we are sending full segments or not and how they might be bundled. During this time, we can mark messages a Nagle capable or not. This makes the check at transmit time much simpler. Signed-off-by: Vlad Yasevich commit bfa0d9843ac5feb9667990706b4524390fee4df9 Author: Vlad Yasevich Date: Fri Apr 30 22:41:10 2010 -0400 sctp: Optimize computation of highest new tsn in SACK. Right now, if the highest tsn in the SACK doesn't change, we'll end up scanning the transmitted lists on the transports twice: once for locating the highest _new_ tsn, and once for actually tagging chunks as acked. This is a waste, since we can record the highest _new_ tsn at the same time as tagging chunks. Long ago this was not possible because we would try to mark chunks as missing at the same time as tagging them acked and this approach didn't work. Now that the two steps are separate, we can re-use the old approach. Signed-off-by: Vlad Yasevich commit ea862c8d1f4a0d193979c7412c3b946f600721ce Author: Vlad Yasevich Date: Fri Apr 30 22:41:10 2010 -0400 sctp: correctly mark missing chunks in fast recovery According to RFC 4960 Section 7.2.4: If an endpoint is in Fast Recovery and a SACK arrives that advances the Cumulative TSN Ack Point, the miss indications are incremented for all TSNs reported missing in the SACK. Signed-off-by: Vlad Yasevich commit 65883371894be2631603d5d412f90f8c09290fef Author: Vlad Yasevich Date: Fri Apr 30 22:41:10 2010 -0400 sctp: rwnd_press should be cumulative rwnd_press tracks the pressure on the recieve window. Every timer the receive buffer overlows, we truncate the receive window and then grow it back. However, if we don't track the cumulative presser, it's possible to reach a situation when receive buffer is empty, but rwnd stays truncated. Signed-off-by: Vlad Yasevich commit cf9b4812e18aab6f86ff998bd7425a9e823269c3 Author: Vlad Yasevich Date: Fri Apr 30 22:41:10 2010 -0400 sctp: fast recovery algorithm is per association. SCTP fast recovery algorithm really applies per association and impacts all transports. Signed-off-by: Vlad Yasevich commit b2cf9b6bd93af1cc047d3356f1c6cc9367fe3731 Author: Vlad Yasevich Date: Fri Apr 30 22:41:10 2010 -0400 sctp: update transport initializations Right now, sctp transports are not fully initialized and when adding any new fields, they have to be explicitely initialized. This is prone to mistakes. So we switch to calling kzalloc() which makes things much simpler. Signed-off-by: Vlad Yasevich commit c0058a35aacc79406e867ec33c5cb75624fd5860 Author: Vlad Yasevich Date: Fri Apr 30 22:41:09 2010 -0400 sctp: Save some room in the sctp_transport by using bitfields Saves some room in the sctp_transport structure. Signed-off-by: Vlad Yasevich commit d9efc2231b28bc199f9de4dd594248b7341188e5 Author: Vlad Yasevich Date: Fri Apr 30 22:41:09 2010 -0400 sctp: Do not force T3 timer on fast retransmissions. We don't need to force the T3 timer any more and it's actually wrong to do as it causes too long of a delay. The timer will be started if one is not running, but if one is running, we leave it alone. Signed-off-by: Vlad Yasevich commit ae19c54866450f6c6f79223ca7d37965859a54e1 Author: Vlad Yasevich Date: Fri Apr 30 22:41:09 2010 -0400 sctp: remove 'resent' bit from the chunk The 'resent' bit is used to make sure that we don't update rto estimate based on retransmitted chunks. However, we already have the 'rto_pending' bit that we test when need to update rto, so 'resent' bit is just extra. Additionally, we currently have a bug in that we always set a 'resent' bit and thus rto estimate is only updated by Heartbeats. Signed-off-by: Vlad Yasevich commit d598b166ced20d9b9281ea3527c0e18405ddb803 Author: Vlad Yasevich Date: Fri Apr 30 22:41:09 2010 -0400 sctp: Make sure we always return valid retransmit path commit 4951feda0c60d1ef681f1a270afdd617924ab041 sctp: Do no select unconfirmed transports for retransmissions added code to make sure that we do not select unconfirmed paths for data transmission. This caused a problem when there are only 2 paths, 1 unconfirmed and 1 unreachable. In that case, the next retransmit path returned is NULL and that causes a kernel crash. The solution is to only change retransmit paths if we found one to use. Reported-by: Frank Schuster Signed-off-b: Vlad Yasevich commit b99a4d53a74ac25eb4b930eef6c745579149c571 Author: Dan Carpenter Date: Fri Apr 30 22:41:09 2010 -0400 sctp: cleanup: remove duplicate assignment This assignment isn't needed because we did it earlier already. Also another reason to delete the assignment is because it triggers a Smatch warning about checking for NULL pointers after a dereference. Reported-by: Vlad Yasevich Signed-off-by: Dan Carpenter Signed-off-by: Vlad Yasevich commit 787a51a0878f7bee3a9a83040077301e1556b69a Author: Wei Yongjun Date: Fri Apr 30 22:41:09 2010 -0400 sctp: implement sctp association probing module This patch implement sctp association probing module, the module will be called sctp_probe. This module allows for capturing the changes to SCTP association state in response to incoming packets. It is used for debugging SCTP congestion control algorithms. Usage: $ modprobe sctp_probe [full=n] [port=n] [bufsize=n] $ cat /proc/net/sctpprobe The output format is: TIME ASSOC LPORT RPORT MTU RWND UNACK ... The output will be like this: 9.226086 c4064c48 9000 8000 1500 53352 1 *192.168.0.19 1 4380 54784 1252 0 1500 9.287195 c4064c48 9000 8000 1500 45144 5 *192.168.0.19 1 5880 54784 6500 0 1500 9.289130 c4064c48 9000 8000 1500 42724 5 *192.168.0.19 1 7380 54784 6500 0 1500 9.620332 c4064c48 9000 8000 1500 48284 4 *192.168.0.19 1 8880 54784 5200 0 1500 ...... Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit ec7b9519509061bbc09a43284c3570aa492e07f0 Author: Shan Wei Date: Fri Apr 30 22:41:09 2010 -0400 sctp: use sctp_chunk_is_data macro to decide a chunk is data chunk sctp_chunk_is_data macro is defined to decide that whether a chunk is data chunk or not. Signed-off-by: Shan Wei Signed-off-by: Vlad Yasevich commit fbdf501c9374966a56829ecca3a7f25d2b49a305 Author: Vlad Yasevich Date: Fri Apr 30 22:39:26 2010 -0400 sctp: Do no select unconfirmed transports for retransmissions An unconfirmed transport is one that we have not been able to reach since the beginning. There is no point in trying to retrasnmit data on those transports. Also, the specification forbids it due to security issues. Reported-by: Frank Schuster Signed-off-by: Vlad Yasevich commit bc4f841a05364b2572bcc266e9fd7e9cf5f06d5b Author: Wei Yongjun Date: Fri Apr 30 22:38:53 2010 -0400 sctp: fix to retranmit at least one DATA chunk While doing retranmit, if control chunk exists, such as FORWARD TSN chunk, and the DATA chunk can not be bundled with this control chunk because of PMTU limit, no DATA chunk will be retranmitted in the current implementation. This patch makes sure to retranmit at least one DATA chunk in this case. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit feef47d0cb530e8419dfa0b48141b538b89b1b1a Author: Frederic Weisbecker Date: Fri Apr 23 05:59:55 2010 +0200 hw-breakpoints: Get the number of available registers on boot dynamically The breakpoint generic layer assumes that archs always know in advance the static number of address registers available to host breakpoints through the HBP_NUM macro. However this is not true for every archs. For example Arm needs to get this information dynamically to handle the compatiblity between different versions. To solve this, this patch proposes to drop the static HBP_NUM macro and let the arch provide the number of available slots through a new hw_breakpoint_slots() function. For archs that have CONFIG_HAVE_MIXED_BREAKPOINTS_REGS selected, it will be called once as the number of registers fits for instruction and data breakpoints together. For the others it will be called first to get the number of instruction breakpoint registers and another time to get the data breakpoint registers, the targeted type is given as a parameter of hw_breakpoint_slots(). Reported-by: Will Deacon Signed-off-by: Frederic Weisbecker Acked-by: Paul Mundt Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Jason Wessel Cc: Ingo Molnar commit f93a20541134fa767e8dc4eb32e956d30b9f6b92 Author: Frederic Weisbecker Date: Tue Apr 13 00:32:30 2010 +0200 hw-breakpoints: Handle breakpoint weight in allocation constraints Depending on their nature and on what an arch supports, breakpoints may consume more than one address register. For example a simple absolute address match usually only requires one address register. But an address range match may consume two registers. Currently our slot allocation constraints, that tend to reflect the limited arch's resources, always consider that a breakpoint consumes one slot. Then provide a way for archs to tell us the weight of a breakpoint through a new hw_breakpoint_weight() helper. This weight will be computed against the generic allocation constraints instead of a constant value. Signed-off-by: Frederic Weisbecker Acked-by: Paul Mundt Cc: Will Deacon Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Ingo Molnar commit 0102752e4c9e0655b39734550d4c35327954f7f9 Author: Frederic Weisbecker Date: Sun Apr 11 18:55:56 2010 +0200 hw-breakpoints: Separate constraint space for data and instruction breakpoints There are two outstanding fashions for archs to implement hardware breakpoints. The first is to separate breakpoint address pattern definition space between data and instruction breakpoints. We then have typically distinct instruction address breakpoint registers and data address breakpoint registers, delivered with separate control registers for data and instruction breakpoints as well. This is the case of PowerPc and ARM for example. The second consists in having merged breakpoint address space definition between data and instruction breakpoint. Address registers can host either instruction or data address and the access mode for the breakpoint is defined in a control register. This is the case of x86 and Super H. This patch adds a new CONFIG_HAVE_MIXED_BREAKPOINTS_REGS config that archs can select if they belong to the second case. Those will have their slot allocation merged for instructions and data breakpoints. The others will have a separate slot tracking between data and instruction breakpoints. Signed-off-by: Frederic Weisbecker Acked-by: Paul Mundt Cc: Will Deacon Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Ingo Molnar commit b2812d031dea86926e9c10f7714af33ac2f6b43d Author: Frederic Weisbecker Date: Sun Apr 18 18:11:53 2010 +0200 hw-breakpoints: Change/Enforce some breakpoints policies The current policies of breakpoints in x86 and SH are the following: - task bound breakpoints can only break on userspace addresses - cpu wide breakpoints can only break on kernel addresses The former rule prevents ptrace breakpoints to be set to trigger on kernel addresses, which is good. But as a side effect, we can't breakpoint on kernel addresses for task bound breakpoints. The latter rule simply makes no sense, there is no reason why we can't set breakpoints on userspace while performing cpu bound profiles. We want the following new policies: - task bound breakpoint can set userspace address breakpoints, with no particular privilege required. - task bound breakpoints can set kernelspace address breakpoints but must be privileged to do that. - cpu bound breakpoints can do what they want as they are privileged already. To implement these new policies, this patch checks if we are dealing with a kernel address breakpoint, if so and if the exclude_kernel parameter is set, we tell the user that the breakpoint is invalid, which makes a good generic ptrace protection. If we don't have exclude_kernel, ensure the user has the right privileges as kernel breakpoints are quite sensitive (risk of trap recursion attacks and global performance impacts). [ Paul Mundt: keep addr space check for sh signal delivery and fix double function declaration] Signed-off-by: Frederic Weisbecker Cc: Will Deacon Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Paul Mundt Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Jason Wessel Cc: Ingo Molnar Signed-off-by: Paul Mundt commit 87e9b2024659c614a876ce359a57e98a47b5ef37 Author: Frederic Weisbecker Date: Sat Apr 17 18:11:59 2010 +0200 hw-breakpoints: Check disabled breakpoints again We stopped checking disabled breakpoints because we weren't allowing breakpoints on NULL addresses. And gdb tends to set NULL addresses on inactive breakpoints. But refusing NULL addresses was actually a regression that has been fixed now. There is no reason anymore to not validate inactive breakpoint settings. Signed-off-by: Frederic Weisbecker Acked-by: Paul Mundt Cc: Will Deacon Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Jason Wessel Cc: Ingo Molnar commit 73266fc1df2f94cf72b3beba3eee3b88ed0b0664 Author: Frederic Weisbecker Date: Thu Apr 22 05:05:45 2010 +0200 hw-breakpoints: Tag ptrace breakpoint as exclude_kernel Tag ptrace breakpoints with the exclude_kernel attribute set. This will make it easier to set generic policies on breakpoints, when it comes to ensure nobody unpriviliged try to breakpoint on the kernel. Signed-off-by: Frederic Weisbecker Acked-by: Paul Mundt Cc: Will Deacon Cc: Mahesh Salgaonkar Cc: K. Prasad Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Ingo Molnar commit d00a47cce569a3e660a8c9de5d57af28d6a9f0f7 Author: Frederic Weisbecker Date: Sat May 1 03:08:46 2010 +0200 perf: Fix warning while reading ring buffer headers commit e9e94e3bd862d31777335722e747e97d9821bc1d "perf trace: Ignore "overwrite" field if present in /events/header_page" makes perf trace launching spurious warnings about unexpected tokens read: Warning: Error: expected type 6 but read 4 This change tries to handle the overcommit field in the header_page file whenever this field is present or not. The problem is that if this field is not present, we try to find it and give up in the middle of the line when we realize we are actually dealing with another field, which is the "data" one. And this failure abandons the file pointer in the middle of the "data" description line: field: u64 timestamp; offset:0; size:8; signed:0; field: local_t commit; offset:8; size:8; signed:1; field: char data; offset:16; size:4080; signed:1; ^^^ Here What happens next is that we want to read this line to parse the data field, but we fail because the pointer is not in the beginning of the line. We could probably fix that by rewinding the pointer. But in fact we don't care much about these headers that only concern the ftrace ring-buffer. We don't use them from perf. Just skip this part of perf.data, but don't remove it from recording to stay compatible with olders perf.data Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian Cc: Steven Rostedt commit 6429d3dc4bd6251b01c11b851e23a4d60f079e06 Author: Wei Yongjun Date: Fri Apr 30 21:42:44 2010 -0400 sctp: missing set src and dest port while lookup output route While lookup the output route, we do not set the src and dest port. This will cause we got a wrong route if we had set the outbund transport to IPsec with src or dst port. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit 52688d6ec977e69b164e0bd3de51d43cf6d4b7b3 Author: Wei Yongjun Date: Fri Apr 30 21:42:44 2010 -0400 sctp: discard ABORT chunk with zero verification tag in COOKIE-WAIT state In current implementation if ABORT chunk is received with T flag is set and zero verification tag in COOKIE-WAIT state, the ABORT chunk will be always accepted. This is because in COOKIE-WAIT state, the endpoint does not know the peer's verification tag, and it's zero in the endpoint. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit bd69b981a354be40cc709f3046f0c56f00da6163 Author: Wei Yongjun Date: Fri Apr 30 21:42:43 2010 -0400 sctp: assure at least one T3-rtx timer is running if a FORWARD TSN is sent PR-SCTP extension section 3.5 Sender Side Implementation of PR-SCTP: C5) If a FORWARD TSN is sent, the sender MUST assure that at least one T3-rtx timer is running. So this patch fix to assure at least one T3-rtx timer is running if a FORWARD TSN is or will to sent. Signed-off-by: Wei Yongjun Signed-off-by: Vlad Yasevich commit c17b02b38aa99ef806c7066ef19a6f51122304f1 Author: Vlad Yasevich Date: Fri Apr 30 21:42:43 2010 -0400 sctp: send SHUTDOWN-ACK chunk back to the source. SHUTDOWN-ACK is alaways sent to the primary path at the first time, but should better transmit SHUTDOWN-ACK chunk to the same destination transport address from which it received the SHUTDOWN chunk. Based on the work from Wei Yongjun . Signed-off-by: Vlad Yasevich commit a5f4cea74f1397bb29d0bbdabeb05bd05a23a741 Author: Vlad Yasevich Date: Fri Apr 30 21:42:42 2010 -0400 sctp: Use correct address family in sctp_getsockopt_peer_addrs() The function should use the address family of the address when trying to determine the length of the structure. Signed-off-by: Vlad Yasevich commit 83d7eb2979cd3390c375470225dd2d8f2009bc70 Author: Dan Carpenter Date: Fri Apr 30 16:42:08 2010 -0700 ipv6: cleanup: remove unneeded null check We dereference "sk" unconditionally elsewhere in the function. This was left over from: b30bd282 "ip6_xmit: remove unnecessary NULL ptr check". According to that commit message, "the sk argument to ip6_xmit is never NULL nowadays since the skb->priority assigment expects a valid socket." Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 4b021628beb26238087812829cc080da47e4b236 Author: Changli Gao Date: Tue Apr 27 21:20:22 2010 +0000 xfrm: potential uninitialized variable num_xfrms potential uninitialized variable num_xfrms fix compiler warning: 'num_xfrms' may be used uninitialized in this function. Signed-off-by: Changli Gao ---- net/xfrm/xfrm_policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: David S. Miller commit 767dd03369ac18af58efdef0383d6eb986eab426 Author: Eric Dumazet Date: Wed Apr 28 19:14:43 2010 +0000 net: speedup sock_recv_ts_and_drops() sock_recv_ts_and_drops() is fat and slow (~ 4% of cpu time on some profiles) We can test all socket flags at once to make fast path fast again. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 21851264120b0bd1f953328cb131abcfa9305bc3 Author: Jonas Sjöquist Date: Fri Apr 23 01:07:45 2010 +0000 cdc_ether: Identify MBM devices by GUID in MDLM descriptor This patch removes vid/pid for Ericsson MBM devices from the whitelist set of devices. The MBM devices are instead identified by GUID. In order for cdc_ether to handle these devices the GUID in the MDLM descriptor is tested. All MBM devices currently handled by cdc_ether as well as future CDC Ethernet MBM devices can be identified by the GUID. This is the same solution used in Carl Nordbeck's mbm driver, http://kerneltrap.org/mailarchive/linux-usb/2008/11/17/4141384/thread I post this as RFC to get feedback on however cdc_ether is the correct place to do the binding, or if it should be done in a separate driver, e.g. zaurus. Signed-off-by: Jonas Sjöquist Signed-off-by: David S. Miller commit 81a2e36df7de8bf9417de67f9d54b4f740072ed0 Author: stephen hemminger Date: Wed Apr 28 08:25:28 2010 +0000 forcedeth: Stay in NAPI as long as there's work The following does the same thing without the extra overhead of testing all the registers. It also handles the out of memory case. Signed-off-by: Stephen Hemminger Tested-by: Tom Herbert Signed-off-by: David S. Miller commit f8478df1eab2f11aefc4b6668c5867949ab96bd7 Author: Wey-Yi Guy Date: Mon Apr 19 20:39:48 2010 -0700 iwlwifi: greenfield support only true for 11n devices Greenfield is a 11n feature, remove it from non-11n devices configuration parameters list Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit e517736ab85fcaa4ceebbb572f3e86838097ad0a Author: Wey-Yi Guy Date: Mon Apr 19 18:49:40 2010 -0700 iwlwifi: set hw parameters based on device type Separate the hw_set_hw_params() function to per device based; different devices can have different hardware parameters set, when separate the function based on device type can avoid mistakes, give more flexibilities and easier to read. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit e3a3cd8789e1daf1b5af70d3252cab50cd3824c9 Author: Daniel Halperin Date: Sun Apr 18 09:27:58 2010 -0700 iwlwifi: set AMPDU status variables correctly The TX status code is currently abusing the ampdu_ack_map field (a bitmap) to count the number of successfully received frames. The comments in mac80211.h show there are actually three different, relevant variables, of which we are currently using two, both incorrectly. Fix this by making - ampdu_ack_len -> the number of ACKed frames (i.e. successes) - ampdu_ack_map -> the bitmap - ampdu_len -> the total number of frames sent (i.e., attempts) to match the header file (and verified with ath9k's usage) and updating Intel's RS code to match. Signed-off-by: Daniel Halperin Signed-off-by: Reinette Chatre commit 17f36fc6ef3d1ab15f9d2160a9daa107db0887ca Author: Abhijeet Kolekar Date: Fri Apr 16 10:03:54 2010 -0700 iwl3945: add ucode statistics Add general, rx and tx uCode statistics to 3945. This will help in debugging Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit c2845d010b0e58a17cd2301e657b614962331550 Author: Shanyu Zhao Date: Wed Apr 14 15:35:14 2010 -0700 iwlwifi: set correct AC to swq_id for aggregation When starting an aggregation session, the swq_id is generated in function iwl_virtual_agg_queue_num() where the first parameter is supposed to be the Access Class, but it used the tx fifo ID instead. This means the AC value stored in swq_id is incorrect. To test this, look at the tx_queue file in debugfs while transmitting Best Effort flow (ac=2), it shows: hwq 10: read=0 write=0 stop=0 swq_id=0xa9 (ac 1/hwq 10) After this fix, it will show: hwq 10: read=0 write=0 stop=0 swq_id=0xaa (ac 2/hwq 10) Signed-off-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit cd398c313785cb5f2b8cb2c85e865f06419b1730 Author: Abhijeet Kolekar Date: Wed Apr 14 10:27:00 2010 -0700 iwlwifi: reset pci retry timeout We removed resetting of PCI_RETRY_TIMEOUT register in merge of suspend resume work. 'Suspend and resume' resets the PCI configuration space, so we have to disable the RETRY_TIMEOUT register again here. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit f001b300493287a19ebd88fbca56978dabfec55a Author: Wey-Yi Guy Date: Tue Apr 13 20:50:16 2010 -0700 iwlwifi: remove outdated comments IEEE80211_CONF_SHORT_SLOT_TIME is no longer a possible setting in ieee80211_conf->flags Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 399dcb8a36edbde45bc27f5e33fd7f57de44bdd5 Author: Wey-Yi Guy Date: Tue Apr 13 11:28:52 2010 -0700 iwlwifi: remove get_stats callback function The low level transmission function is performed at uCode layer for all the "agn" NICs, there is no statistics information available for mac80211 get_stats() call. Remove the callback function to avoid misleading information that returned success when indeed it is not supported. Now return "not supported". Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit ad41ee3a45c7de33cfa0057f4a12362ba1f1af32 Merge: 49b5c7f 96ff564 Author: Reinette Chatre Date: Fri Apr 30 15:13:00 2010 -0700 Merge branch 'wireless-2.6' into wireless-next-2.6 Patch "iwlwifi: work around passive scan issue" was merged into wireless-2.6, but touched a lot of code since modified (and moved) in wireless-next-2.6. This caused some conflicts. Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c Signed-off-by: Reinette Chatre commit f5c044e53a6b319776c7140b22fee9be3bc1f758 Author: John W. Linville Date: Fri Apr 30 15:37:00 2010 -0400 mac80211: remove deprecated noise field from ieee80211_rx_status Also remove associated IEEE80211_HW_NOISE_DBM from ieee80211_hw_flags. Signed-off-by: John W. Linville commit 49b5c7f473f1bbcb30275dcaee2c06dfb8ec2279 Author: Johannes Berg Date: Thu Apr 29 21:34:01 2010 +0200 mac80211: tell driver about IBSS merge My previous patch "mac80211: notify driver about IBSS status" left a problem -- when we merge with a new BSSID, we never tell the driver that we left the old one. Fix that. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit edfcba15bdfa520d8c64b496c9260a9d9e0b6d18 Author: John W. Linville Date: Wed Apr 28 16:12:57 2010 -0400 libertas_tf: avoid warning about pr_fmt redefinition Also includes a minor cleanup regarding quotation of a standard kernel header file... Signed-off-by: John W. Linville commit d989ff7cf8d14f1b523f63ba0bf2ec1a9b7c25bc Author: John W. Linville Date: Wed Apr 28 19:14:42 2010 -0400 rtl8180: fix tx status reporting When reporting Tx status, indicate that only one rate was used. Otherwise, the rate is frozen at rate index 0 (i.e. 1Mb/s). Signed-off-by: John W. Linville Cc: stable@kernel.org commit e5a5f1f015cf435eb3d2f5712ba51ffdbb92cbef Author: Frederic Weisbecker Date: Fri Apr 30 19:55:00 2010 +0200 perf: Remove leftover useless options to record trace events from scripts -f, -c 1, -R are now useless for trace events recording, moreover -M is useless and event hurts. Remove them from the documentation examples and from record scripts. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi commit 913769f24eadcd38a936ffae41d9b4895ec02e43 Author: Frederic Weisbecker Date: Thu Apr 15 23:10:43 2010 +0200 lockdep: Simplify debug atomic ops Simplify debug_atomic_inc/dec by using this_cpu_inc/dec() instead of doing it through an indirect get_cpu_var() and a manual incrementation. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra commit 8795d7717c467bea7b0a0649d44a258e09f34db2 Author: Frederic Weisbecker Date: Thu Apr 15 23:10:42 2010 +0200 lockdep: Fix redundant_hardirqs_on incremented with irqs enabled When a path restore the flags while irqs are already enabled, we update the per cpu var redundant_hardirqs_on in a racy fashion and debug_atomic_inc() warns about this situation. In this particular case, loosing a few hits in a stat is not a big deal, so increment it without protection. v2: Don't bother with disabling irq, we can miss one count in rare situations Reported-by: Stephen Rothwell Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: David Miller Cc: Benjamin Herrenschmidt commit 868c522b1b75fd3fd3e6a636b4c344ac08edf13a Merge: bd6d29c 66f41d4 Author: Frederic Weisbecker Date: Fri Apr 30 19:11:13 2010 +0200 Merge commit 'v2.6.34-rc6' into core/locking Merge reason: Further lockdep patches depend on per cpu updates made in -rc1. commit 39b8eab7e7fe429d8d57f18c0ebdb7c25df55f5c Author: Mark Brown Date: Wed Apr 28 18:36:10 2010 +0100 ASoC: Add WM9090 amplifier driver The WM9090 is a high performance low power audio subsystem, including headphone and class D speaker drivers. Note that this driver is a standalone CODEC driver and so is only immediately suitable for use with the WM9090 as a standalone sound card taking line inputs, or with a DAC with no software control. The pending ASoC multi-CODEC support will expand the range of systems that can use the driver, or system-specific adaptations can be made. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit bc4b473f1aa2ef785ccfd890a24a1de5a6660f98 Merge: 3ca5049 1c6a800 Author: Ingo Molnar Date: Fri Apr 30 09:58:05 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 3ca50496c2677a2b3fdd3ede86660fd1433beac6 Merge: 462b04e 66f41d4 Author: Ingo Molnar Date: Fri Apr 30 09:56:41 2010 +0200 Merge commit 'v2.6.34-rc6' into perf/core Merge reason: update to the latest -rc. Signed-off-by: Ingo Molnar commit 4d707b9f48e2c4aa94b96f1133813b73df71fb55 Author: Oleg Nesterov Date: Fri Apr 23 17:40:40 2010 +0200 workqueue: change cancel_work_sync() to clear work->data In short: change cancel_work_sync(work) to mark this work as "never queued" upon return. When cancel_work_sync(work) succeeds, we know that this work can't be queued or running, and since we own WORK_STRUCT_PENDING nobody can change the bits in work->data under us. This means we can also clear the "cwq" part along with _PENDING bit lockless before return, unless the work is queued nobody can assume get_wq_data() is stable even under cwq->lock. This change can speedup the subsequent cancel/flush requests, and as Dmitry pointed out this simplifies the usage of work_struct's which can be queued on different workqueues. Consider this pseudo code from the input subsystem: struct workqueue_struct *WQ; struct work_struct *WORK; for (;;) { WQ = create_workqueue(); ... if (condition()) queue_work(WQ, WORK); ... cancel_work_sync(WORK); destroy_workqueue(WQ); } If condition() returns T and then F, cancel_work_sync() will crash the kernel because WORK->data still points to the already destroyed workqueue. With this patch the code like above becomes correct. Suggested-by: Dmitry Torokhov Signed-off-by: Oleg Nesterov Signed-off-by: Tejun Heo commit eef6a7d5c2f38adadab8240fabf43730fe796482 Author: Alan Stern Date: Fri Feb 12 17:39:21 2010 +0900 workqueue: warn about flush_scheduled_work() This patch (as1319) adds kerneldoc and a pointed warning to flush_scheduled_work(). Signed-off-by: Alan Stern Signed-off-by: Tejun Heo commit d9c5841e22231e4e49fd0a1004164e6fce59b7a6 Merge: b701a47 5967ed8 Author: H. Peter Anvin Date: Thu Apr 29 16:53:17 2010 -0700 Merge branch 'x86/asm' into x86/atomic Merge reason: Conflict between LOCK_PREFIX_HERE and relative alternatives pointers Resolved Conflicts: arch/x86/include/asm/alternative.h arch/x86/kernel/alternative.c Signed-off-by: H. Peter Anvin commit b701a47ba48b698976fb2fe05fb285b0edc1d26a Author: H. Peter Anvin Date: Thu Apr 29 16:03:57 2010 -0700 x86: Fix LOCK_PREFIX_HERE for uniprocessor build Checkin b3ac891b67bd4b1fc728d1c784cad1212dea433d: x86: Add support for lock prefix in alternatives ... did not define LOCK_PREFIX_HERE in the case of a uniprocessor build. As a result, it would cause any of the usages of this macro to fail on a uniprocessor build. Fix this by defining LOCK_PREFIX_HERE as a null string. Signed-off-by: H. Peter Anvin Cc: Luca Barbieri LKML-Reference: <1267005265-27958-2-git-send-email-luca@luca-barbieri.com> commit 1c6a800cde3b818fd8320b5d402f2d77d2948c00 Author: Arnaldo Carvalho de Melo Date: Thu Apr 29 18:58:32 2010 -0300 perf test: Initial regression testing command First an example with the first internal test: [acme@doppio linux-2.6-tip]$ perf test 1: vmlinux symtab matches kallsyms: Ok So it run just one test, that is "vmlinux symtab matches kallsyms", and it was successful. If we run it in verbose mode, we'll see details about errors and extra warnings for non-fatal problems: [acme@doppio linux-2.6-tip]$ perf test -v 1: vmlinux symtab matches kallsyms: --- start --- Looking at the vmlinux_path (5 entries long) No build_id in vmlinux, ignoring it No build_id in /boot/vmlinux, ignoring it No build_id in /boot/vmlinux-2.6.34-rc4-tip+, ignoring it Using /lib/modules/2.6.34-rc4-tip+/build/vmlinux for symbols Maps only in vmlinux: ffffffff81cb81b1-ffffffff81e1149b 0 [kernel].init.text ffffffff81e1149c-ffffffff9fffffff 0 [kernel].exit.text ffffffffff600000-ffffffffff6000ff 0 [kernel].vsyscall_0 ffffffffff600100-ffffffffff6003ff 0 [kernel].vsyscall_fn ffffffffff600400-ffffffffff6007ff 0 [kernel].vsyscall_1 ffffffffff600800-ffffffffffffffff 0 [kernel].vsyscall_2 Maps in vmlinux with a different name in kallsyms: ffffffffff600000-ffffffffff6000ff 0 [kernel].vsyscall_0 in kallsyms as [kernel].0 ffffffffff600100-ffffffffff6003ff 0 [kernel].vsyscall_fn in kallsyms as: *ffffffffff600100-ffffffffff60012f 0 [kernel].2 ffffffffff600400-ffffffffff6007ff 0 [kernel].vsyscall_1 in kallsyms as [kernel].6 ffffffffff600800-ffffffffffffffff 0 [kernel].vsyscall_2 in kallsyms as [kernel].8 Maps only in kallsyms: ffffffffff600130-ffffffffff6003ff 0 [kernel].4 ---- end ---- vmlinux symtab matches kallsyms: Ok [acme@doppio linux-2.6-tip]$ In the above case we only know the name of the non contiguous kernel ranges in the address space when reading the symbol information from the ELF symtab in vmlinux. The /proc/kallsyms file lack this, we only notice they are separate because there are modules after the kernel and after that more kernel functions, so we need to have a module rbtree backed by the module .ko path to get symtabs in the vmlinux case. The tool uses it to match by address to emit appropriate warning, but don't considers this fatal. The .init.text and .exit.text ines, of course, aren't in kallsyms, so I left these cases just as extra info in verbose mode. The end of the sections also aren't in kallsyms, so we the symbols layer does another pass and sets the end addresses as the next map start minus one, which sometimes pads, causing harmless mismatches. But at least the symbols match, tested it by copying /proc/kallsyms to /tmp/kallsyms and doing changes to see if they were detected. This first test also should serve as a first stab at documenting the symbol library by providing a self contained example that exercises it together with comments about what is being done. More tests to check if actions done on a monitored app, like doing mmaps, etc, makes the kernel generate the expected events should be added next. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 5c0541d53ef3897494768decb09eb8f1087953a5 Author: Arnaldo Carvalho de Melo Date: Thu Apr 29 15:25:23 2010 -0300 perf symbols: Add machine helper routines Created when writing the first 'perf test' regression testing routine. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 883413341e479d4e9f9c69def4884b4c6e1cef4e Author: Will Deacon Date: Fri Apr 9 13:54:43 2010 +0100 ARM: 6046/1: ARM: OMAP: register PMU IRQs during board initialisation This patch updates the initialisation routines for the OMAP2 and OMAP3 boards so that they register their PMU IRQs with the PMU framework in the Kernel. Cc: Tony Lindgren Signed-off-by: Will Deacon Signed-off-by: Russell King commit 3e9cc70590287f7cb7e38793bbf968b3362b7612 Author: Will Deacon Date: Fri Apr 9 13:57:51 2010 +0100 ARM: 6049/1: ARM: pxa: register PMU IRQs during board initialisation This patch adds an initcall for the pxa platforms so that they register their PMU IRQs with the PMU framework in the Kernel. Cc: Eric Miao Signed-off-by: Will Deacon Signed-off-by: Russell King commit 861248d177145fc5861507e4607fec89fd0a0462 Author: Russell King Date: Fri Jan 15 22:12:46 2010 +0000 ARM: Integrator: pass 'khz' to integrator_time_init This is now what the clocksource/clockevent initialization functions want, so give them the timer tick rate directly. Signed-off-by: Russell King commit 13edd86d7a8b64735c60c308faac785a6f2257b2 Author: Russell King Date: Fri Jan 15 21:49:23 2010 +0000 ARM: Integrator: convert to generic clockevent support Signed-off-by: Russell King commit b9cedda230793cbf58eb012ddadedd490cc8e129 Author: Russell King Date: Fri Jan 15 18:10:33 2010 +0000 ARM: Integrator: convert to generic time support Signed-off-by: Russell King commit ba02a21544b41a65e58506f1d79353203d94b8b6 Author: Russell King Date: Sat Jan 16 15:07:08 2010 +0000 ARM: Improve documentation in arm_timer.h Signed-off-by: Russell King commit a285edcf18b8838814d645c7e411a337a825236e Author: Russell King Date: Thu Jan 14 19:59:37 2010 +0000 ARM: Fix Versatile&Integrator includes to behave in the same way as Realview Realview doesn't include mach/platform.h in mach/hardware.h, so make versatile behave in the same way. Also, move the definition of __io_address() into mach/hardware.h, just like Realview. Signed-off-by: Russell King commit de4338f40e48da3b604219909a1d4aa7aa60870f Author: Will Deacon Date: Fri Apr 9 13:57:02 2010 +0100 ARM: 6048/1: ARM: iop3xx: register PMU IRQs during board initialisation This patch adds an initcall for the iop3xx platforms so that they register their PMU IRQS with the PMU framework in the Kernel. Cc: Lennert Buytenhek Signed-off-by: Will Deacon Signed-off-by: Russell King commit cc761beda2426cf663a649b905b6643673ff7b30 Author: Aaro Koskinen Date: Tue Feb 16 22:06:14 2010 +0100 ARM: 5943/1: iop: n2100: enable serial interrupt Thecus N2100 has a jumper (J3/J4) to select whether the XINT1 interrupt line is connected to the second UHCI controller (position J3) or to the serial port UART (position J4). Currently, the kernel is hardcoded to assume the J3 position, and the serial port is always being used in polling mode. The patch adds the IRQ autodetection flag for the serial port interrupt, and also marks it as shared (as the driver for the second UHCI controller will request the interrupt in any case). Now, when the jumper is set to the J4 position, the serial port will have an interrupt line, resulting in less CPU overhead and faster throughput. Tested-by: Mikael Pettersson Signed-off-by: Aaro Koskinen Acked-by: Lennert Buytenhek Signed-off-by: Russell King commit 8716011315a5b2fa932fa1e7570c34975ed2cb14 Author: Will Deacon Date: Fri Apr 9 13:55:54 2010 +0100 ARM: 6047/1: ARM: BCMRING: register PMU IRQ during board initialisation This patch updates the initialisation routine for the BCMRING platform so that it registers its PMU IRQ with the PMU framework in the Kernel. Acked-by: Leo Chen Signed-off-by: Will Deacon Signed-off-by: Russell King commit 28d7f4ec98a8edb029ef24c1ee4af6a1ccbc9633 Author: Will Deacon Date: Thu Apr 29 17:11:45 2010 +0100 ARM: 6063/1: pmu: add enum describing PMU types This patch adds an enum describing the potential PMU device types in preparation for PMU device registration via platform devices. Signed-off-by: Will Deacon Signed-off-by: Russell King commit 1483feac74fdfd84a7ed7586c66482842e3b6e86 Author: Matt Fleming Date: Wed Apr 28 11:11:30 2010 +0000 sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n arch/sh/kernel/smp.c:164: error: conflicting types for 'native_cpu_disable' /home/matt/src/kernels/sh-2.6/arch/sh/include/asm/smp.h:48: error: previous declaration of 'native_cpu_disable' was here Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 5f737b39be9110bd64874f508bd89ba27746b17e Author: Magnus Damm Date: Wed Apr 28 05:46:11 2010 +0000 sh: add CONFIG_VIRTUALIZATION for virtio support Add CONFIG_VIRTUALIZATION to the SH architecture and include the virtio code there. Used to enable the virtio drivers under QEMU. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2e531fa0d0868f5114c2b3a782ab02eb9d6f914d Author: Joern Engel Date: Thu Apr 29 14:56:37 2010 +0200 LogFS: Fix typo in b6349ac8 Signed-off-by: Joern Engel commit 3272c8a57b77a7277a740e211fe12171e4b37e99 Author: Dan Carpenter Date: Wed Apr 21 12:33:54 2010 +0200 logfs: testing the wrong variable There is a typo here. We should test "last" instead of "first". Signed-off-by: Dan Carpenter Signed-off-by: Joern Engel commit 30a564be9d9554c168a654eddc2165869cc0d7bf Author: Thomas Gleixner Date: Tue Apr 13 15:31:36 2010 +0200 x86, hpet: Restrict read back to affected ATI chipsets After programming the HPET, we do a readback as a workaround for ATI/SBx00 chipsets as a synchronization. Unfortunately this triggers an erratum in newer ICH chipsets (ICH9+) where reading the comparator immediately after the write returns the old value. Furthermore, as always, I/O reads are bad for performance. Therefore, restrict the readback to the chipsets that need it, or, for debugging purposes, when we are running with hpet=verbose. Signed-off-by: Thomas Gleixner Acked-by: Venkatesh Pallipadi LKML-Reference: <20100225185348.GA9674@linux-os.sc.intel.com> Signed-off-by: H. Peter Anvin commit 6fc108a08dcddf8f9113cc7102ddaacf7ed37a6b Author: Jan Beulich Date: Wed Apr 21 15:23:44 2010 +0100 x86: Clean up arch/x86/Kconfig* No functional change intended. Signed-off-by: Jan Beulich LKML-Reference: <4BCF2690020000780003B340@vpn.id2.novell.com> Signed-off-by: H. Peter Anvin commit 47f9fe26299ae022ac1e3fa12e7e73def62b7898 Author: Jan Beulich Date: Wed Apr 21 16:19:57 2010 +0100 x86-64: Don't export init_level4_pgt It's not used by any module, and i386 (as well as some other arches) also doesn't export its equivalent (swapper_pg_dir). Signed-off-by: Jan Beulich LKML-Reference: <4BCF33BD020000780003B3E4@vpn.id2.novell.com> Signed-off-by: H. Peter Anvin commit 5967ed87ade85a421ef814296c3c7f182b08c225 Author: Jan Beulich Date: Wed Apr 21 16:08:14 2010 +0100 x86-64: Reduce SMP locks table size Reduce the SMP locks table size by using relative pointers instead of absolute ones, thus cutting the table size by half. Signed-off-by: Jan Beulich LKML-Reference: <4BCF30FE020000780003B3B6@vpn.id2.novell.com> Signed-off-by: H. Peter Anvin commit 2e61878698781d6a9a8bfbaa4ea9c5ddb5a178c3 Author: Jan Beulich Date: Wed Apr 21 16:13:20 2010 +0100 x86-64: Combine SRAT regions when possible ... i.e. when the hole between two regions isn't occupied by memory on another node. This reduces the memory->node table size, thus reducing cache footprint of lookups, which got increased significantly some time ago, and things go back to how they were before that change on the systems I looked at. Signed-off-by: Jan Beulich LKML-Reference: <4BCF3230020000780003B3CA@vpn.id2.novell.com> Signed-off-by: H. Peter Anvin commit 402af0d7c692ddcfa2333e93d3f275ebd0487926 Author: Jan Beulich Date: Wed Apr 21 15:21:51 2010 +0100 x86, asm: Introduce and use percpu_inc() ... generating slightly smaller code. Signed-off-by: Jan Beulich LKML-Reference: <4BCF261F020000780003B33C@vpn.id2.novell.com> Signed-off-by: H. Peter Anvin commit fcaaade1db63bb2d6f7611d7824eb50d2f07a546 Author: Stephen Smalley Date: Wed Apr 28 15:57:57 2010 -0400 selinux: generalize disabling of execmem for plt-in-heap archs On Tue, 2010-04-27 at 11:47 -0700, David Miller wrote: > From: "Tom \"spot\" Callaway" > Date: Tue, 27 Apr 2010 14:20:21 -0400 > > > [root@apollo ~]$ cat /proc/2174/maps > > 00010000-00014000 r-xp 00000000 fd:00 15466577 > > /sbin/mingetty > > 00022000-00024000 rwxp 00002000 fd:00 15466577 > > /sbin/mingetty > > 00024000-00046000 rwxp 00000000 00:00 0 > > [heap] > > SELINUX probably barfs on the executable heap, the PLT is in the HEAP > just like powerpc32 and that's why VM_DATA_DEFAULT_FLAGS has to set > both executable and writable. > > You also can't remove the CONFIG_PPC32 ifdefs in selinux, since > because of the VM_DATA_DEFAULT_FLAGS setting used still in that arch, > the heap will always have executable permission, just like sparc does. > You have to support those binaries forever, whether you like it or not. > > Let's just replace the CONFIG_PPC32 ifdef in SELINUX with CONFIG_PPC32 > || CONFIG_SPARC as in Tom's original patch and let's be done with > this. > > In fact I would go through all the arch/ header files and check the > VM_DATA_DEFAULT_FLAGS settings and add the necessary new ifdefs to the > SELINUX code so that other platforms don't have the pain of having to > go through this process too. To avoid maintaining per-arch ifdefs, it seems that we could just directly use (VM_DATA_DEFAULT_FLAGS & VM_EXEC) as the basis for deciding whether to enable or disable these checks. VM_DATA_DEFAULT_FLAGS isn't constant on some architectures but instead depends on current->personality, but we want this applied uniformly. So we'll just use the initial task state to determine whether or not to enable these checks. Signed-off-by: Stephen Smalley Acked-by: David S. Miller Signed-off-by: James Morris commit f84af32cbca70a3c6d30463dc08c7984af11c277 Author: Eric Dumazet Date: Wed Apr 28 15:31:51 2010 -0700 net: ip_queue_rcv_skb() helper When queueing a skb to socket, we can immediately release its dst if target socket do not use IP_CMSG_PKTINFO. tcp_data_queue() can drop dst too. This to benefit from a hot cache line and avoid the receiver, possibly on another cpu, to dirty this cache line himself. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 617c9a7e398878d036a3aa9a063ccba145854b45 Author: Roland Dreier Date: Wed Apr 28 14:57:40 2010 -0700 RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays Using compile-time designated initializers for the handler arrays instead of open-coding the initialization in iwch_cm_init() is (IMHO) cleaner, and leads to substantially smaller code: on my x86-64 build, bloat-o-meter shows: add/remove: 0/1 grow/shrink: 4/3 up/down: 4/-1682 (-1678) function old new delta tx_ack 167 168 +1 state_set 55 56 +1 start_ep_timer 99 100 +1 pass_establish 177 178 +1 act_open_req_arp_failure 39 38 -1 sched 84 82 -2 iwch_cm_init 442 91 -351 work_handlers 1328 - -1328 Signed-off-by: Roland Dreier commit 4b0b72f7dd617b13abd1b04c947e15873e011a24 Author: Eric Dumazet Date: Wed Apr 28 14:35:48 2010 -0700 net: speedup udp receive path Since commit 95766fff ([UDP]: Add memory accounting.), each received packet needs one extra sock_lock()/sock_release() pair. This added latency because of possible backlog handling. Then later, ticket spinlocks added yet another latency source in case of DDOS. This patch introduces lock_sock_bh() and unlock_sock_bh() synchronization primitives, avoiding one atomic operation and backlog processing. skb_free_datagram_locked() uses them instead of full blown lock_sock()/release_sock(). skb is orphaned inside locked section for proper socket memory reclaim, and finally freed outside of it. UDP receive path now take the socket spinlock only once. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cfc1fbb079b265bf69d4ceba590a2e2c1a1cde33 Author: Emil Tantilov Date: Wed Apr 28 14:24:51 2010 -0700 igb: Clean up left over prototype of igb_get_hw_dev_name() Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 28b4c3bf1c4aa306fc5189fc7d556aa780c68e98 Author: Hauke Mehrtens Date: Wed Apr 28 14:23:15 2010 -0700 wireless: Fix merge. in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad you added "int i;" into wl1271_main.c which is unused in that function. This patch fixes the merge problem: Signed-off-by: Hauke Mehrtens Signed-off-by: David S. Miller commit 8fc214ba958648ab111a173f2db7b0e1dfed5b11 Author: Johannes Berg Date: Wed Apr 28 17:40:43 2010 +0200 mac80211: notify driver about IBSS status Some drivers (e.g. iwlwifi) need to know and try to figure it out based on other things, but making it explicit is definitely better. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 76f273640134f3eb8257179cd5b3bc6ba5fe4a96 Author: Stanislaw Gruszka Date: Wed Apr 28 17:03:15 2010 +0200 mac80211: fix supported rates IE if AP doesn't give us it's rates If AP do not provide us supported rates before assiociation, send all rates we are supporting instead of empty information element. v1 -> v2: Add comment. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit f0b058b61711ebf5be94d6865ca7b2c259b71d37 Author: Stanislaw Gruszka Date: Wed Apr 28 15:17:03 2010 +0200 mac80211: do not wip out old supported rates Use old supported rates, if AP do not provide supported rates information element in a new managment frame. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit f7f7cc47fce6f01c3d3374c51508859c328ad5b2 Author: Dan Carpenter Date: Wed Apr 28 11:01:15 2010 +0200 iwl: cleanup: remove unneeded error handling This is just a cleanup and doesn't change how the code works. debugfs_create_dir() and debugfs_create_file() return an error pointer (-ENODEV) if CONFIG_DEBUG_FS is not enabled, otherwise if an error occurs they return NULL. This is how they are implemented and what it says in the DebugFS documentation. DebugFS can not be compiled as a module. As a result, we only need to check for error pointers and particularly -ENODEV one time to know that DebugFS is enabled. This patch keeps the first check for error pointers and removes the rest. The other reason for this patch, is that it silences some Smatch warnings. Smatch sees the condition "(result != -ENODEV)" and assumes that it's possible for "result" to equal -ENODEV. If it were possible it would lead to an error pointer dereference. But since it's not, we can just remove the check. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit baff8006b58bb7fca5d1ea1825bc8c6486900303 Author: Helmut Schaa Date: Wed Apr 28 09:58:59 2010 +0200 rt2x00: rt2800lib: update rfcsr & bbp init code for SoC devices Update the rfcsr and bbp init code for SoC devices to match with the latest Ralink driver. To have better control over which values are used for the register initialization create a new function rt2800_is_305x_soc which checks for SoC interface type, the correct RT chipset and the correct RF chipset. This is based on the assumption that all rt305x SoC devices use a rt2872 and rf3020/rf3021/rf3022. In case an unknown RF chipset is found on a SoC device with a rt2872 don't treat it as rt305x and just print a message. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 23a7a51c5a35b30aa3edcc31a6a57b01c523b4cd Author: Luciano Coelho Date: Wed Apr 28 09:50:02 2010 +0300 wl1271: fix a bunch of sparse warnings A couple of sparse warnings in some rate settings (missing cpu_to_le32) were fixed. Changed the conf_sg_settings struct from le to native endianess. The values are converted to le when copying them to the acx command instead. Reported-by: Johannes Berg Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 82429d32ca3bae9d67faa32ffbc989be2e63094f Author: Juuso Oikarinen Date: Wed Apr 28 09:50:01 2010 +0300 wl1271: Rewrite hardware keep-alive handling The driver had a join command without keep-alive restart procedures in the channel changing code. After associated scans, the mac80211 does re-set the current channel, causing the join to occur. This would stop the hardware keep alive. To make the joins safer in this respect, this patch adds a join function that does the hardware-keep-alive magic along the join. This is now invoked in the above mentioned scenario, and also other scenarios. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 141418c7ed22849449f39f8938c9cf0eae6c524f Author: Saravanan Dhanabal Date: Wed Apr 28 09:50:00 2010 +0300 wl1271: Configure QOS nullfunc template for U-APSD When U-APSD is enabled, device is not sending power save state notifications to AP using QOS nullfunc frames. This patch configures nullfunc templates needed for U-APSD. Signed-off-by: Saravanan Dhanabal Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 16092b5cccd6f3a8d1957ca004c97947e07018db Author: Juuso Oikarinen Date: Wed Apr 28 09:49:59 2010 +0300 wl1271: Improve command polling In testing I noticed that the wl1271 commands fall into two categories. In the first category are "fast" commands, these mostly take only 0 or 1 polls to complete, but occasionally upto 50 (giving a 0.5ms execution time.) In the second category, the command completion takes well more than 0.5ms (from 1.5ms upwards.) This patch fixes command polling such that it is optimal for the fast commands, but also allows sleep for the longer ones. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 62dad5b0be39aa736fa35e63bf009ab2c574ef8c Author: Benoit Papillault Date: Wed Apr 28 00:08:24 2010 +0200 ath9k: Added get_survey callback in order to get channel noise Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit d10e2e02f5a4382ec97ec08e809469fcaae2f0f7 Author: John W. Linville Date: Tue Apr 27 16:57:38 2010 -0400 rtl8180: use cached queue mapping for skb in rtl8180_tx Signed-off-by: John W. Linville commit ca962557c2f2aa14f8032006ce17ebb4ff73db55 Author: Dan Williams Date: Wed Apr 28 12:37:46 2010 -0700 libertas: fix 8686 firmware loading regression The 'ready' condition was incorrectly evaluated which sometimes lead to failures loading the second-stage firmware on 8686 devices. (This was introduced in "libertas: consolidate SDIO firmware wait code". -- JWL) Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 446cfaa412beef0dd6cb0edf3b4eaed34d824537 Author: John W. Linville Date: Mon Apr 26 16:09:28 2010 -0400 wl1251: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 6ca4fed3d4ec9887208ea955861fecde4b7a02a1 Author: John W. Linville Date: Mon Apr 26 16:09:27 2010 -0400 rt2x00: remove usage of deprecated noise value Signed-off-by: John W. Linville Acked-by: Gertjan van Wingerde commit 0cbb3b5e8e047fddabd4769fe497cb9f7e6f39b9 Author: John W. Linville Date: Mon Apr 26 16:09:26 2010 -0400 p54: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 699622a7b5c91cadc08bd77a69711dfbca1df3b1 Author: John W. Linville Date: Mon Apr 26 16:09:25 2010 -0400 libertas_tf: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 83beaacc2a0441d13f2706105b5ffaf945f84594 Author: John W. Linville Date: Mon Apr 26 16:09:23 2010 -0400 b43legacy: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 4a277dd8da28b615f4c683b993e01d71f2e3aaec Author: John W. Linville Date: Mon Apr 26 16:09:22 2010 -0400 b43: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 32a0a33f198d1c0386a39285ea55564340d2d7d7 Author: John W. Linville Date: Mon Apr 26 16:09:21 2010 -0400 ath9k: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 54c7c91e659f657afa13315189965ecd8ba11d9d Author: John W. Linville Date: Mon Apr 26 16:09:19 2010 -0400 ath5k: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 5d6566ff356a19fb6ad994717cb937ff88063fa6 Author: John W. Linville Date: Mon Apr 26 16:09:18 2010 -0400 ar9170: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 3377d1b903e50d58a6aecf495092b6e1ffc0cd32 Author: John W. Linville Date: Mon Apr 26 16:09:16 2010 -0400 mwl8k: remove usage of deprecated noise value Signed-off-by: John W. Linville commit 2c485209a5c73fe94f4074e381cdc1ee24ca94a8 Author: Sjur Braendeland Date: Wed Apr 28 08:54:40 2010 +0000 Bugfix: Link selection was swapped in switch. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 8391c4aab1aa4f47a9dab2c1ec3ebd2cbf09df1b Author: Sjur Braendeland Date: Wed Apr 28 08:54:39 2010 +0000 caif: Bugfixes in CAIF netdevice for close and flow control Changes: o Bugfix: Flow control was causing the device to be destroyed. o Bugfix: Handle CAIF channel connect failures. o If the underlying link layer is gone the net-device is no longer removed, but closed. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit bece7b2398d073d11b2e352405a3ecd3a1e39c60 Author: Sjur Braendeland Date: Wed Apr 28 08:54:38 2010 +0000 caif: Rewritten socket implementation Changes: This is a complete re-write of the socket layer. Making the socket implementation more aligned with the other socket layers and using more of the support functions available in sock.c. Lots of code is copied from af_unix (and some from af_irda). Non-blocking mode should be working as well. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 8d545c8f958f5f433c50a00762ce1f231ed56eee Author: Sjur Braendeland Date: Wed Apr 28 08:54:37 2010 +0000 caif: Disconnect without waiting for response Changes: o Function cfcnfg_disconn_adapt_layer is changed to do asynchronous disconnect, not waiting for any response from the modem. Due to this the function cfcnfg_linkdestroy_rsp does nothing anymore. o Because disconnect may take down a connection before a connect response is received the function cfcnfg_linkup_rsp is checking if the client is still waiting for the response, if not a disconnect request is sent to the modem. o cfctrl is no longer keeping track of pending disconnect requests. o Added function cfctrl_cancel_req, which is used for deleting a pending connect request if disconnect is done before connect response is received. o Removed unused function cfctrl_insert_req2 o Added better handling of connect reject from modem. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 5b2086567503f9b55136642031ec0067319f58e0 Author: Sjur Braendeland Date: Wed Apr 28 08:54:36 2010 +0000 caif: Add reference counting to service layer Changes: o Added functions cfsrvl_get and cfsrvl_put. o Added support release_client to use by socket and net device. o Increase reference counting for in-flight packets from cfmuxl Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit e539d83cc8a4fa581cbf8ed288fdadb19a692cb0 Author: Sjur Braendeland Date: Wed Apr 28 08:54:35 2010 +0000 caif: Rename functions in cfcnfg and caif_dev Changes: o Renamed cfcnfg_del_adapt_layer to cfcnfg_disconn_adapt_layer o Fixed typo cfcfg to cfcnfg o Renamed linkid to channel_id o Updated documentation in caif_dev.h o Minor formatting changes Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit d3f744e0d6c1c27a10cdceac6eb946122188dbc9 Author: Sjur Braendeland Date: Wed Apr 28 08:54:34 2010 +0000 caif: Ldisc add permission check and mem-alloc error check Changes: o Added permission checks for installing. CAP_SYS_ADMIN and CAP_SYS_TTY_CONFIG can install the ldisc. o Check if allocation of skb was successful. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit a4900ac9f7d10ad062e54dd03125e3619e0ac17a Author: Ben Hutchings Date: Wed Apr 28 09:30:43 2010 +0000 sfc: Create multiple TX queues Create a core TX queue and 2 hardware TX queues for each channel. If separate_tx_channels is set, create equal numbers of RX and TX channels instead. Rewrite the channel and queue iteration macros accordingly. Eliminate efx_channel::used_flags as redundant. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 5298c37f4d1f0360082be9d9e3a236b9cc114a03 Author: Ben Hutchings Date: Wed Apr 28 09:30:30 2010 +0000 sfc: Test only the first pair of TX queues This makes no immediate difference, but we definitely do not want to test all TX queues once we allocate a pair of TX queues to each channel. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit affaf485ca628cb7d7f57ae5e2b8c710c58b11aa Author: Steve Hodgson Date: Wed Apr 28 09:30:22 2010 +0000 sfc: Add Siena PHY BIST and cable diagnostic support Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit c28884c57400de326ba4c1ff9608f1d425bdd0fd Author: Ben Hutchings Date: Wed Apr 28 09:30:00 2010 +0000 sfc: Clean up efx_nic::irq_zero_count There is no need for this to be unsigned long; make it unsigned int. It does need a line in kernel-doc, so add that. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3d07df11c4be368681c0b8228c3d80eeb1fcfabd Author: Ben Hutchings Date: Wed Apr 28 09:29:50 2010 +0000 sfc: Add necessary parentheses to macro definitions in net_driver.h Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit fa236e18047ec178b07fdf3f24f286eef1797842 Author: Ben Hutchings Date: Wed Apr 28 09:29:42 2010 +0000 sfc: Break NAPI processing after one ring-full of TX completions Currently TX completions do not count towards the NAPI budget. This means a continuous stream of TX completions can cause the polling function to loop indefinitely with scheduling disabled. To avoid this, follow the common practice of reporting the budget spent after processing one ring-full of TX completions. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3a595102d4298a357d70aaf1d47ae86d92708ea9 Author: Steve Hodgson Date: Wed Apr 28 09:29:32 2010 +0000 sfc: Set PERIODIC_NOEVENT flag for MC_CMD_MAC_STATS When set, an event is not sent whenever periodic MAC statistics are raised. This avoids unnecessary wake-ups. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit fbcfe8e1525e6f2f633329147cdbb9ab7029f58a Author: Ben Hutchings Date: Wed Apr 28 09:29:14 2010 +0000 sfc: Update MCDI protocol definitions Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit d614cfbc2f6f631e4dba72f945f185ea45ff3f78 Author: Ben Hutchings Date: Wed Apr 28 09:29:02 2010 +0000 sfc: Enable IPv6 RSS using random key for Toeplitz hash Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 97e1eaa0e943439208a692b00dce4a8a3006760f Author: Steve Hodgson Date: Wed Apr 28 09:28:52 2010 +0000 sfc: Read MEM_STAT for SRM_PERR as well as MEM_PERR errors Parity errors in different blocks of SRAM may set one of two different interrupt flags. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit b548a988a9d08f2b06f6810b1a4cde6f632bd307 Author: Ben Hutchings Date: Wed Apr 28 09:28:36 2010 +0000 sfc: Log specific message for failure of NVRAM self-test Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 41b7e4c3268d9d2056b9c94cceb386649f7b185b Author: Steve Hodgson Date: Wed Apr 28 09:28:27 2010 +0000 sfc: Extend the legacy interrupt workarounds Siena has two problems with legacy interrupts: 1. There is no synchronisation between the ISR read completion, and the interrupt deassert message. 2. A downstream read at the "wrong" moment can return 0, and suppress generating the next interrupt. Falcon should suffer from both of these, and it appears it does. Enable EFX_WORKAROUND_15783 on Falcon as well. Also, when we see queues == 0, ensure we always schedule or rearm every event queue. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit b7b40eeb0f76e73503a7e5a98d1353c2e42d9a18 Author: Steve Hodgson Date: Wed Apr 28 09:28:10 2010 +0000 sfc: Reconfigure the XAUI serdes after an EM reset Fix a regression introduced in d3245b28ef2a45ec4e115062a38100bd06229289 "sfc: Refactor link configuration". Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit ef524f2e74b39cdf8d42b9d999c43b5144ed66c9 Author: Steve Hodgson Date: Wed Apr 28 09:27:54 2010 +0000 sfc: Stop masking out XGMII faults over reconfigures The aim of this code was to avoid a spurious XGMII fault over a MAC reconfigure. It's less relevant now that the PHY reconfigure isn't called from the MAC reconfigure. After applying this patch, our link stress test passed 48 hours of testing without ever resetting the PHY. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6369545945b90daa1a73fca174da9194c398417c Author: Steve Hodgson Date: Wed Apr 28 09:27:36 2010 +0000 sfc: Handle serious errors in exactly one interrupt handler 'Fatal' errors set an interrupt flag associated with a specific event queue; only read the syndrome vector if we see that queue's flag set (legacy interrupts) or in the interrupt handler for that queue (MSI). Do not ignore an interrupt if the fatal error flag is set but specific error flags are all zero. Even if we don't schedule a reset, we must respect the queue mask and rearm the appropriate event queues. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 00bbb4a5344a5f81cf5d48e781e5c0df3e588d17 Author: Ben Hutchings Date: Wed Apr 28 09:27:14 2010 +0000 sfc: Consistently report short MCDI responses as EIO In some cases failing functions were returning 0 which is obviously wrong. In other cases they were returning inappropriate error codes. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit b17424b0b29f94561e73ab9be34037746b378089 Author: Steve Hodgson Date: Wed Apr 28 09:25:22 2010 +0000 sfc: Ignore parity errors in the other port's SRAM Siena has a separate SRAM bank for each port. On single-port boards these can be merged together, so each port has an interrupt flag for parity errors in the other port's SRAM. Currently we do not enable such merging and should mask this interrupt source. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 7cd26ce5f7dbd06698ab3413b1c5a77cf27f8c0a Author: FUJITA Tomonori Date: Tue Apr 27 14:57:05 2010 +0000 sky2: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit 214f1c87bd86f9061fedbae929bc4a7a7089ee75 Author: Eric Dumazet Date: Tue Apr 27 12:18:13 2010 +0000 bnx2x: Remove two prefetch() 1) Even on 64bit arches, sizeof(struct sk_buff) < 256 2) No need to prefetch same pointer twice. Signed-off-by: Eric Dumazet Acked-by: Eilon Greenstein Acked-by: Eliezer Tamir Signed-off-by: David S. Miller commit cf134d5bfb19cdee922b95738ce3cfe86c0e8f7a Author: Liam Girdwood Date: Fri Mar 26 20:05:54 2010 +0000 ASoC: tlv320dac33 - disable regulators at i2c remove() Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1849235876b046e26a07e33972906bd23fbb8705 Author: Liam Girdwood Date: Mon Mar 22 19:35:06 2010 +0000 ASoC: zoom2 - update DAPM pins Remove bogus twl4030 pins Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1beb91f004e0efe83b933ca6c84a8b9935f4cf53 Author: Liam Girdwood Date: Mon Mar 22 19:30:54 2010 +0000 ASoC: pandora - update DAPM pins Remove bogus TWL4030 pins. Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit dde3a7e9cb187e25deeac0269733116d4840f91e Author: Mark Brown Date: Tue Apr 27 20:01:56 2010 +0100 ASoC: Remove redundant WM8960 SYSCLKSEL clkdiv option The SYSCLK source is automatically managed when configuring the PLL. Signed-off-by: Mark Brown Acked-by: Mark Brown commit d5ffd75a27fade39ba5df3b07290c5a2c297b9bd Author: Nicholas Nunley Date: Tue Apr 27 19:47:49 2010 -0700 ixgbe: disable MSI-X by default on certain Cisco adapters Due to an errata in 82598 parts MSI-X needs to be disabled in certain ixgbe devices designed to transfer peer-to-peer traffic on the PCIe bus. This patch sets the default interrupt type to MSI rather than MSI-X for specific Cisco ixgbe adapters. Signed-off-by: Nicholas Nunley Acked-by: John Ronciak Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit be94bbb5db4de0f3a2a5405511ea3ebea261f2c8 Author: Jan Blunck Date: Tue Apr 27 18:48:52 2010 -0700 drivers/sbus/char/flash.c: flash_read should update ppos instead of file->f_pos flash_read() updates file->f_pos directly instead of the ppos given. The VFS later updates the file->f_pos and overwrites it with the unchanged value of ppos. Signed-off-by: Jan Blunck Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 18acde52b83bd1c8e1d007db519f46d344aa13ed Author: Arnaldo Carvalho de Melo Date: Tue Apr 27 22:26:51 2010 -0300 perf tools: Create $(OUTPUT)arch/$(ARCH)/util/ directory So that "make -C tools/perf O=/tmp/some/path" works again. Problem introduced in: cd932c5 "perf: Move arch specific code into separate arch director" Cc: Ian Munsie Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit afe0159d935ab731c682e811356914bb2be9470c Author: stephen hemminger Date: Tue Apr 27 15:01:07 2010 +0000 bridge: multicast_flood cleanup Move some declarations around to make it clearer which variables are being used inside loop. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 83f6a740b4e52f88e312223df2fc94016a208618 Author: stephen hemminger Date: Tue Apr 27 15:01:06 2010 +0000 bridge: multicast port group RCU fix The recently introduced bridge mulitcast port group list was only partially using RCU correctly. It was missing rcu_dereference() and missing the necessary barrier on deletion. The code should have used one of the standard list methods (list or hlist) instead of open coding a RCU based link list. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 168d40ee3d147ae20860e7916bd79b636cbe8fd5 Author: stephen hemminger Date: Tue Apr 27 15:01:05 2010 +0000 bridge: multicast flood Fix unsafe usage of RCU. Would never work on Alpha SMP because of lack of rcu_dereference() Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7e80c124485b73146deadce14fd4da2054581806 Author: stephen hemminger Date: Tue Apr 27 15:01:04 2010 +0000 bridge: simplify multicast_add_router By coding slightly differently, there are only two cases to deal with: add at head and add after previous entry. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 37e44bc50d91df1fe7edcf6f02fe168c6d802e64 Author: Steven Rostedt Date: Tue Apr 27 21:04:24 2010 -0400 tracing: Fix sleep time function profiling When sleep_time is off the function profiler ignores the time that a task is scheduled out. When the task is scheduled out a timestamp is taken. When the task is scheduled back in, the timestamp is compared to the current time and the saved calltimes are adjusted accordingly. But when stopping the function profiler, the sched switch hook that does this adjustment was stopped before shutting down the tracer. This allowed some tasks to not get their timestamps set when they scheduled out. When the function profiler started again, this would skew the times of the scheduler functions. This patch moves the stopping of the sched switch to after the function profiler is stopped. It also ignores zero set calltimes, which may happen on start up. Signed-off-by: Steven Rostedt commit dcd79aebe736e88d62aeb4a7712ac0ba7cc2aa96 Author: Taku Izumi Date: Tue Apr 27 14:39:53 2010 +0000 ixgbe: add registers etc. printout code just before resetting adapters This patch adds registers (,tx/rx rings' status and so on) printout code just before resetting adapters. This will be helpful for detecting the root cause of adapters reset. Signed-off-by: Taku Izumi Signed-off-by: Koki Sanagi Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c97ec42a7a35d214e0c715f77e2ccdfe8ac5bf7c Author: Taku Izumi Date: Tue Apr 27 14:39:30 2010 +0000 igb: add registers etc. printout code just before resetting adapters This patch adds registers (,tx/rx rings' status and so on) printout code just before resetting adapters. This will be helpful for detecting the root cause of adapters reset. Signed-off-by: Taku Izumi Signed-off-by: Koki Sanagi Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 84f4ee902ad3ee964b7b3a13d5b7cf9c086e9916 Author: Taku Izumi Date: Tue Apr 27 14:39:08 2010 +0000 e1000e: add registers etc. printout code just before resetting adapters This patch adds registers (,tx/rx rings' status and so on) printout code just before resetting adapters. This will be helpful for detecting the root cause of adapters reset. Signed-off-by: Taku Izumi Signed-off-by: Koki Sanagi Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ebe6aa5ac456a13213ed563863e70dd441618a97 Author: Jeff Layton Date: Sat Apr 24 07:57:47 2010 -0400 cifs: eliminate "first_time" parm to CIFS_SessSetup We can use the is_first_ses_reconnect() function to determine this. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit cbf6968098f89d3216d074f06544b5032b344da4 Author: Arnaldo Carvalho de Melo Date: Tue Apr 27 21:22:44 2010 -0300 perf machines: Make the machines class adopt the dsos__fprintf methods Now those methods don't operate on a global list of dsos, but on lists of machines, so make this clear by renaming the functions. Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Zhang, Yanmin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d28c62232e50eab202bcd3f19b5c7a25b8b900b6 Author: Arnaldo Carvalho de Melo Date: Tue Apr 27 21:20:43 2010 -0300 perf machine: Adopt some map_groups functions Those functions operated on members now grouped in 'struct machine', so move those methods to this new class. The changes made to 'perf probe' shows that using this abstraction inserting probes on guests almost got supported for free. Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Masami Hiramatsu Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Zhang, Yanmin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 48ea8f5470aa6f35244d1b218316705ea88c0259 Author: Arnaldo Carvalho de Melo Date: Tue Apr 27 21:19:05 2010 -0300 perf machine: Pass buffer size to machine__mmap_name Don't blindly assume that the size of the buffer is enough, use snprintf. Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Zhang, Yanmin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 23346f21b277e3aae5e9989e711a11cbe8133a45 Author: Arnaldo Carvalho de Melo Date: Tue Apr 27 21:17:50 2010 -0300 perf tools: Rename "kernel_info" to "machine" struct kernel_info and kerninfo__ are too vague, what they really describe are machines, virtual ones or hosts. There are more changes to introduce helpers to shorten function calls and to make more clear what is really being done, but I left that for subsequent patches. Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Zhang, Yanmin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 675ad47375c76a7c3be4ace9554d92cd55518ced Author: Emil Tantilov Date: Tue Apr 27 14:02:58 2010 +0000 e1000: Use netdev_, pr_ and dev_ This patch is an alternative to similar patch provided by Joe Perches. Substitute DPRINTK macro for e_ that uses netdev_ and dev_ similar to e1000e. - Convert printk to pr_ where applicable. - Use common #define pr_fmt for the driver. - Use dev_ for displaying text in parts of the driver where the interface name is not assigned (like e1000_param.c). - Better align test with the new macros. CC: Joe Perches Signed-off-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d Author: David S. Miller Date: Tue Apr 27 16:49:58 2010 -0700 Revert "bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router()" This reverts commit ff65e8275f6c96a5eda57493bd84c4555decf7b3. As explained by Stephen Hemminger, the traversal doesn't require RCU handling as we hold a lock. The list addition et al. calls, on the other hand, do. Signed-off-by: David S. Miller commit 2a1f8794161d9d5d46881160279df62767197526 Author: Nick Nunley Date: Tue Apr 27 13:10:50 2010 +0000 ixgbevf: use DMA API instead of PCI DMA functions Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1b507730b7a9dfc00142283d5f4fc24e6553f3f4 Author: Nick Nunley Date: Tue Apr 27 13:10:27 2010 +0000 ixgbe: use DMA API instead of PCI DMA functions Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 47631f854ff1938770f185afde4857018827eba3 Author: Nick Nunley Date: Tue Apr 27 13:10:03 2010 +0000 ixgb: use DMA API instead of PCI DMA functions Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 123e9f1afe7b86f7c719d1289434c5c040758334 Author: Nick Nunley Date: Tue Apr 27 13:09:44 2010 +0000 igbvf: use DMA API instead of PCI DMA functions Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 59d71989352deb71bc0bba83802820de765f6e25 Author: Alexander Duyck Date: Tue Apr 27 13:09:25 2010 +0000 igb: convert igb from using PCI DMA functions to using DMA API functions This patch makes it so that igb now uses the DMA API functions instead of the PCI API functions. To do this the pci_dev pointer that was in the rings has been replaced with a device pointer, and as a result all references to [tr]x_ring->pdev have been replaced with [tr]x_ring->dev. This patch is based of of work originally done by Nicholas Nunley. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0be3f55f8aa5f9d1882255128bd79d4885b0cbe4 Author: Nick Nunley Date: Tue Apr 27 13:09:05 2010 +0000 e1000e: use DMA API instead of PCI DMA functions Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit b16f53bef9be0a756a0672e27d0a526686040e02 Author: Nick Nunley Date: Tue Apr 27 13:08:45 2010 +0000 e1000: use DMA API instead of PCI DMA functions Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ff65e8275f6c96a5eda57493bd84c4555decf7b3 Author: David S. Miller Date: Tue Apr 27 16:26:49 2010 -0700 bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router() Noticed by Michał Mirosław. Signed-off-by: David S. Miller commit 87b6cf51acb4999fff7e6841986874b108679cb4 Author: Dimitris Michailidis Date: Tue Apr 27 16:22:42 2010 -0700 cxgb4: set skb->rxhash Implement the ->set_flags ethtool method to control NETIF_F_RXHASH and set skb->rxhash to the HW calculated hash accordingly. Follow Eric Dumazet's suggestion and use the hash value raw. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 8cd9b13207f9a38e4da2d69bba51eb8dcbe1ead9 Author: Sebastian Andrzej Siewior Date: Tue Apr 27 15:54:50 2010 -0700 net/sb1250: setup the pdevice within the soc code doing it within the driver does not look good. And surely isn't how platform devices were meat to be used. Acked-by: Ralf Baechle Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: David S. Miller commit fa12abd7d3fbaa9f86f97baeb445cb71189ae1d1 Author: Sebastian Andrzej Siewior Date: Tue Apr 27 15:53:50 2010 -0700 net/sb1250: remove CONFIG_SIBYTE_STANDALONE CONFIG_SIBYTE_STANDALONE is gone since v2.6.31-rc1 ("MIPS: Sibyte: Remove standalone kernel support") This is a missing piece. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: David S. Miller commit cb84aa9b42b506299e5aea1ba4da26c03ab12877 Author: Eric Paris Date: Tue Apr 27 17:20:38 2010 -0400 LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE Most of the LSM common audit work uses LSM_AUDIT_DATA_* for the naming. This was not so for LSM_AUDIT_NO_AUDIT which means the generic initializer cannot be used. This patch just renames the flag so the generic initializer can be used. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 05fceb4ad7e8bf809a2a97061d6273d27d1a8449 Author: Jiri Pirko Date: Fri Apr 23 01:40:47 2010 +0000 net: disallow to use net_assign_generic externally Now there's no need to use this fuction directly because it's handled by register_pernet_device. So to make this simple and easy to understand, make this static to do not tempt potentional users. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 47d54d65826c4a498070a5e0e1d74ce665402b4d Author: Dimitris Michailidis Date: Tue Apr 27 12:24:16 2010 +0000 cxgb4: increase serial number length Some boards have longer serial numbers in their VPD, up to 24 bytes. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 226ec5fd6746c0ef2e9efb583b44d01264ea0bb5 Author: Dimitris Michailidis Date: Tue Apr 27 12:24:15 2010 +0000 cxgb4: parse the VPD instead of relying on a static VPD layout Some boards' VPDs contain additional keywords or have longer serial numbers, meaning the keyword locations are variable. Ditch the static layout and use the pci_vpd_* family of functions to parse the VPD instead. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit e330b3bcd83199dd63a819d8d12e40f9edae6c77 Author: Chase Douglas Date: Mon Apr 26 14:02:05 2010 -0400 tracing: Show sample std dev in function profiling When combined with function graph tracing the ftrace function profiler also prints the average run time of functions. While this gives us some good information, it doesn't tell us anything about the variance of the run times of the function. This change prints out the s^2 sample standard deviation alongside the average. This change adds one entry to the profile record structure. This increases the memory footprint of the function profiler by 1/3 on a 32-bit system, and by 1/5 on a 64-bit system when function graphing is enabled, though the memory is only allocated when the profiler is turned on. During the profiling, one extra line of code adds the squared calltime to the new record entry, so this should not adversly affect performance. Note that the square of the sample standard deviation is printed because there is no sqrt implementation for unsigned long long in the kernel. Signed-off-by: Chase Douglas LKML-Reference: <1272304925-2436-1-git-send-email-chase.douglas@canonical.com> [ fixed comment about ns^2 -> us^2 conversion ] Signed-off-by: Steven Rostedt commit c377411f2494a931ff7facdbb3a6839b1266bcf6 Author: Eric Dumazet Date: Tue Apr 27 15:13:20 2010 -0700 net: sk_add_backlog() take rmem_alloc into account Current socket backlog limit is not enough to really stop DDOS attacks, because user thread spend many time to process a full backlog each round, and user might crazy spin on socket lock. We should add backlog size and receive_queue size (aka rmem_alloc) to pace writers, and let user run without being slow down too much. Introduce a sk_rcvqueues_full() helper, to avoid taking socket lock in stress situations. Under huge stress from a multiqueue/RPS enabled NIC, a single flow udp receiver can now process ~200.000 pps (instead of ~100 pps before the patch) on a 8 core machine. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 6e7676c1a76aed6e957611d8d7a9e5592e23aeba Author: Changli Gao Date: Tue Apr 27 15:07:33 2010 -0700 net: batch skb dequeueing from softnet input_pkt_queue batch skb dequeueing from softnet input_pkt_queue to reduce potential lock contention when RPS is enabled. Note: in the worst case, the number of packets in a softnet_data may be double of netdev_max_backlog. Signed-off-by: Changli Gao Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c58dc01babfd58ec9e71a6ce080150dc27755d88 Author: David S. Miller Date: Tue Apr 27 15:05:31 2010 -0700 net: Make RFS socket operations not be inet specific. Idea from Eric Dumazet. As for placement inside of struct sock, I tried to choose a place that otherwise has a 32-bit hole on 64-bit systems. Signed-off-by: David S. Miller Acked-by: Eric Dumazet commit c4ee6a5348102b9cea49fb9adf88307445407911 Author: Anjali Singhai Date: Tue Apr 27 11:31:25 2010 +0000 ixgbe: Properly display 1 gig downshift warning for backplane Description: When using Intel smartspeed, the patch displays a warning when the link down shifts to 1 Gig. Signed-off-by: Anjali Singhai Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1c4f0ef8a30d17371e18bf923775c5ed6f83bc3c Author: Don Skidmore Date: Tue Apr 27 11:31:06 2010 +0000 ixgbe: cleanup ethtool autoneg input The way we were setting autoneg via ethtool was inconstant with that of our other drivers. It will change the following: If autoneg is off: >ethtool -a eth0 Pause parameters for eth0: Autonegotiate: off RX: off TX: off Before: >ethtool -A eth0 autoneg on >ethtool -a eth0 Pause parameters for eth0: Autonegotiate: off RX: off TX: off Now: >ethtool -A eth0 autoneg on >ethtool -a eth0 Pause parameters for eth0: Autonegotiate: on RX: on TX: on Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3203df043263e1bb64d8ba970eb17b0810945504 Author: Greg Rose Date: Tue Apr 27 11:31:45 2010 +0000 ixgbevf: Fix link speed display The ixgbevf driver would always report 10Gig speeds even when the link speed is downshifted to 1Gig. This patch fixes that problem. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a9cbd588fdb71ea415754c885e2f9f03e6bf1ba0 Author: Changli Gao Date: Mon Apr 26 23:06:24 2010 +0000 net: reimplement softnet_data.output_queue as a FIFO queue reimplement softnet_data.output_queue as a FIFO queue to keep the fairness among the qdiscs rescheduled. Signed-off-by: Changli Gao Acked-by: Eric Dumazet ---- include/linux/netdevice.h | 1 + net/core/dev.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) Signed-off-by: David S. Miller commit 05be7a868e229b26a5a7de217343f39b4dfed205 Author: Bill Pemberton Date: Tue Apr 27 16:20:15 2010 -0400 doc: Change urls for sparse The location of the sparse web page and git tree were no longer valid. This changes them to point to the current versions. Signed-off-by: Bill Pemberton Signed-off-by: Jiri Kosina commit 07271aa42d13378e67ebd79ea9ca1c4a5e2ad46f Author: Chase Douglas Date: Fri Apr 23 14:02:39 2010 -0400 tracing: Add documentation for trace commands mod, traceon/traceoff The mod command went in as commit 64e7c440618998fd69eee6ab490b042d12248021 The traceon/traceoff commands went in as commit 23b4ff3aa479c9e3bb23cb6b2d0a97878399784a Signed-off-by: Chase Douglas LKML-Reference: <1272045759-32018-1-git-send-email-chase.douglas@canonical.com> Signed-off-by: Steven Rostedt commit a2c40249a36d0b4d76d1caf6bf806e4ae5b06e8a Author: Shanyu Zhao Date: Tue Apr 27 11:15:12 2010 -0700 mac80211: fix rts threshold check Currently whenever rts thresold is set, every packet will use RTS protection no matter its size exceeds the threshold or not. This is due to a bug in the rts threshold check. if (len > tx->local->hw.wiphy->rts_threshold) { txrc.rts = rts = true; } Basically it is comparing an int (len) and a u32 (rts_threshold), and the variable len is assigned as: len = min_t(int, tx->skb->len + FCS_LEN, tx->local->hw.wiphy->frag_threshold); However, when frag_threshold is "-1", len is always "-1", which is 0xffffffff therefore rts is always set to true. CC: stable@kernel.org Signed-off-by: Shanyu Zhao Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit a060bbfe4ee95d115e8f9705a66894ac34e2c475 Author: Johannes Berg Date: Tue Apr 27 11:59:34 2010 +0200 mac80211: give virtual interface to hw_scan When scanning, it is somewhat important to scan on the correct virtual interface. All drivers that currently implement hw_scan only support a single virtual interface, but that may change and then we'd want to be ready. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b Author: Juuso Oikarinen Date: Tue Apr 27 12:47:41 2010 +0300 cfg80211: Remove default dynamic PS timeout value Now that the mac80211 is choosing dynamic ps timeouts based on the ps-qos network latency configuration, configure a default value of -1 as the dynamic ps timeout in cfg80211. This value allows the mac80211 to determine the value to be used. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 195e294d21e88af879da4f88db2ceeb4ec28a755 Author: Juuso Oikarinen Date: Tue Apr 27 12:47:40 2010 +0300 mac80211: Determine dynamic PS timeout based on ps-qos network latency Determine the dynamic PS timeout based on the configured ps-qos network latency. For backwards wext compatibility, allow the dynamic PS timeout configured by the cfg80211 to overrule the automatically determined value. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 3a37495268ab45507b4cab9d4cb18c5496ab7a10 Author: Vivek Natarajan Date: Tue Apr 27 13:05:38 2010 +0530 ath9k: Avoid corrupt frames being forwarded to mac80211. If bit 29 is set, MAC H/W can attempt to decrypt the received aggregate with WEP or TKIP, eventhough the received frame may be a CRC failed corrupted frame. If this bit is set, H/W obeys key type in keycache. If it is not set and if the key type in keycache is neither open nor AES, H/W forces key type to be open. But bit 29 should be set to 1 for AsyncFIFO feature to encrypt/decrypt the aggregate with WEP or TKIP. Cc: stable@kernel.org Reported-by: Johan Hovold Signed-off-by: Vivek Natarajan Signed-off-by: Ranga Rao Ravuri Signed-off-by: John W. Linville commit 8a8572a821e5763525f5e4ac104bc28fd798fd5e Author: Vivek Natarajan Date: Tue Apr 27 13:05:37 2010 +0530 ath9k_htc: Handle CONF_IDLE during unassociated state to save power. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 7b7b5e56d7bdfdd0eb5ea13e6c9613b16b8eac46 Author: Felix Fietkau Date: Tue Apr 27 01:23:36 2010 +0200 mac80211: implement ap isolation support Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit fd8aaaf3519f3fd3c82594e90bc6808072b94d54 Author: Felix Fietkau Date: Tue Apr 27 01:23:35 2010 +0200 cfg80211: add ap isolation support This is used to configure APs to not bridge traffic between connected stations. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 740c2679396d60763968ffd16362f1f5c8242172 Author: John W. Linville Date: Mon Apr 26 16:08:57 2010 -0400 MAINTAINERS: add entry for include/linux/iw_handler.h Signed-off-by: John W. Linville commit 5bea40069e46542f5691ec5771edc53e0ca58d71 Author: Luis R. Rodriguez Date: Mon Apr 26 15:04:41 2010 -0400 ath9k_hw: Fix TX interrupt mitigation settings TX interrupt mitigation reduces the number of interrupts by addressing several interrupt actions (AR_IMR_TXOK, AR_IMR_TXDESC) all in one interrupt so when enabling it discard setting the other interrupts. Without this TX interrupt mitigation would actually increase the number of interrupts two-fold. We still leave TX interrupt mitigation disabled as it is still being tested. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5d5d44d914623b6122f050ec900ea4016aa3a993 Author: Felix Fietkau Date: Mon Apr 26 15:04:40 2010 -0400 ath9k_hw: fix noisefloor timeout handling on AR9003 When the noisefloor calibration times out, do not load -50 into the registers, since this might cause rx issues. Instead, leave enough time for the noise floor calibration to complete until the next check. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0cf31079e98be01baffb22a2e3ad0cbc58420a41 Author: Felix Fietkau Date: Mon Apr 26 15:04:39 2010 -0400 ath9k_hw: Fix endian bug in an AR9003 EEPROM field Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit d10baf99ffd1926c30401342779866ae7d73e2c4 Author: Felix Fietkau Date: Mon Apr 26 15:04:38 2010 -0400 ath9k_hw: Fix typos in tx rate power level parsing for AR9003 Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 597a94b340f98bf4596ef59e938875afaa1815d6 Author: Felix Fietkau Date: Mon Apr 26 15:04:37 2010 -0400 ath9k_hw: use the configured power limit for AR9003 Since the new AR9003 EEPROM code does tune the card for the configured tx power level, we need to fill in the correct power limits in the TPC part of the DMA descriptor. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7f9f3600695bf68d11cdcf278d39f02eaadc3a00 Author: Felix Fietkau Date: Mon Apr 26 15:04:36 2010 -0400 ath9k: wake queue after processing edma rx frames Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6b42e8d03bef975085c0397806d00fbd1df67eb8 Author: Felix Fietkau Date: Mon Apr 26 15:04:35 2010 -0400 ath9k_hw: fix fast clock handling for 5GHz channels Combine multiple checks that were supposed to check for the same conditions, but didn't. Always enable fast PLL clock on AR9280 2.0 Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5b75d0fca5b8cd2657fb240f2112e272a115b2f9 Author: Felix Fietkau Date: Mon Apr 26 15:04:34 2010 -0400 ath9k_hw: update EEPROM data structure for AR9280 Adds read access for the 5 GHz fast clock flag Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e55537240f97635f9a7c42fac224ff80fa637624 Author: Vasanthakumar Thiagarajan Date: Mon Apr 26 15:04:33 2010 -0400 ath9k_hw: Fix usec to hw clock conversion in 5Ghz for ar9003 Fast clock operation (44Mhz) is enabled for 5Ghz in ar9003, so take care of the conversion from usec to hw clock. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit b360a884834a83ede845733cf344a29eb10dd2e3 Author: Luis R. Rodriguez Date: Mon Apr 26 15:04:32 2010 -0400 ath9k_hw: disable TX IQ calibration for AR9003 Disable TX IQ calibration, it was prematurely enabled in previous versions. Cc: Paul Shaw Cc: Thomas Hammel Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 83937227657545f9e7aa9bfcb4429e81c9135f46 Author: Felix Fietkau Date: Mon Apr 26 15:04:31 2010 -0400 ath9k_hw: fix typo in the AR9003 EEPROM data structure definition Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 14bc110463bafc1aa4a51d4443e9dc1a88b58c40 Author: Felix Fietkau Date: Mon Apr 26 15:04:30 2010 -0400 ath9k_hw: fix pll clock setting for 5ghz on AR9003 Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2fcb91317360d75efa3cbf4b200c9e7131c6b527 Author: Felix Fietkau Date: Mon Apr 26 15:04:29 2010 -0400 ath9k_hw: update initvals for AR9003 This synchs up the initvals to the values used on the Atheros HAL for AR9003. This specific change adds support for a new high power module. Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit f7917af92024d43bc20bc1afc92de27b0bd0f50b Author: Felix Fietkau Date: Tue Apr 27 00:26:34 2010 +0200 mac80211: fix handling of 4-address-mode in ieee80211_change_iface A misplaced interface type check bails out too early if the interface is not in monitor mode. This patch moves it to the right place, so that it only covers changes to the monitor flags. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 4f824719a2729f1a6bb78de20c4d3b3dbdd81a09 Author: Sujith Date: Mon Apr 26 15:09:42 2010 +0530 ath9k_htc: Simplify RX IRQ handler A bunch of validation and processing in the RX IRQ handler can be moved to the RX tasklet. The IRQ handler is already heavy, with the memory allocation for handling stream mode. Also, a memcpy of 40 bytes for every packet can be avoided in the handler. Signed-off-by: Sujith Signed-off-by: John W. Linville commit d439260e04eca5bce88558feecee4369784f2175 Author: Sujith Date: Mon Apr 26 15:09:39 2010 +0530 ath9k_htc: Validate TX Endpoint ID Check for the endpoint IDs when processing TX completions and drop the unsupported EPIDs. We can add other endpoints (UAPSD,..) when support is added. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 5bf1e17a4a3870d4f03dc39f1bec4464bbdf4887 Author: Sujith Date: Mon Apr 26 15:09:36 2010 +0530 ath9k_htc: Remove unnecessary powersave restore Signed-off-by: Sujith Signed-off-by: John W. Linville commit bb611874650cff942a7466b456a791e8bfa641e7 Merge: d328bc8 cb6a4e4 Author: David S. Miller Date: Tue Apr 27 12:57:39 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6 commit d328bc839eac685cdd91f5d9d8ad95c070252038 Author: Joe Perches Date: Tue Apr 27 00:50:58 2010 +0000 ixgb: Use pr_ and netdev_ Convert DEBUGOUTx to pr_debug Convert DEBUGFUNC to more commonly used ENTER Convert mac address output to %pM Use #define pr_fmt Convert a few printks to pr_ Improve ixgb_mc_addr_list_update: use a temporary for current mc address Use etherdevice.h functions for mac address testing Signed-off-by: Joe Perches Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c0dfb90e5b2d41c907de9b624657a6688541837e Author: John Fastabend Date: Tue Apr 27 02:13:39 2010 +0000 ixgbe: ixgbe_down needs to stop dev_watchdog There is a small race between when the tx queues are stopped and when netif_carrier_off() is called in ixgbe_down. If the dev_watchdog() timer fires during this time it is possible for a false tx timeout to occur. This patch moves the netif_carrier_off() so that it is called before the tx queues are stopped preventing the dev_watchdog timer from detecting false tx timeouts. The race is seen occosionally when FCoE or DCB settings are being configured or changed. Testing note, running ifconfig up/down will not reproduce this issue because dev_open/dev_close call dev_deactivate() and then dev_activate(). Signed-off-by: John Fastabend Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ff846f52935e6c8dfb0c97df7c2c1bf777454684 Author: Alexander Duyck Date: Tue Apr 27 01:02:40 2010 +0000 igb: add support for reporting 5GT/s during probe on PCIe Gen2 This change corrects the fact that we were not reporting Gen2 link speeds when we were in fact connected at Gen2 rates. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ef021194d262bdfa706dc5755596e252175a6bbc Author: Jesse Brandeburg Date: Tue Apr 27 01:37:41 2010 +0000 ixgbe: fix bug when EITR=0 causing no writebacks writebacks can be held indefinitely by hardware if EITR=0, when combined with TXDCTL.WTHRESH=8. When EITR=0, WTHRESH should be set back to zero. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit f8d1dcaf88bddc7f282722ec1fdddbcb06a72f18 Author: Jesse Brandeburg Date: Tue Apr 27 01:37:20 2010 +0000 ixgbe: enable extremely low latency 82598/82599 can support EITR == 0, which allows for the absolutely lowest latency setting in the hardware. This disables writeback batching and anything else that relies upon a delayed interrupt. This patch enables the feature of "override" when a user sets rx-usecs to zero, the driver will respect that setting over using RSC, and automatically disable RSC. If rx-usecs is used to set the EITR value to 0, then the driver should disable LRO (aka RSC) internally until EITR is set to non-zero again. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit ec857fd40da41d7c50d9a97e07e364c93b8b8e05 Author: Koki Sanagi Date: Tue Apr 27 01:01:39 2010 +0000 igbvf: double increment nr_frags There is no need to increment nr_frags because skb_fill_page_desc increments it. Signed-off-by: Koki Sanagi Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit aa913403fe76d463eff55ee9aa20605bfc7051a4 Author: Koki Sanagi Date: Tue Apr 27 01:01:19 2010 +0000 igb: double increment nr_frags There is no need to increment nr_frags because skb_fill_page_desc increments it. Signed-off-by: Koki Sanagi Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0b53ff2eadb1db6818894435f85989fb05d7e718 Author: Eric Dumazet Date: Mon Apr 26 20:40:43 2010 +0000 net: fix a lockdep rcu warning in __sk_dst_set() __sk_dst_set() might be called while no state can be integrated in a rcu_dereference_check() condition. So use rcu_dereference_raw() to shutup lockdep warnings (if CONFIG_PROVE_RCU is set) Signed-off-by: Eric Dumazet Acked-by: Paul E. McKenney Signed-off-by: David S. Miller commit 18f9f1365dad1237072d360bc487d8c7a1cae532 Author: Eric Dumazet Date: Tue Apr 27 02:42:51 2010 +0000 rps: inet_rps_save_rxhash() argument is not const const qualifier on sock argument is misleading, since we can modify rxhash. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 6c37e5de456987f5bc80879afde05aa120784095 Author: Flavio Leitner Date: Mon Apr 26 18:33:27 2010 +0000 TCP: avoid to send keepalive probes if receiving data RFC 1122 says the following: ... Keep-alive packets MUST only be sent when no data or acknowledgement packets have been received for the connection within an interval. ... The acknowledgement packet is reseting the keepalive timer but the data packet isn't. This patch fixes it by checking the timestamp of the last received data packet too when the keepalive timer expires. Signed-off-by: Flavio Leitner Signed-off-by: Eric Dumazet Acked-by: Ilpo Järvinen Signed-off-by: David S. Miller commit dcdca2c49bb6328bbc7cd8d73434c308b5dd0df2 Author: stephen hemminger Date: Tue Apr 27 07:13:11 2010 +0000 bridge: multicast router list manipulation I prefer that the hlist be only accessed through the hlist macro objects. Explicit twiddling of links (especially with RCU) exposes the code to future bugs. Compile tested only. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7180f7751d5a1b6f1ef40285b5e928970cdd5306 Author: stephen hemminger Date: Tue Apr 27 07:13:06 2010 +0000 bridge: use is_multicast_ether_addr Use existing inline function. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e1703b36c358dde24ececba4fd609ecd91433ba3 Merge: 7ec75c5 e95ef5d Author: David S. Miller Date: Tue Apr 27 12:49:13 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/e100.c drivers/net/e1000e/netdev.c commit 7ec75c582e639d956ce3afd499f67febe6f902a4 Author: Paul E. McKenney Date: Tue Apr 27 06:22:01 2010 +0000 net: suppress RCU lockdep false positive in twsk_net() Calls to twsk_net() are in some cases protected by reference counting as an alternative to RCU protection. Cases covered by reference counts include __inet_twsk_kill(), inet_twsk_free(), inet_twdr_do_twkill_work(), inet_twdr_twcal_tick(), and tcp_timewait_state_process(). RCU is used by inet_twsk_purge(). Locking is used by established_get_first() and established_get_next(). Finally, __inet_twsk_hashdance() is an initialization case. It appears to be non-trivial to locate the appropriate locks and reference counts from within twsk_net(), so used rcu_dereference_raw(). Signed-off-by: Paul E. McKenney Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 4da62e6c6e056d709e5dc04ac7c5e81692cf924f Author: Jonathan Corbet Date: Sun Apr 25 08:30:41 2010 -0600 viafb: Only establish i2c busses on ports that always had them ...otherwise it seems we run into conflicts with shadowy other users which don't expect to see i2c taking control of ports it never used to do anything with. Reported-by: Florian Tobias Schandinat Signed-off-by: Jonathan Corbet commit c774c13dd2826eb91ab6396fd8501df2fc2d83b3 Author: Paul Fox Date: Wed Oct 7 11:13:01 2009 -0400 suppress verbose debug messages: change printk() to DEBUG_MSG() [jc: no signoff, added my own] Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Jonathan Corbet commit 277d32a36cba0b42c9c6836ff07f9b978566e95c Author: Harald Welte Date: Sat May 23 00:35:39 2009 +0800 viafb: rework the I2C support in the VIA framebuffer driver This patch changes the way how the various I2C busses are used internally inside the viafb driver: Previosuly, only a single i2c_adapter was created, even though two different hardware I2C busses are accessed: A structure member in a global variable was modified to indicate the bus to be used. Now, all existing hardware busses are registered with the i2c core, and the viafb_i2c_{read,write}byte[s]() function take the adapter number as function call parameter, rather than referring to the global structure member. [jc: even more painful merge with mainline changes ->2.6.34] [jc: painful merge with OLPC changes] Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Harald Welte Signed-off-by: Jonathan Corbet commit a838b2e634405fb89ddbf4fa9412acb33911911f Author: Steven Rostedt Date: Tue Apr 27 13:26:58 2010 -0400 ring-buffer: Make benchmark handle missed events With the addition of the "missed events" flags that is stored in the commit field of the ring buffer page, the ring_buffer_benchmark was not updated to handle this. If events are missed, then the missed events flag is set in the ring buffer page, the benchmark will count that flag as part of the size of the page and will hit the BUG() when it tries to read beyond the page. The solution is simply to have the ring buffer benchmark mask off the extra bits. Reported-by: Ingo Molnar Signed-off-by: Steven Rostedt commit d4c4f07df16c767b8efbc44e7cdf795fac326b33 Author: David S. Miller Date: Tue Apr 27 10:16:54 2010 -0700 bridge: Fix build of ipv6 multicast code. Based upon a report from Stephen Rothwell: -------------------- net/bridge/br_multicast.c: In function 'br_ip6_multicast_alloc_query': net/bridge/br_multicast.c:469: error: implicit declaration of function 'csum_ipv6_magic' Introduced by commit 08b202b6726459626c73ecfa08fcdc8c3efc76c2 ("bridge br_multicast: IPv6 MLD support") from the net tree. csum_ipv6_magic is declared in net/ip6_checksum.h ... -------------------- Signed-off-by: David S. Miller commit 72c9ddfd4c5bf54ef03cfdf57026416cb678eeba Author: David Miller Date: Tue Apr 20 15:47:11 2010 -0700 ring-buffer: Make non-consuming read less expensive with lots of cpus. When performing a non-consuming read, a synchronize_sched() is performed once for every cpu which is actively tracing. This is very expensive, and can make it take several seconds to open up the 'trace' file with lots of cpus. Only one synchronize_sched() call is actually necessary. What is desired is for all cpus to see the disabling state change. So we transform the existing sequence: for_each_cpu() { ring_buffer_read_start(); } where each ring_buffer_start() call performs a synchronize_sched(), into the following: for_each_cpu() { ring_buffer_read_prepare(); } ring_buffer_read_prepare_sync(); for_each_cpu() { ring_buffer_read_start(); } wherein only the single ring_buffer_read_prepare_sync() call needs to do the synchronize_sched(). The first phase, via ring_buffer_read_prepare(), allocates the 'iter' memory and increments ->record_disabled. In the second phase, ring_buffer_read_prepare_sync() makes sure this ->record_disabled state is visible fully to all cpus. And in the final third phase, the ring_buffer_read_start() calls reset the 'iter' objects allocated in the first phase since we now know that none of the cpus are adding trace entries any more. This makes openning the 'trace' file nearly instantaneous on a sparc64 Niagara2 box with 128 cpus tracing. Signed-off-by: David S. Miller LKML-Reference: <20100420.154711.11246950.davem@davemloft.net> Signed-off-by: Steven Rostedt commit 62b915f1060996a8e1f69be50e3b8e9e43b710cb Author: Jiri Olsa Date: Fri Apr 2 19:01:22 2010 +0200 tracing: Add graph output support for irqsoff tracer Add function graph output to irqsoff tracer. The graph output is enabled by setting new 'display-graph' trace option. Signed-off-by: Jiri Olsa LKML-Reference: <1270227683-14631-4-git-send-email-jolsa@redhat.com> Signed-off-by: Steven Rostedt commit cb7b76961f73e4ae934d44f7b2e7ba974442f2fe Merge: b28528a 07779fd Author: Takashi Iwai Date: Tue Apr 27 15:35:59 2010 +0200 Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc commit 4b2cbd42bef5a22bb681acd607a7c3fbca1eeb3c Author: Jan Engelhardt Date: Tue Apr 27 15:34:34 2010 +0200 netfilter: x_tables: rectify XT_FUNCTION_MAXNAMELEN usage There has been quite a confusion in userspace about XT_FUNCTION_MAXNAMELEN; because struct xt_entry_match used MAX-1, userspace would have to do an awkward MAX-2 for maximum length checking (due to '\0'). This patch adds a new define that matches the definition of XT_TABLE_MAXNAMELEN - being the size of the actual struct member, not one off. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit e9ddbc075d95b2edf111247cdde16f33c31654a8 Author: Peter Huewe Date: Tue Apr 27 15:23:01 2010 +0200 avr32: Fix typo in read_persistent_clock() Fix fallout from the persistent_clock changes. Signed-off-by: Peter Huewe Cc: John Stultz Cc: Haavard Skinnemoen Signed-off-by: Thomas Gleixner commit a3be6327163c223c1715c8307a616941fbf8bf73 Author: Hans Ulli Kroll Date: Tue Apr 27 12:45:10 2010 +0200 ARM: Gemini: fix compiler error in copypage-fa.c Fix compiler error in copypage-fs.c missing struct vm_area_struct *vma in function fa_copy_user_highpage Signed-off-by: Hans Ulli Kroll commit 07779fdd1a236145b5f5dc6916c6b84d9712b305 Author: Jarkko Nikula Date: Mon Apr 26 15:49:14 2010 +0300 ASoC: tlv320aic3x: Add basic regulator support This patch adds the TLV320AIC3x supplies and enables all of them for the entire lifetime of the device. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit db13802e51f29c40b404038485121a3973c0947d Author: Jarkko Nikula Date: Mon Apr 26 15:49:13 2010 +0300 ASoC: tlv320aic3x: Change bias management semantics Move PLL enable from BIAS_ON state to BIAS_PREPARE to be pair with BIAS_STANDBY where PLL is disabled. Remove also old comments about power control. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit d3235c4ac17b7f2a9c64cc3ebc71e23d1d1fa466 Author: Jarkko Nikula Date: Mon Apr 26 15:49:12 2010 +0300 ASoC: tlv320aic3x: Remove needless power off from aic3x_set_bias_level These ADC, DAC and output pin power off commands are needless in aic3x_set_bias_level since they are not enabled in aic3x_init and they are defined in aic3x_dapm_widgets so the ASoC DAPM will take care of them anyway. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit c6de6e03009efaa56baeb98da8bbcce0c6c889a6 Author: Jarkko Nikula Date: Mon Apr 26 15:49:11 2010 +0300 ASoC: tlv320aic3x: Remove unused version string Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 462b04e28a7ec1339c892117c3f20a40e55d0e83 Merge: cfadf9d f93830f Author: Ingo Molnar Date: Tue Apr 27 11:16:54 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit b7386a09ce7e8add333f5d67f2fe1b1eac1f4746 Author: Paul Mundt Date: Tue Apr 27 16:41:12 2010 +0900 sh: make latencytop available on SMP, too. The UP dependency was inherited from ARM, which seems to have run in to it due to the stacktrace code not being available for SMP in certain cases, as we don't have this particular limitation there is no specific need to block on the SMP dependency. Signed-off-by: Paul Mundt commit d54ff73259a852d4b3886dc586587fdef5e9c8de Author: Steve French Date: Tue Apr 27 04:38:15 2010 +0000 [CIFS] Fix lease break for writes On lease break we were breaking to readonly leases always even if write requested. Also removed experimental ifdef around setlease code Signed-off-by: Steve French commit 9bf67e516f16d31f86aa6f063576a959bbf19990 Author: Jeff Layton Date: Sat Apr 24 07:57:46 2010 -0400 cifs: save the dialect chosen by server Signed-off-by: Jeff Layton Signed-off-by: Steve French commit b03df87d119f50715891dcc09e487f6ae5c029f1 Author: Serge E. Hallyn Date: Mon Apr 26 11:58:49 2010 +0100 CRED: Holding a spinlock does not imply the holding of RCU read lock Change the credentials documentation to make it clear that the RCU read lock must be explicitly held when accessing credentials pointers in some other task than current. Holding a spinlock does not implicitly hold the RCU read lock. Signed-off-by: Serge Hallyn Reviewed-by: Paul E. McKenney Signed-off-by: David Howells Signed-off-by: James Morris commit 98ec4373bab1d839f794e9a4edc29f77eb9d897e Author: David Howells Date: Fri Apr 23 12:48:12 2010 +0100 SMACK: Don't #include Ext2 headers Don't #include Ext2 headers into Smack unnecessarily. Signed-off-by: David Howells Acked-by: Casey Schaufler Signed-off-by: James Morris commit b8bc1389b74c2b66255651a6fcfae56c78b6e63f Author: Alessio Igor Bogani Date: Sun Apr 25 13:18:48 2010 +0200 ptrace: Cleanup useless header BKL isn't present anymore into this file thus we can safely remove smp_lock.h inclusion. Signed-off-by: Alessio Igor Bogani Cc: Roland McGrath Cc: Oleg Nesterov Cc: Andrew Morton Cc: James Morris Cc: Ingo Molnar Signed-off-by: Frederic Weisbecker commit d7a8d9e907cc294ec7a4a7046d1886375fbcc82e Author: Jiri Olsa Date: Fri Apr 2 19:01:21 2010 +0200 tracing: Have graph flags passed in to ouput functions Let the function graph tracer have custom flags passed to its output functions. Signed-off-by: Jiri Olsa LKML-Reference: <1270227683-14631-3-git-send-email-jolsa@redhat.com> Signed-off-by: Steven Rostedt commit 9106b69382912ddc403a307b69bf894a6f3004e4 Author: Jiri Olsa Date: Fri Apr 2 19:01:20 2010 +0200 tracing: Add ftrace events for graph tracer Add ftrace events for graph tracer, so the graph output could be shared with other tracers. Signed-off-by: Jiri Olsa LKML-Reference: <1270227683-14631-2-git-send-email-jolsa@redhat.com> Signed-off-by: Steven Rostedt commit ad6cca6d5d0f713e1987e20ed982cfa9eb16b27e Author: Dan Carpenter Date: Mon Apr 26 12:10:06 2010 +0200 cifs: change && to || This is a typo, if pvolume_info were NULL it would oops. This function is used in clean up and error handling. The current code never passes a NULL pvolume_info, but it could pass a NULL *pvolume_info if the kmalloc() failed. Signed-off-by: Dan Carpenter Acked-by: Jeff Layton Signed-off-by: Steve French commit 04912d6a20185473db025061b9b2c81fbdffc48b Author: Jeff Layton Date: Sat Apr 24 07:57:45 2010 -0400 cifs: rename "extended_security" to "global_secflags" ...since that more accurately describes what that variable holds. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit d00c28de55a69d13cf2c6a99efc3e81a5d95af74 Author: Jeff Layton Date: Sat Apr 24 07:57:44 2010 -0400 cifs: move tcon find/create into separate function ...and out of cifs_mount. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 36988c76f007738cad5fe1c873a5fb0cda7eb2f6 Author: Jeff Layton Date: Sat Apr 24 07:57:43 2010 -0400 cifs: move SMB session creation code into separate function ...it's mostly part of cifs_mount. Break it out into a separate function. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit a5fc4ce01867842f6a9cc317035df3081302bffc Author: Jeff Layton Date: Sat Apr 24 07:57:42 2010 -0400 cifs: track local_nls in volume info Add a local_nls field to the smb_vol struct and keep a pointer to the local_nls in it. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit f93830fbb06b67848c762f2177c06cc3cbb97deb Author: Stefan Hajnoczi Date: Mon Apr 26 15:39:54 2010 -0300 perf tools: Fix libdw-dev package name in error message The headers required for DWARF support are provided by the libdw-dev package in Debian-based distros. This patch corrects the elfutils-dev package name to libdw-dev in the Makefile error message when libdw.h is not found. Signed-off-by: Stefan Hajnoczi Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Tom Zanussi LKML-Reference: <1272292023-9869-1-git-send-email-stefanha@linux.vnet.ibm.com> Signed-off-by: Arnaldo Carvalho de Melo commit ef4a356574426877d569f8b6579325537eb7909b Author: Masami Hiramatsu Date: Wed Apr 21 15:56:40 2010 -0400 perf probe: Add --max-probes option Add --max-probes option to change the maximum limit of findable probe points per event, since inlined function can be expanded into thousands of probe points. Default value is 128. Signed-off-by: Masami Hiramatsu Suggested-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar LKML-Reference: <20100421195640.24664.62984.stgit@localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo commit 5d1ee0413c8e2e0aa48510b1edfb3c4d2d43455b Author: Masami Hiramatsu Date: Wed Apr 21 15:56:32 2010 -0400 perf probe: Fix to exit callback soon after finding too many probe points Fix to exit callback soon after finding too many probe points. Don't try to continue searching because it already failed. Signed-off-by: Masami Hiramatsu Reported-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar LKML-Reference: <20100421195632.24664.42598.stgit@localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo commit 15eca306ec95e164d05457f9f27c722f69af6d18 Author: Masami Hiramatsu Date: Wed Apr 21 15:56:24 2010 -0400 perf probe: Fix to use symtab only if no debuginfo Fix perf probe to use symtab only if there is no debuginfo, because debuginfo has more information than symtab. If we can't find a function in debuginfo, we never find it in symtab. Signed-off-by: Masami Hiramatsu Reported-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar LKML-Reference: <20100421195624.24664.46214.stgit@localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo commit 0ab061cd523a7f2dbf1b59aab0542cb0ab2e4633 Author: Masami Hiramatsu Date: Wed Apr 21 15:56:16 2010 -0400 perf tools: Initialize dso->node member in dso__new If dso->node member is not initialized, it causes a segmentation fault when adding to other lists. It should be initilized in dso__new(). Signed-off-by: Masami Hiramatsu Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar LKML-Reference: : <20100421195616.24664.89980.stgit@localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo commit 1fafc7a9353ef68e1b8d4bb130cb6402cf7dfd5a Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Apr 25 08:06:40 2010 +0000 bridge br_multicast: Ensure to initialize BR_INPUT_SKB_CB(skb)->mrouters_only. Even with commit 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 ("bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping."), BR_INPUT_SKB_CB(skb)->mrouters_only is not appropriately initialized if IGMP/MLD snooping support is compiled and disabled, so we can see garbage. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit e9bd5bcde7af27ebb92bb866afde5ef5e4f3dc6c Author: Steve deRosier Date: Sun Apr 25 14:40:46 2010 -0700 libertastf: add configurable debug messages Add the same type of configurable debug messages to libertas_tf as already exist in the libertas driver. This has facilitated creation of a interface specification and will facilitate future development of this driver. Signed-off-by: Steve deRosier Signed-off-by: John W. Linville commit 9a8b424ea8b64da83b6868423dcd0f3c259fdde0 Author: Helmut Schaa Date: Mon Apr 26 13:50:27 2010 +0200 rt2x00: rt2800lib: Remove redundant check for RT2872 Remove redundant check for RT2872. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 23812383c6b03afef44c4aa642500f8235c3d079 Author: Helmut Schaa Date: Mon Apr 26 13:48:45 2010 +0200 rt2x00: rt2800lib: Fix rx path on SoC devices Restore the rfcsr initialization for RT305x SoC devices which was removed by "rt2x00: Finish rt3070 support in rt2800 register initialization.". This fixes the rx path on SoC devices. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 0bdab171ec04ea9d26a40608f69350c8c9e4872c Author: Helmut Schaa Date: Mon Apr 26 10:18:08 2010 +0200 rt2x00: fix typo in rt2800.h Fix a typo in a comment in rt2800.h. Instead of replacing the wrong hexvalue (0x171c) with the correct one (0x1718) just use the appropriate readable define. Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit ce9626eae243b788993fedc03f30e2d1cb178c7a Author: Larry Finger Date: Fri Apr 23 13:17:21 2010 -0500 ssb: Make bus registration failure not be silent In kernel Bugzilla #15825, a case where routine ssb_bus_pcibus_register() fails silently is reported. The cause for the failure is still being investigated; however, the diagnosis would be easier if the failure had been reported. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 5a673964266438784b4ebf65ee07970cde61ab5e Author: Helmut Schaa Date: Fri Apr 23 15:54:43 2010 +0200 rt2x00: rt2800: use tx_power2 in rt2800_config_channel_rf3xxx Get closer to what the ralink driver does by setting the rf register 13 to tx_power2 during channel switch. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2caaa5d36ee210919bd0ecc7b2e6648171544e95 Author: Helmut Schaa Date: Fri Apr 23 15:05:29 2010 +0200 rt2x00: rt2800lib: disable HT40 for now as it causes reception problems Disable HT40 support for now as it causes rx problems with HT40 capable 11n APs (when mac80211 enables HT40, rx is completely disfunctional). Once the rt2800 HT code is capable of using HT40 we should enable the flag again. I only tested this patch with a rt305x SoC device, nevertheless the patch disables HT40 also on PCI and USB rt2800 devices. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit d8f996f6ff7e6eab4c7b96e908ba789533595e7d Author: Sujith Date: Fri Apr 23 10:28:20 2010 +0530 ath9k_htc: Really fix device hotunplug All commands to the target are disabled when the device is unplugged, but a normal module unload has to be differentiated from this case, as we could still receive data in the RX endpoint. Fix this by checking if the device is attached or not. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0d36d71da2a3e5b28b4e7743c0041515cca798ef Author: Sujith Date: Fri Apr 23 10:28:19 2010 +0530 ath9k_htc: Fix WMI command race My patch "ath9k_htc: Handle WMI timeouts properly" introduced a race condition in WMI command processing. The last issued command should be stored _before_ issuing a WMI command. Not doing this would result in the WMI event IRQ dropping correct command responses as invalid. Fix this race by storing the command id correctly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit ba44370175d2e743065382508ed7823cc83cea0a Author: Sujith Date: Fri Apr 23 10:28:18 2010 +0530 ath9k_htc: Increase WMI timeout value Completion of WMI commands take a longer time on some platforms. Increase the timeout value to handle this. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 5ab0af3270b29c62b8960a60092917ec8be48c4a Author: Sujith Date: Fri Apr 23 10:28:17 2010 +0530 ath9k_htc: Process command data properly When handling the REGIN callback, processing the incoming data first should be the preferred mode of operation. Allocation of a new SKB may fail, in which case, the URB will not be resubmitted. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 62e4716aff31a8ab687016680443012034734c92 Author: Sujith Date: Fri Apr 23 10:28:16 2010 +0530 ath9k_htc: Use USB reboot So, apparently there is a USB reboot command that the target accepts. Using this instead of usb_reset_device() fixes the issue of "descriptor read error" that pops up on repeated load/unload. Signed-off-by: Sujith Signed-off-by: John W. Linville commit f66890724fb3131894b8eee5fc552a5dc42dc1df Author: Sujith Date: Fri Apr 23 10:28:15 2010 +0530 ath9k_htc: Pass correct private pointer In the TX callback, the HTC layer has to pass the priv pointer that was registered during service initialization. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 51f139d567574e6a9b5c8aaddb8ff3a240cf8e52 Author: Sujith Date: Fri Apr 23 10:28:14 2010 +0530 ath9k_hw: Remove pointless ANI deinit There is no reason to disable the PHY Error / MIB counters when the module is being unloaded. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 7073daa63b8794710fa6c928a6dd169e52791185 Author: Sujith Date: Fri Apr 23 10:28:13 2010 +0530 ath9k_htc: Cancel running timers before disabling HW Signed-off-by: Sujith Signed-off-by: John W. Linville commit d5e347bf0f5e99f540aaaaca25ef4e957d59a506 Author: Sujith Date: Fri Apr 23 10:28:11 2010 +0530 ath9k_htc: Use multiple register writes This patch fixes a code segment in configpciepowersave() to make use of multiple register writes. Signed-off-by: Sujith Signed-off-by: John W. Linville commit a3be14b76da111ebe4d245b0542613f9317104e7 Author: Sujith Date: Fri Apr 23 10:28:10 2010 +0530 ath9k_htc: Handle device unplug properly When the USB device has been unplugged, there is no point in trying to send commands to the target. Fix this by denying all WMI commands in such a case. Signed-off-by: Sujith Signed-off-by: John W. Linville commit c11d8f89d3b785f3ef987c2d9ee1bfea6f8b3d0f Author: Sujith Date: Fri Apr 23 10:28:09 2010 +0530 ath9k_htc: Simplify TX URB management This patch simplifies URB management for transmission, by removing the 'FLUSH' variable (which is not needed, since we can determine if the URB has been killed by looking at the URB status), and also handling the STOP case properly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit d4cde88c1c025ffa18150ec29e80e456f2a5c65a Author: Hans de Goede Date: Thu Apr 22 19:52:43 2010 +0200 p54pci: fix regression from prevent stuck rx-ring on slow system This patch fixes a recently introduced use-after-free regression from "p54pci: prevent stuck rx-ring on slow system". Hans de Goede reported a use-after-free regression: >BUG: unable to handle kernel paging request at 6b6b6b6b >IP: [] p54p_check_tx_ring+0x84/0xb1 [p54pci] >*pde = 00000000 >Oops: 0000 [#1] SMP >EIP: 0060:[] EFLAGS: 00010286 CPU: 0 >EIP is at p54p_check_tx_ring+0x84/0xb1 [p54pci] >EAX: 6b6b6b6b EBX: df10b170 ECX: 00000003 EDX: 00000001 >ESI: dc471500 EDI: d8acaeb0 EBP: c098be9c ESP: c098be84 > DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 >Process swapper (pid: 0, ti=c098a000 task=c09ccfe0 task.ti=c098a000) >Call Trace: > [] ? p54p_tasklet+0xaa/0xb5 [p54pci] > [] ? tasklet_action+0x78/0xcb > [] ? __do_softirq+0xbc/0x173 Quote from comment #17: "The problem is the innocent looking moving of the tx processing to after the rx processing in the tasklet. Quoting from the changelog: This patch does it the same way, except that it also prioritize rx data processing, simply because tx routines *can* wait. This is causing an issue with us referencing already freed memory, because some skb's we transmit, we immediately receive back, such as those for reading the eeprom (*) and getting stats. What can happen because of the moving of the tx processing to after the rx processing is that when the tasklet first runs after doing a special skb tx (such as eeprom) we've already received the answer to it. Then the rx processing ends up calling p54_find_and_unlink_skb to find the matching tx skb for the just received special rx skb and frees the tx skb. Then after the processing of the rx skb answer, and thus freeing the tx skb, we go process the completed tx ring entires, and then dereference the free-ed skb, to see if it should free free-ed by p54p_check_tx_ring()." Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=583623 Bug-Identified-by: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 4a4771a58e13b46bfdc999fe481e550f8c6937ff Author: Eric Dumazet Date: Sun Apr 25 22:20:06 2010 +0000 net: use sk_sleep() Commit aa395145 (net: sk_sleep() helper) missed three files in the conversion. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit be9e969d79e40c59142fa9e931aa6f085581b379 Author: Jiri Pirko Date: Mon Apr 26 01:46:12 2010 +0000 pppoe: use pppoe_pernet instead of directly net_generic Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 0db3f0f49a99db33a411af1c4352839c0296eff3 Author: Jiri Pirko Date: Mon Apr 26 03:41:00 2010 +0000 phonet: use phonet_pernet instead of directly net_generic As in for example pppoe introduce phonet_pernet and use it instead of calling net_generic directly. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 0c86980817853e4166f66c7cd18bc5fe1adeb5f7 Author: Juuso Oikarinen Date: Thu Apr 22 10:27:48 2010 +0300 mac80211: Fix sta->last_tx_rate setting with no-op rate control devices The sta->last_tx_rate is traditionally updated just before transmitting a frame based on information from the rate control algorithm. However, for hardware drivers with IEEE80211_HW_HAS_RATE_CONTROL this is not performed, as the rate control algorithm is not executed, and because the used rate is not known before the frame has actually been transmitted. This causes atleast a fixed 1Mb/s to be reported to user space. A few other instances of code also rely on this information. Fix this by setting the sta->last_tx_rate in tx_status handling. There, look for last rates entry set by the driver, and use that as value for sta->last_tx_rate. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 5af55428858a45d94893fd6124d60988e89c0d59 Author: Rafał Miłecki Date: Wed Mar 31 22:54:19 2010 +0200 ssb: Fix order of definitions and some text space indents Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 0a182fd88f8180b342f753f04c7d5507b5891c96 Author: Rafał Miłecki Date: Wed Mar 31 22:54:18 2010 +0200 ssb: Use relative offsets for SPROM Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ea2db495f92ad2cf3301623e60cb95b4062bc484 Author: Rafał Miłecki Date: Wed Mar 31 21:59:21 2010 +0200 ssb: Look for SPROM at different offset on higher rev CC Our offset handling becomes even a little more hackish now. For some reason I do not understand all offsets as inrelative. It assumes base offset is 0x1000 but it will work for now as we make offsets relative anyway by removing base 0x1000. Should be cleaner however. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d53cdbb94a52a920d5420ed64d986c3523a56743 Author: John W. Linville Date: Wed Mar 31 21:39:35 2010 +0200 ssb: do not read SPROM if it does not exist Attempting to read registers that don't exist on the SSB bus can cause hangs on some boxes. At least some b43 devices are 'in the wild' that don't have SPROMs at all. When the SSB bus support loads, it attempts to read these (non-existant) SPROMs and causes hard hangs on the box -- no console output, etc. This patch adds some intelligence to determine whether or not the SPROM is present before attempting to read it. This avoids those hard hangs on those devices with no SPROM attached to their SSB bus. The SSB-attached devices (e.g. b43, et al.) won't work, but at least the box will survive to test further patches. :-) Signed-off-by: John W. Linville Signed-off-by: Rafał Miłecki Cc: Larry Finger Cc: Michael Buesch commit b28528a124d0235d84e6c9b3edeedd70f8767740 Author: Vladimir Zapolskiy Date: Mon Apr 26 14:56:57 2010 +0400 ASoC: UDA134X: Add UDA1345 CODEC support This patch adds support for Philips UDA1345 CODEC. The CODEC has only volume control, de-emphasis, mute, DC filtering and power control features. Signed-off-by: Vladimir Zapolskiy Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5e5e2bef287b96ab29d2d93e89ecf0888323d7bf Author: Mark Brown Date: Sun Apr 25 12:20:30 2010 +0100 ASoC: Warn on low WM8994 AIFCLK Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 759512fbacfbb6fd9b7f77f9806fb4995775848f Author: Mark Brown Date: Fri Apr 23 17:39:23 2010 +0100 ASoC: Correct inversion of speaker mixer PCM switch Reported-by: Anti Sullin Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit cb6a4e461fb427689920472bd7335f926d521747 Author: Patrick McHardy Date: Mon Apr 26 16:02:08 2010 +0200 net: ipmr: add support for dumping routing tables over netlink The ipmr /proc interface (ip_mr_cache) can't be extended to dump routes from any tables but the main table in a backwards compatible fashion since the output format ends in a variable amount of output interfaces. Introduce a new netlink interface to dump multicast routes from all tables, similar to the netlink interface for regular routes. Signed-off-by: Patrick McHardy commit f57d2cfaad0d6858d700b5671e01cf3aba6ef779 Author: Peter Ujfalusi Date: Fri Apr 23 10:10:01 2010 +0300 ASoC: tlv320dac33: FIFO caused delay reporting Delay reporting for the three implemented DAC33 FIFO modes. DAC33 has FIFO depth status register(s), but it can not be used, since inside of pcm_pointer we can not send I2C commands. Timestamp based estimation need to be used. The method of calculating the delay depends on the active FIFO mode. Bypass mode: FIFO is bypassed, report 0 as delay Mode1: nSample fill mode. In this mode I need to use two timestamp ts1: taken when the interrupt has been received ts2: taken before writing to nSample register. Interrupts are coming when DAC33 FIFO depth goes under alarm threshold. Phase1: when we received the alarm threshold, but our workqueue has not been executed (safeguard phase). Just count the played out samples since ts1 and subtract it from the alarm threshold value. Phase2: During nSample burst (after writing to nSample register), count the played out samples since ts1, count the samples received since ts2 (in a burst). Estimate the FIFO depth using these and alarm threshold value. Phase3: Draining phase (after the burst read), count the played out samples since ts1. Estimate the FIFO depth using the nSample configuration and the alarm threshold value. Mode7: Threshold based fill mode. In this mode one timestamp is enough. ts1: taken when the interrupt has been received Interrupts are coming when DAC33 FIFO depth reaches upper threshold. Phase1: Draining phase (after the burst), counting the played out samples since ts1, and subtract it from the upper threshold value. Phase2: During burst operation. Using the pre calculated time needed to play out samples from the buffer during the drain period (from upper to lower threshold), move the time window to cover the estimated time from the burst start to the current time. Calculate the samples played out since lower threshold and also the samples received during the same time. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 76f471274dc9acacd521f151ac9171fd7bbc34c3 Author: Peter Ujfalusi Date: Fri Apr 23 10:10:00 2010 +0300 ASoC: tlv320dac33: Calculate the interface speed during bursts When the DAC33 FIFO is in use the dai interface is running in much higher speed than the sampling frequency. Calculate the rate based on the internal base frequency and the bclk divider. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 4260393e71f1e99c2f4fcde10fcb98fe00188d21 Author: Peter Ujfalusi Date: Fri Apr 23 10:09:59 2010 +0300 ASoC: tlv320dac33: Change magic numbers used in Mode7 Upper and Lower threshold values are used as magic numbers. Replace them with defines for later use. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 55abb59c9a03d3aceda61e97b5ff19d9274fc611 Author: Peter Ujfalusi Date: Fri Apr 23 10:09:58 2010 +0300 ASoC: tlv320dac33: Skip calculations in FIFO Bypass mode There is no need for calculations for FIFO bypass mode. Just in case set the nsample maximum limit, which has been done in the calculation phase. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit f4d593280652025f797d432e90f49d49b9334689 Author: Peter Ujfalusi Date: Fri Apr 23 10:09:57 2010 +0300 ASoC: tlv320dac33: Fix for early interrupt in FIFO Mode1 Alarm threshold interrupt is triggered right after the playback start. This interrupt is recieved during the first burst period, and caused the state machine to write additional nSample command, which has to be avoided. To fix this issue move the DAC33 interrupt unmasking after we configured the PREFILL register with a small delay. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 25239cee7e8732dbdc9f5d324f1c22a3bdec1d1f Author: Patrick McHardy Date: Mon Apr 26 16:02:05 2010 +0200 net: rtnetlink: decouple rtnetlink address families from real address families Decouple rtnetlink address families from real address families in socket.h to be able to add rtnetlink interfaces to code that is not a real address family without increasing AF_MAX/NPROTO. This will be used to add support for multicast route dumping from all tables as the proc interface can't be extended to support anything but the main table without breaking compatibility. This partialy undoes the patch to introduce independant families for routing rules and converts ipmr routing rules to a new rtnetlink family. Similar to that patch, values up to 127 are reserved for real address families, values above that may be used arbitrarily. Signed-off-by: Patrick McHardy commit 3d0c9c4eb2dbdcc461be4084abd87a9a9e70f713 Author: Patrick McHardy Date: Mon Apr 26 16:02:04 2010 +0200 net: fib_rules: mark arguments to fib_rules_register const and __net_initdata fib_rules_register() duplicates the template passed to it without modification, mark the argument as const. Additionally the templates are only needed when instantiating a new namespace, so mark them as __net_initdata, which means they can be discarded when CONFIG_NET_NS=n. Signed-off-by: Patrick McHardy commit 54b41b97fd07842d8b64963d538003c5f756ca12 Merge: e60692b e7dc951 Author: Paul Mundt Date: Mon Apr 26 19:11:51 2010 +0900 Merge branch 'sh/smp' commit e7dc951eecb708d4aef18db4dbf489ba282d16ff Author: Paul Mundt Date: Mon Apr 26 19:09:57 2010 +0900 sh: CPU hotplug support for SH-X3 SMP. This wires up CPU hotplug for SH-X3 SMP CPUs. Presently only secondary cores can be hotplugged given that the boot CPU has to contend with the broadcast timer. When real local timers are implemented this restriction can be lifted. Signed-off-by: Paul Mundt commit 763142d1efb56effe614d71185781796c4b83c78 Author: Paul Mundt Date: Mon Apr 26 19:08:55 2010 +0900 sh: CPU hotplug support. This adds preliminary support for CPU hotplug for SH SMP systems. Signed-off-by: Paul Mundt commit 8db2bc4559639680a94d4492ae4b7ce71298a74f Author: Paul Mundt Date: Mon Apr 26 18:59:47 2010 +0900 sh: cache secondary CPUs idle loop. This provides a cache of the secondary CPUs idle loop for the cases where hotplug simply enters a low power state instead of resetting or powering off the core. Signed-off-by: Paul Mundt commit 1cfa1e8f2c824b131612c9a70b48433998237331 Author: Paul Mundt Date: Mon Apr 26 18:55:01 2010 +0900 sh: flag smp_store_cpu_info() __cpuinit. smp_store_cpu_info() is presently flagged as __init, but is called by start_secondary() which is __cpuinit, fix it up. Signed-off-by: Paul Mundt commit c4b9f9a96eb93994ac42f4ea00bb94b44fa4d500 Author: Thomas Weber Date: Sat Apr 24 10:44:11 2010 +0200 Powerpc: wii: Fix typo in comment discontiguous => discontinuous coealesce => coalesce Signed-off-by: Thomas Weber Signed-off-by: Jiri Kosina commit b1ffdc8f3d8c8913388ca97dfdf064c87940dd72 Author: Dan Carpenter Date: Fri Apr 23 22:19:13 2010 +0200 i2o: cleanup some exit paths This is just a cleanup and doesn't change how the code works. The original code had a mix of returns and gotos so I changed everything to just return directly. Signed-off-by: Dan Carpenter Reviewed-by: Christoph Lameter Signed-off-by: Jiri Kosina commit 9715b8c7d55912fb6f5dd9b1c084d8eefcd0d848 Author: Paul Mundt Date: Mon Apr 26 18:49:58 2010 +0900 sh: provide percpu CPU states for hotplug notifiers. This provides percpu CPU states in preparation for CPU hotplug and the associated notifier chains. Signed-off-by: Paul Mundt commit 7acb59eb4b5eee113eb74eeafd1e6536171eeced Author: Paul Mundt Date: Mon Apr 26 18:44:04 2010 +0900 sh: Make sure all SH-X3 cores are populated in the present CPU map. This iterates over the maximum number of CPUs we plan to support and makes sure they're all set in the present CPU map. Signed-off-by: Paul Mundt commit f0ccf2770f523bd4fc436886a38e499f9ec95c0e Author: Paul Mundt Date: Mon Apr 26 18:39:50 2010 +0900 sh: convert online CPU map twiddling to cpumask. This converts from cpu_set() for the online map to set_cpu_online(). The two online map modifiers were the last remaining manual map manipulation bits, with this in place everything now goes through cpumask. Signed-off-by: Paul Mundt commit c9f4a3f53b5d61f86eae3512abdf948878ca3498 Author: Paul Mundt Date: Mon Apr 26 18:35:44 2010 +0900 sh: arch/sh/kernel/setup.c needs asm/smp.h. With the platform ops migration, the definitions still need to be included in the CONFIG_SMP=n case, so make the asm/smp.h include explicit. Signed-off-by: Paul Mundt commit 9e8c5be8b76b188ec5bc95b378cf67aaeba1f695 Author: Paul Mundt Date: Mon Apr 26 18:20:29 2010 +0900 sh: Flag present CPUs hotpluggable in topology registration. When registering CPUs in the topology initialization ensure that all of the present CPUs are flagged as hotpluggable. Signed-off-by: Paul Mundt commit e60692b9347d17774cdad00ae2b9afd3dc5444af Author: Paul Mundt Date: Mon Apr 26 17:45:34 2010 +0900 sh: mach-sdk7786: update defconfig for compressed kernel image. Now that compressed image loading is possible for sdk7786, drop the vmlinux.bin default image target and update the defconfig accordingly. Signed-off-by: Paul Mundt commit 364b97d9e2fec32b7c125f67e5a9e5f1cd0e6a37 Author: Paul Mundt Date: Mon Apr 26 16:15:17 2010 +0900 sh: Kill off dangling goto labels from oom-killer rework. Signed-off-by: Paul Mundt commit e19553427c2e8fdb04fdd98e407164bb59a840ba Merge: 35f6cd4 83515bc Author: Paul Mundt Date: Mon Apr 26 16:08:27 2010 +0900 Merge branch 'sh/stable-updates' Conflicts: arch/sh/kernel/dwarf.c drivers/dma/shdma.c Signed-off-by: Paul Mundt commit 35f6cd4a06432034665a1499ca4b022437423aac Merge: 5bac942 035ca59 Author: Paul Mundt Date: Mon Apr 26 15:54:48 2010 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mfleming/sh-2.6: sh: Use correct mask when comparing PMB DATA array values sh: Do not try merging two 128MB PMB mappings sh: Fix zImage load address when CONFIG_32BIT=y sh: Fix address to decompress at when CONFIG_32BIT=y sh: Assembly friendly __pa and __va definitions commit 5bac942db3d2c4738df04104240d65a5d1eaec6a Author: Guennadi Liakhovetski Date: Wed Apr 21 15:36:49 2010 +0000 SH: constify multiple DMA related objects and references to them Lists of DMA channels and slaves are not changed, make them constant. Besides, SH7724 channel and slave configuration of both DMA controllers is identical, remove the extra copy of the configuration data. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 6b6b18e62cfba44ce7b6489c7100f12b199232d7 Author: Nick Piggin Date: Thu Apr 22 16:06:26 2010 +0000 sh: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Cc: linux-sh@vger.kernel.org Cc: linux-arch@vger.kernel.org Signed-off-by: Nick Piggin Acked-by: David Rientjes Signed-off-by: Paul Mundt commit 035ca59fe8399a67b56511bd5b28130f0c4874a0 Author: Matt Fleming Date: Sun Apr 25 20:18:41 2010 +0100 sh: Use correct mask when comparing PMB DATA array values Previously we were masking the PMB DATA array values with the value of __MEMORY_START | PMB_V, which misses some PFN bits off the mask. Signed-off-by: Matt Fleming commit c7b03fa0bdc04e00bfbdc4cc69da144b11108f37 Author: Matt Fleming Date: Sun Apr 25 17:29:07 2010 +0100 sh: Do not try merging two 128MB PMB mappings There is a logic error in pmb_merge() that means we will incorrectly try to merge two 128MB PMB mappings into one mapping. However, 256MB isn't a valid PMB map size and pmb_merge() will actually drop the second 128MB mapping. This patch allows my SDK7786 board to boot when configured with CONFIG_MEMORY_SIZE=0x10000000. Signed-off-by: Matt Fleming commit 9c3d936352fefaadec57bafda1fe3807890cbf2c Author: Matt Fleming Date: Sat Apr 24 13:34:44 2010 +0100 sh: Fix zImage load address when CONFIG_32BIT=y We can't necessarily use the P1SEG region to access RAM when running in 32BIT mode, so use CONFIG_MEMORY_START as the base address. Signed-off-by: Matt Fleming commit b161313ae8d9c64de589d1de72f975210ce37b48 Author: Matt Fleming Date: Sat Apr 24 13:28:20 2010 +0100 sh: Fix address to decompress at when CONFIG_32BIT=y When running in 32BIT mode the P1SEG region doesn't necessarily provide a window onto RAM (it depends how the bootloader setup the PMB). The correct location to place the decompressed kernel is the physical address of _text. Signed-off-by: Matt Fleming commit 7c4584d39a8a144c60adaf4cf998c3233b6683d9 Author: Matt Fleming Date: Sat Apr 24 11:12:12 2010 +0100 sh: Assembly friendly __pa and __va definitions This patch defines ___pa and ___va which return the physical and virtual address of an address, respectively. These macros are suitable for calling from assembly because they don't include the C casts required by __pa and __va. Signed-off-by: Matt Fleming commit b3c981d2bbbe889125169bd0bb482e64d3c028a1 Author: Jiri Pirko Date: Sun Apr 25 00:49:56 2010 -0700 netns: rename unregister_pernet_subsys parameter Stay consistent with other functions and with comment also and name pernet_operations parameter properly. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 8c52d509e84bbf26cffb8b6e75b399689af67885 Author: Changli Gao Date: Sat Apr 24 22:50:10 2010 -0700 rps: optimize rps_get_cpu() optimize rps_get_cpu(). don't initialize ports when we can get the ports. one memory access for ports than two. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit bf73130d7f98c8c4db143e2dc4982f4eefd5d5e5 Author: Stephen Hemminger Date: Sat Apr 24 20:04:12 2010 -0700 sky2: add support for receive hashing Sky2 hardware supports hardware receive hash calculation. Now that Receive Packet Steering is available, add support to enable it. This version does not depend on CONFIG_RPS. Also set_flags rejects all values except RXHASH, so driver won't have to change next time somebody adds a new one. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b7d6a4321195c32b548f0185a2fa0b8f6e02bcfc Merge: 4b340ae 08b202b Author: David S. Miller Date: Fri Apr 23 23:37:24 2010 -0700 Merge branch 'net-next-2.6_20100423a/br/br_multicast_v3' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next commit 4b340ae20d0e2366792abe70f46629e576adaf5e Author: Brian Haley Date: Fri Apr 23 11:26:09 2010 +0000 IPv6: Complete IPV6_DONTFRAG support Finally add support to detect a local IPV6_DONTFRAG event and return the relevant data to the user if they've enabled IPV6_RECVPATHMTU on the socket. The next recvmsg() will return no data, but have an IPV6_PATHMTU as ancillary data. Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit 13b52cd44670e3359055e9918d0e766d89836425 Author: Brian Haley Date: Fri Apr 23 11:26:08 2010 +0000 IPv6: Add dontfrag argument to relevant functions Add dontfrag argument to relevant functions for IPV6_DONTFRAG support, as well as allowing the value to be passed-in via ancillary cmsg data. Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit 793b14731686595a741d9f47726ad8b9a235385a Author: Brian Haley Date: Fri Apr 23 11:26:07 2010 +0000 IPv6: data structure changes for new socket options Add underlying data structure changes and basic setsockopt() and getsockopt() support for IPV6_RECVPATHMTU, IPV6_PATHMTU, and IPV6_DONTFRAG. IPV6_PATHMTU is actually fully functional at this point. Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit cfadf9d4ac4be940595ab73d3def24c23c8b875f Author: William Cohen Date: Fri Apr 23 16:36:21 2010 -0400 perf: Some perf-kvm documentation edits asciidoc does not allow the "===" to be longer than the line above it. Also fix a couple types and formatting errors. Signed-off-by: William Cohen Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar LKML-Reference: <4BD204C5.9000504@redhat.com> Signed-off-by: Frederic Weisbecker commit e1889d75aff0c3786bc53aeb7d9eaca0691c19c5 Author: Frederic Weisbecker Date: Sat Apr 24 01:55:09 2010 +0200 perf: Add a perf trace option to check samples ordering reliability To ensure sample events time reordering is reliable, add a -d option to perf trace to check that automatically. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Tom Zanussi commit 9df9bbba9f7e2e4ffdc51bbbfa524b67691321d2 Author: Frederic Weisbecker Date: Sat Apr 24 01:18:48 2010 +0200 perf: Use generic sample reordering in perf timechart Use the new generic sample events reordering from perf timechart, this drops the ad hoc sample reordering it was using before. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Tom Zanussi Cc: Arjan van de Ven commit e0a808c65c23f88e48a5fff48775b90e7919c64f Author: Frederic Weisbecker Date: Sat Apr 24 00:38:33 2010 +0200 perf: Use generic sample reordering in perf trace Use the new generic sample events reordering from perf trace. Before that, the displayed traces were ordered as they were in the input as recorded by perf record (not time ordered). This makes eventually perf trace displaying the events as beeing time ordered. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Tom Zanussi commit 587570d4cc3cac80da7d569bee9cea3ca104d60e Author: Frederic Weisbecker Date: Sat Apr 24 00:34:53 2010 +0200 perf: Use generic sample reordering in perf kmem Use the new generic sample events reordering from perf kmem, this drops the need of multiplexing the buffers on record time, improving the scalability of perf kmem. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Tom Zanussi Cc: Pekka Enberg Cc: Li Zefan commit a64eae703b390185abe1d15fa932b48f04fa7fbb Author: Frederic Weisbecker Date: Sat Apr 24 00:29:40 2010 +0200 perf: Use generic sample reordering in perf sched Use the new generic sample events reordering from perf sched, this drops the need of multiplexing the buffers on record time, improving the scalability of perf sched. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Tom Zanussi commit c61e52ee705f938596d307625dce00cc4345aaf0 Author: Frederic Weisbecker Date: Sat Apr 24 00:04:12 2010 +0200 perf: Generalize perf lock's sample event reordering to the session layer The sample events recorded by perf record are not time ordered because we have one buffer per cpu for each event (even demultiplexed per task/per cpu for task bound events). But when we read trace events we want them to be ordered by time because many state machines are involved. There are currently two ways perf tools deal with that: - use -M to multiplex every buffers (perf sched, perf kmem) But this creates a lot of contention in SMP machines on record time. - use a post-processing time reordering (perf timechart, perf lock) The reordering used by timechart is simple but doesn't scale well with huge flow of events, in terms of performance and memory use (unusable with perf lock for example). Perf lock has its own samples reordering that flushes its memory use in a regular basis and that uses a sorting based on the previous event queued (a new event to be queued is close to the previous one most of the time). This patch proposes to export perf lock's samples reordering facility to the session layer that reads the events. So if a tool wants to get ordered sample events, it needs to set its struct perf_event_ops::ordered_samples to true and that's it. This prepares tracing based perf tools to get rid of the need to use buffers multiplexing (-M) or to implement their own reordering. Also lower the flush period to 2 as it's sufficient already. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Tom Zanussi commit 5710fcad7c367adefe5634dc998f1f88780a8457 Author: Stephane Eranian Date: Wed Apr 21 18:06:01 2010 +0200 perf: Fix initialization bug in parse_single_tracepoint_event() The parse_single_tracepoint_event() was setting some attributes before it validated the event was indeed a tracepoint event. This caused problems with other initialization routines like in the builtin-top.c module whereby sample_period is not set if not 0. Signed-off-by: Stephane Eranian Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar LKML-Reference: <4bcf232b.698fd80a.6fbe.ffffb737@mx.google.com> Signed-off-by: Frederic Weisbecker commit e4cef1f65061429c3e8b356233e87dc6653a9da5 Author: Hitoshi Mitake Date: Wed Apr 21 21:23:54 2010 +0900 perf lock: Fix state machine to recognize lock sequence Previous state machine of perf lock was really broken. This patch improves it a little. This patch prepares the list of state machine that represents lock sequences for each threads. These state machines can be one of these sequences: 1) acquire -> acquired -> release 2) acquire -> contended -> acquired -> release 3) acquire (w/ try) -> release 4) acquire (w/ read) -> release The case of 4) is a little special. Double acquire of read lock is allowed, so the state machine counts read lock number, and permits double acquire and release. But, things are not so simple. Something in my model is still wrong. I counted the number of lock instances with bad sequence, and ratio is like this (case of tracing whoami): bad:233, total:2279 version 2: * threads are now identified with tid, not pid * prepared SEQ_STATE_READ_ACQUIRED for read lock. * bunch of struct lock_seq_stat is now linked list * debug information enhanced (this have to be removed someday) e.g. | === output for debug=== | | bad:233, total:2279 | bad rate:0.000000 | histogram of events caused bad sequence | acquire: 165 | acquired: 0 | contended: 0 | release: 68 Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Jens Axboe Cc: Jason Baron Cc: Xiao Guangrong Cc: Ingo Molnar LKML-Reference: <1271852634-9351-1-git-send-email-mitake@dcl.info.waseda.ac.jp> [rename SEQ_STATE_UNINITED to SEQ_STATE_UNINITIALIZED] Signed-off-by: Frederic Weisbecker commit 3a737028630bb3c2b9efc38b9ddef2e09b06b808 Author: Jiri Pirko Date: Fri Apr 23 01:01:52 2010 +0000 l2tp_eth: fix memory allocation Since .size is set properly in "struct pernet_operations l2tp_eth_net_ops", allocating space for "struct l2tp_eth_net" by hand is not correct, even causes memory leakage. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit e773aaff8295e7f3428d9cf6f8a476a33de00716 Author: Jiri Pirko Date: Fri Apr 23 00:53:39 2010 +0000 l2tp: fix memory allocation Since .size is set properly in "struct pernet_operations l2tp_net_ops", allocating space for "struct l2tp_net" by hand is not correct, even causes memory leakage. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 1f9cc3cb6a27521edfe0a21abf97d2bb11c4d237 Author: Robin Holt Date: Fri Apr 23 10:36:22 2010 -0500 x86, pat: Update the page flags for memtype atomically instead of using memtype_lock While testing an application using the xpmem (out of kernel) driver, we noticed a significant page fault rate reduction of x86_64 with respect to ia64. For one test running with 32 cpus, one thread per cpu, it took 01:08 for each of the threads to vm_insert_pfn 2GB worth of pages. For the same test running on 256 cpus, one thread per cpu, it took 14:48 to vm_insert_pfn 2 GB worth of pages. The slowdown was tracked to lookup_memtype which acquires the spinlock memtype_lock. This heavily contended lock was slowing down vm_insert_pfn(). With the cmpxchg on page->flags method, both the 32 cpu and 256 cpu cases take approx 00:01.3 seconds to complete. Signed-off-by: Robin Holt LKML-Reference: <20100423153627.751194346@gulag1.americas.sgi.com> Cc: Venkatesh Pallipadi Cc: Rafael Wysocki Reviewed-by: Suresh Siddha Signed-off-by: H. Peter Anvin commit 3b51cc996e81d8a113416d8094fa4a88f8360a51 Merge: c68ed25 6727244 Author: John W. Linville Date: Fri Apr 23 14:43:45 2010 -0400 Merge branch 'master' into for-davem Conflicts: drivers/net/wireless/ath/ath9k/phy.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-debugfs.c commit 3a278a0c65c924950c4744ba451a110998998044 Author: Mark Brown Date: Mon Mar 29 20:31:14 2010 +0100 ASoC: Allow reporting of NULL jacks Follow the core jack implementation and allow reporting on the status of NULL jacks, avoiding the need to check in detection implementations. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ba0a24e7387bb56425da07ed858ada37896ed36a Author: Barry Song <21cnbao@gmail.com> Date: Wed Apr 21 17:36:49 2010 +0800 ASoC: ad193x: fix typo, delete redundant space Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d6bdc0f7fe561a4b08b280c2b2add2db3747e64b Author: Barry Song <21cnbao@gmail.com> Date: Wed Apr 21 17:36:48 2010 +0800 ASoC: ad193x: fix wrong register setting in ad193x_set_dai_fmt Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5a5e02e5095ed89a0a1f4031e7440078c209442b Author: Hans de Goede Date: Fri Apr 23 05:26:43 2010 -0400 ALSA: snd-es1968: Make hardware volume buttons an input device (rev2) The hardware volume handling code in essence just detects key presses, and then does some hardcoded modification of the master volume based on which key is pressed. Clearly the right thing to do here is just report these keypresses to userspace and let userspace decide what to with them. This patch adds a Kconfig option which when enabled reports the volume buttons as keypresses using an input device. When enabled this option also gets rid of the ugly direct ac97 writes from the tasklet, the ac97lock and the need for using a tasklet in general. Signed-off-by: Hans de Goede Signed-off-by: Takashi Iwai commit eb581adf25fe9e42197e591926de85459e68b9fd Author: Hans de Goede Date: Fri Apr 23 05:26:42 2010 -0400 ALSA: snd-maestro3: Make hardware volume buttons an input device (rev2) While working on the sound suspend / resume problems with my laptop I noticed that the hardware volume handling code in essence just detects key presses, and then does some hardcoded modification of the master volume based on which key is pressed. This made me think that clearly the right thing to do here is just report these keypresses to userspace and let userspace decide what to with them. This patch adds a Kconfig option which when enabled reports the volume buttons as keypresses using an input device. When enabled this option also gets rid of the ugly direct ac97 writes from the tasklet, the ac97lock and the need for using a tasklet in general. As an added bonus the keys now work identical to volume keys on a (usb) keyboard with multimedia keys, providing visual feedback of the volume level change, and a better range of the volume control (with a properly configured desktop environment). Signed-off-by: Hans de Goede Signed-off-by: Takashi Iwai commit b971f06187d83b5c03d2b597cccdfef421c0ca91 Merge: cb6e943 c1ab9ca Author: Robert Richter Date: Fri Apr 23 16:47:51 2010 +0200 Merge commit 'tip/tracing/core' into oprofile/core Conflicts: drivers/oprofile/cpu_buffer.c Signed-off-by: Robert Richter commit cb6e943ccf19ab6d3189147e9d625a992e016084 Author: Andi Kleen Date: Thu Apr 1 03:17:25 2010 +0200 oprofile: remove double ring buffering oprofile used a double buffer scheme for its cpu event buffer to avoid races on reading with the old locked ring buffer. But that is obsolete now with the new ring buffer, so simply use a single buffer. This greatly simplifies the code and avoids a lot of sample drops on large runs, especially with call graph. Based on suggestions from Steven Rostedt For stable kernels from v2.6.32, but not earlier. Signed-off-by: Andi Kleen Cc: Steven Rostedt Cc: stable Signed-off-by: Robert Richter commit a36bf32e9e8a86f291f746b7f8292e042ee04a46 Merge: bc078e4 01bf0b6 Author: Robert Richter Date: Fri Apr 23 14:30:22 2010 +0200 Merge commit 'v2.6.34-rc5' into oprofile/core commit af740b2c8f4521e2c45698ee6040941a82d6349d Author: Jesper Dangaard Brouer Date: Fri Apr 23 12:34:56 2010 +0200 netfilter: nf_conntrack: extend with extra stat counter I suspect an unfortunatly series of events occuring under a DDoS attack, in function __nf_conntrack_find() nf_contrack_core.c. Adding a stats counter to see if the search is restarted too often. Signed-off-by: Jesper Dangaard Brouer Signed-off-by: Patrick McHardy commit 77a7f2e94e6998e307917fe63fa4b6d5162d44e9 Merge: ac0053f cecbca9 Author: Ingo Molnar Date: Fri Apr 23 11:25:31 2010 +0200 Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core commit 4093b150e52e6da20e9496df8aa007423952ae42 Merge: 70bce3b fead796 Author: Ingo Molnar Date: Fri Apr 23 11:11:38 2010 +0200 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perf into perf/core commit 70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e Merge: 6eca8cc d5a3045 Author: Ingo Molnar Date: Fri Apr 23 11:10:28 2010 +0200 Merge branch 'linus' into perf/core Merge reason: merge the latest fixes, update to latest -rc. Signed-off-by: Ingo Molnar commit 99bd5e2f245d8cd17d040c82d40becdb3efd9b69 Author: Suresh Siddha Date: Wed Mar 31 16:47:45 2010 -0700 sched: Fix select_idle_sibling() logic in select_task_rq_fair() Issues in the current select_idle_sibling() logic in select_task_rq_fair() in the context of a task wake-up: a) Once we select the idle sibling, we use that domain (spanning the cpu that the task is currently woken-up and the idle sibling that we found) in our wake_affine() decisions. This domain is completely different from the domain(we are supposed to use) that spans the cpu that the task currently woken-up and the cpu where the task previously ran. b) We do select_idle_sibling() check only for the cpu that the task is currently woken-up on. If select_task_rq_fair() selects the previously run cpu for waking the task, doing a select_idle_sibling() check for that cpu also helps and we don't do this currently. c) In the scenarios where the cpu that the task is woken-up is busy but with its HT siblings are idle, we are selecting the task be woken-up on the idle HT sibling instead of a core that it previously ran and currently completely idle. i.e., we are not taking decisions based on wake_affine() but directly selecting an idle sibling that can cause an imbalance at the SMT/MC level which will be later corrected by the periodic load balancer. Fix this by first going through the load imbalance calculations using wake_affine() and once we make a decision of woken-up cpu vs previously-ran cpu, then choose a possible idle sibling for waking up the task on. Signed-off-by: Suresh Siddha Signed-off-by: Peter Zijlstra LKML-Reference: <1270079265.7835.8.camel@sbs-t61.sc.intel.com> Signed-off-by: Ingo Molnar commit 669c55e9f99b90e46eaa0f98a67ec53d46dc969a Author: Peter Zijlstra Date: Fri Apr 16 14:59:29 2010 +0200 sched: Pre-compute cpumask_weight(sched_domain_span(sd)) Dave reported that his large SPARC machines spend lots of time in hweight64(), try and optimize some of those needless cpumask_weight() invocations (esp. with the large offstack cpumasks these are very expensive indeed). Reported-by: David Miller Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 74f5187ac873042f502227701ed1727e7c5fbfa9 Author: Peter Zijlstra Date: Thu Apr 22 21:50:19 2010 +0200 sched: Cure load average vs NO_HZ woes Chase reported that due to us decrementing calc_load_task prematurely (before the next LOAD_FREQ sample), the load average could be scewed by as much as the number of CPUs in the machine. This patch, based on Chase's patch, cures the problem by keeping the delta of the CPU going into NO_HZ idle separately and folding that in on the next LOAD_FREQ update. This restores the balance and we get strict LOAD_FREQ period samples. Signed-off-by: Peter Zijlstra Acked-by: Chase Douglas LKML-Reference: <1271934490.1776.343.camel@laptop> Signed-off-by: Ingo Molnar commit c68ed255265968c3948fa2678bf59d15c471b055 Author: Tom Herbert Date: Fri Apr 23 00:10:52 2010 -0700 bnx2x: add support for receive hashing Add support to bnx2x to extract Toeplitz hash out of the receive descriptor for use in skb->rxhash. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 08b202b6726459626c73ecfa08fcdc8c3efc76c2 Author: YOSHIFUJI Hideaki Date: Fri Apr 23 01:54:22 2010 +0900 bridge br_multicast: IPv6 MLD support. Signed-off-by: YOSHIFUJI Hideaki commit 8ef2a9a59854994bace13b5c4f7edc2c8d4d124e Author: YOSHIFUJI Hideaki Date: Sun Apr 18 12:42:07 2010 +0900 bridge br_multicast: Make functions less ipv4 dependent. Introduce struct br_ip{} to store ip address and protocol and make functions more generic so that we can support both IPv4 and IPv6 with less pain. Signed-off-by: YOSHIFUJI Hideaki commit 6e7cb8370760ec17e10098399822292def8d84f3 Author: YOSHIFUJI Hideaki Date: Sun Apr 18 12:42:05 2010 +0900 ipv6 mcast: Introduce include/net/mld.h for MLD definitions. Signed-off-by: YOSHIFUJI Hideaki commit efe91932e79cfe59a562b70d8eb18049b36debc6 Author: stephen hemminger Date: Thu Apr 22 13:42:56 2010 +0000 sky2: size status ring based on Tx/Rx ring Sky2 status ring must be big enough to handle worst case number of status messages. It was being oversized (to handle dual port cards), and excessive number of tx ring entries were allowed. This patch reduces the footprint and makes sure the value is enough. Later patch to add RSS increases the number of possible Rx status elements. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 286d1e7f73320be063a5f6af25d3d61c741065c2 Author: Scott Feldman Date: Thu Apr 22 14:38:03 2010 +0000 remove DCB_PROTO_VERSION as we don't do netlink versioning remove DCB_PROTO_VERSION as we don't do netlink versioning Signed-off-by: Scott Feldman Signed-off-by: David S. Miller commit 59d3b388741cf1a5eb7ad27fd4e9ed72643164ae Author: Borislav Petkov Date: Thu Apr 22 16:07:02 2010 +0200 x86, cacheinfo: Disable index in all four subcaches When disabling an L3 cache index, make sure we disable that index in all four subcaches of the L3. Clarify nomenclature while at it, wrt to disable slots versus disable index and rename accordingly. Signed-off-by: Borislav Petkov LKML-Reference: <1271945222-5283-6-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit ba06edb63f5ef2913aad37070eaec3c9d8ac73b8 Author: Borislav Petkov Date: Thu Apr 22 16:07:01 2010 +0200 x86, cacheinfo: Make L3 cache info per node Currently, we're allocating L3 cache info and calculating indices for each online cpu which is clearly superfluous. Instead, we need to do this per-node as is each L3 cache. No functional change, only per-cpu memory savings. -v2: Allocate L3 cache descriptors array dynamically. Signed-off-by: Borislav Petkov LKML-Reference: <1271945222-5283-5-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit 9350f982e4fe539e83a2d4a13e9b53ad8253c4a8 Author: Borislav Petkov Date: Thu Apr 22 16:07:00 2010 +0200 x86, cacheinfo: Reorganize AMD L3 cache structure Add a struct representing L3 cache attributes (subcache sizes and indices count) and move the respective members out of _cpuid4_info. Also, stash the struct pci_dev ptr into the struct simplifying the code even more. There should be no functionality change resulting from this patch except slightly slimming the _cpuid4_info per-cpu vars. Signed-off-by: Borislav Petkov LKML-Reference: <1271945222-5283-4-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit f2b20e41407fccfcfacf927ff91ec888832a37af Author: Frank Arnold Date: Thu Apr 22 16:06:59 2010 +0200 x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments When running a quest kernel on xen we get: BUG: unable to handle kernel NULL pointer dereference at 0000000000000038 IP: [] cpuid4_cache_lookup_regs+0x2ca/0x3df PGD 0 Oops: 0000 [#1] SMP last sysfs file: CPU 0 Modules linked in: Pid: 0, comm: swapper Tainted: G W 2.6.34-rc3 #1 /HVM domU RIP: 0010:[] [] cpuid4_cache_lookup_regs+0x 2ca/0x3df RSP: 0018:ffff880002203e08 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000060 RDX: 0000000000000000 RSI: 0000000000000040 RDI: 0000000000000000 RBP: ffff880002203ed8 R08: 00000000000017c0 R09: ffff880002203e38 R10: ffff8800023d5d40 R11: ffffffff81a01e28 R12: ffff880187e6f5c0 R13: ffff880002203e34 R14: ffff880002203e58 R15: ffff880002203e68 FS: 0000000000000000(0000) GS:ffff880002200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000038 CR3: 0000000001a3c000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper (pid: 0, threadinfo ffffffff81a00000, task ffffffff81a44020) Stack: ffffffff810d7ecb ffff880002203e20 ffffffff81059140 ffff880002203e30 <0> ffffffff810d7ec9 0000000002203e40 000000000050d140 ffff880002203e70 <0> 0000000002008140 0000000000000086 ffff880040020140 ffffffff81068b8b Call Trace: [] ? sync_supers_timer_fn+0x0/0x1c [] ? mod_timer+0x23/0x25 [] ? arm_supers_timer+0x34/0x36 [] ? hrtimer_get_next_event+0xa7/0xc3 [] ? get_next_timer_interrupt+0x19a/0x20d [] get_cpu_leaves+0x5c/0x232 [] ? sched_clock_local+0x1c/0x82 [] ? sched_clock_tick+0x75/0x7a [] generic_smp_call_function_single_interrupt+0xae/0xd0 [] smp_call_function_single_interrupt+0x18/0x27 [] call_function_single_interrupt+0x13/0x20 [] ? notifier_call_chain+0x14/0x63 [] ? native_safe_halt+0xc/0xd [] ? default_idle+0x36/0x53 [] cpu_idle+0xaa/0xe4 [] rest_init+0x7e/0x80 [] start_kernel+0x40e/0x419 [] x86_64_start_reservations+0xb3/0xb7 [] x86_64_start_kernel+0xf8/0x107 Code: 14 d5 40 ff ae 81 8b 14 02 31 c0 3b 15 47 1c 8b 00 7d 0e 48 8b 05 36 1c 8b 00 48 63 d2 48 8b 04 d0 c7 85 5c ff ff ff 00 00 00 00 <8b> 70 38 48 8d 8d 5c ff ff ff 48 8b 78 10 ba c4 01 00 00 e8 eb RIP [] cpuid4_cache_lookup_regs+0x2ca/0x3df RSP CR2: 0000000000000038 ---[ end trace a7919e7f17c0a726 ]--- The L3 cache index disable feature of AMD CPUs has to be disabled if the kernel is running as guest on top of a hypervisor because northbridge devices are not available to the guest. Currently, this fixes a boot crash on top of Xen. In the future this will become an issue on KVM as well. Check if northbridge devices are present and do not enable the feature if there are none. Signed-off-by: Frank Arnold LKML-Reference: <1271945222-5283-3-git-send-email-bp@amd64.org> Acked-by: Borislav Petkov Signed-off-by: H. Peter Anvin commit b1ab1b4d9ab9812c77843abec79030292ef0a544 Author: Borislav Petkov Date: Thu Apr 22 16:06:58 2010 +0200 x86, cacheinfo: Unify AMD L3 cache index disable checking All F10h CPUs starting with model 8 resp. 9, stepping 1, support L3 cache index disable. Concentrate the family, model, stepping checking at one place and enable the feature implicitly on upcoming Fam10h models. Signed-off-by: Borislav Petkov LKML-Reference: <1271945222-5283-2-git-send-email-bp@amd64.org> Signed-off-by: H. Peter Anvin commit c5b60b5e67af8be4c58d3ffcc36894f69c4fbdc1 Author: Justin P. Mattock Date: Wed Apr 21 00:02:11 2010 -0700 security: whitespace coding style fixes Whitespace coding style fixes. Signed-off-by: Justin P. Mattock Signed-off-by: James Morris commit a33f32244d8550da8b4a26e277ce07d5c6d158b5 Author: Francis Galiegue Date: Fri Apr 23 00:08:02 2010 +0200 Documentation/: it's -> its where appropriate Fix obvious cases of "it's" being used when "its" was meant. Signed-off-by: Francis Galiegue Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina commit 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 Merge: 4cb3ca7 c81eddb Author: Jiri Kosina Date: Fri Apr 23 02:08:44 2010 +0200 Merge branch 'master' into for-next commit e904f0a4163bc7bd303d2430893d82362df6727e Author: andrew hendry Date: Mon Apr 19 13:30:36 2010 +0000 X25: Update X25 interface documentation Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 90b3e030370dba721e141e85661881f5e342e1ab Author: andrew hendry Date: Mon Apr 19 13:30:24 2010 +0000 X25: Use identifiers for hdlc x25 device to x25 interface Change magic numbers to identifiers for X25 interface. Signed-off-by: Andrew Hendry Acked-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 5d74731437b8c8914d2d2956c497c66af3bd6a52 Author: andrew hendry Date: Mon Apr 19 13:30:13 2010 +0000 X25: Use identifiers for cyclades device to x25 interface Change magic numbers to identifiers for X25 interface. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 4d99503e0b28edf654ca1918229a317a3f738f08 Author: andrew hendry Date: Mon Apr 19 13:30:02 2010 +0000 X25: Use identifiers for lapbether device to x25 interface Change magic numbers to identifiers for X25 interface. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 7eeeacf0b5b8c0a0badced506388c02b9422d508 Author: andrew hendry Date: Mon Apr 19 13:29:47 2010 +0000 X25: Use identifiers for x25 async device to x25 interface Change magic numbers to identifiers for X25 interface. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 4150bbf3388eba2c9d2cb7a345134e363cc6e34f Author: andrew hendry Date: Mon Apr 19 13:29:06 2010 +0000 X25: Use identifiers for isdn device to x25 interface Change magic numbers to identifiers for X25 interface. also minor check patch formatting. Signed-off-by: Andrew Hendry Acked-by: Karsten Keil Signed-off-by: David S. Miller commit 5ebfbc06aae941484326c9e7e9c4d85330f63591 Author: Andrew Hendry Date: Thu Apr 22 16:12:36 2010 -0700 X25: Add if_x25.h and x25 to device identifiers V2 Feedback from John Hughes. - Add header for userspace implementations such as xot/xoe to use - Use explicit values for interface stability - No changes to driver patches V1 - Use identifiers instead of magic numbers for X25 layer 3 to device interface. - Also fixed checkpatch notes on updated code. [ Add new user header to include/linux/Kbuild -DaveM ] Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit f68c224fedff2157f3fad7f7da674cbc96567c84 Author: Eric Dumazet Date: Thu Apr 22 16:06:59 2010 -0700 dst: rcu check refinement __sk_dst_get() might be called from softirq, with socket lock held. [ 159.026180] include/net/sock.h:1200 invoked rcu_dereference_check() without protection! [ 159.026261] [ 159.026261] other info that might help us debug this: [ 159.026263] [ 159.026425] [ 159.026426] rcu_scheduler_active = 1, debug_locks = 0 [ 159.026552] 2 locks held by swapper/0: [ 159.026609] #0: (&icsk->icsk_retransmit_timer){+.-...}, at: [] run_timer_softirq+0x105/0x350 [ 159.026839] #1: (slock-AF_INET){+.-...}, at: [] tcp_write_timer+0x2f/0x1e0 [ 159.027063] [ 159.027064] stack backtrace: [ 159.027172] Pid: 0, comm: swapper Not tainted 2.6.34-rc5-03707-gde498c8-dirty #36 [ 159.027252] Call Trace: [ 159.027306] [] lockdep_rcu_dereference +0xaf/0xc0 [ 159.027411] [] tcp_current_mss+0xa7/0xb0 [ 159.027537] [] tcp_write_wakeup+0x89/0x190 [ 159.027600] [] tcp_send_probe0+0x16/0x100 [ 159.027726] [] tcp_write_timer+0x179/0x1e0 [ 159.027790] [] run_timer_softirq+0x191/0x350 [ 159.027980] [] __do_softirq+0xcd/0x200 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 40eaf96271526a9f71030dd1a199ce46c045752e Author: Paul LeoNerd Evans Date: Thu Apr 22 03:32:22 2010 +0000 net: Socket filter ancilliary data access for skb->dev->type Add an SKF_AD_HATYPE field to the packet ancilliary data area, giving access to skb->dev->type, as reported in the sll_hatype field. When capturing packets on a PF_PACKET/SOCK_RAW socket bound to all interfaces, there doesn't appear to be a way for the filter program to actually find out the underlying hardware type the packet was captured on. This patch adds such ability. This patch also handles the case where skb->dev can be NULL, such as on netlink sockets. Signed-off-by: Paul Evans Signed-off-by: David S. Miller commit aa2ea0586d9dbe56a334d835a43b45e8c2104e77 Author: Tom Herbert Date: Thu Apr 22 07:00:24 2010 +0000 tcp: fix outsegs stat for TSO segments Account for TSO segments of an skb in TCP_MIB_OUTSEGS counter. Without doing this, the counter can be off by orders of magnitude from the actual number of segments sent. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 822cceec7248013821d655545ea45d1c6a9d15b3 Author: Kees Cook Date: Thu Apr 22 12:19:17 2010 -0700 mmap_min_addr check CAP_SYS_RAWIO only for write Redirecting directly to lsm, here's the patch discussed on lkml: http://lkml.org/lkml/2010/4/22/219 The mmap_min_addr value is useful information for an admin to see without being root ("is my system vulnerable to kernel NULL pointer attacks?") and its setting is trivially easy for an attacker to determine by calling mmap() in PAGE_SIZE increments starting at 0, so trying to keep it private has no value. Only require CAP_SYS_RAWIO if changing the value, not reading it. Comment from Serge : Me, I like to write my passwords with light blue pen on dark blue paper, pasted on my window - if you're going to get my password, you're gonna get a headache. Signed-off-by: Kees Cook Acked-by: Serge Hallyn Signed-off-by: James Morris commit 3cfa856d6d43894ebffdc28d2f0587595280893b Author: David S. Miller Date: Thu Apr 22 15:48:17 2010 -0700 niu: Add skb->rxhash support. Signed-off-by: David S. Miller commit eb8dae9607901fd3fc181325ff3f30dce8f574c5 Author: Eric Paris Date: Thu Apr 22 10:49:36 2010 -0400 IMA: include the word IMA in printk messages As an example IMA emits a warning when it can't find a TPM chip: "No TPM chip found, activating TPM-bypass!" This patch prefaces that message with IMA so we know what subsystem is bypassing the TPM. Do this for all pr_info and pr_err messages. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 927b1375f9c53456b309ae12d048d41388f9f963 Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:42 2010 +0000 qlcnic: update version 5.0.2 Update version to indicate IDC(fw recovery) changes. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 780ab790f5099727baff6fa056bba6c5c7c2587a Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:41 2010 +0000 qlcnic: protect resource access We do netif_device_attach, even if resource allocation fails. Driver callbacks can be called, if device is attached. All these callbacks need to be protected by ADAPTER_UP_MAGIC check. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit ed6f1353e195b4432e251667b2d84d766d07c79c Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:40 2010 +0000 qlcnic: fix rcv buffer leak Rcv producer value should be read in spin-lock. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit ade91f8ec92da43b62b0efaa854cfd4b5ec0c0c9 Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:39 2010 +0000 qlcnic: fix pci semaphore checks Driver should not go ahead with fw recovery if fails to acquire semaphore. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 6d2a47241f0f780819c111eaabaae0e86a937a40 Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:38 2010 +0000 qlcnic: define macro for driver state Defining macro to set and clear driver state. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit f73dfc50f14d5c4c7f6243a87a65b78aef6f3a48 Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:37 2010 +0000 qlcnic: fix fw initialization responsibility Now any pci-func can start fw, whoever sees the reset ack first. Before this, pci-func which sets the RESET state has the responsibility to start fw. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit bbd8c6a45b0f8557a8fc38fc763d7a51fac4459d Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:36 2010 +0000 qlcnic: fix defines as per IDC document Different class of drivers co-exist for CNA device, there is some minimal interaction that will be required amongst the drivers for performing some device level operations. All the driver should follow inter driver coexistence document. Fixing polling interval and spelling mistake. Signed-off-by: Anirban Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8ae6df978b986a5ce099e7e7118f127563d2cbbe Author: Amit Kumar Salecha Date: Thu Apr 22 02:51:35 2010 +0000 qlcnic: additional driver statistics Added additional driver statistics to track errors in rcv/tx path. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit e802af9cabb011f09b9c19a82faef3dd315f27eb Author: Stephen Hemminger Date: Thu Apr 22 15:24:53 2010 -0700 IPv6: Generic TTL Security Mechanism (final version) This patch adds IPv6 support for RFC5082 Generalized TTL Security Mechanism. Not to users of mapped address; the IPV6 and IPV4 socket options are seperate. The server does have to deal with both IPv4 and IPv6 socket options and the client has to handle the different for each family. On client: int ttl = 255; getaddrinfo(argv[1], argv[2], &hint, &result); for (rp = result; rp != NULL; rp = rp->ai_next) { s = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); if (s < 0) continue; if (rp->ai_family == AF_INET) { setsockopt(s, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)); } else if (rp->ai_family == AF_INET6) { setsockopt(s, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl))) } if (connect(s, rp->ai_addr, rp->ai_addrlen) == 0) { ... On server: int minttl = 255 - maxhops; getaddrinfo(NULL, port, &hints, &result); for (rp = result; rp != NULL; rp = rp->ai_next) { s = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); if (s < 0) continue; if (rp->ai_family == AF_INET6) setsockopt(s, IPPROTO_IPV6, IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)); setsockopt(s, IPPROTO_IP, IP_MINTTL, &minttl, sizeof(minttl)); if (bind(s, rp->ai_addr, rp->ai_addrlen) == 0) break ... Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e0c8233622cbd49d171bc57b60e725f2fb748750 Author: J. Bruce Fields Date: Thu Apr 22 17:04:25 2010 -0400 nfsd4: fix filehandle comment Minor typos. Signed-off-by: J. Bruce Fields commit 52882173cfed4fabcc1496755000bf022d681e52 Author: Anton Vorontsov Date: Mon Apr 19 13:20:49 2010 +0100 ARM: 6058/1: Add support for PCI domains This patch adds support for PCI domains on ARM platforms. Also, protect asm/mach/pci.h from multiple inclustions, otherwise build fails because of pci_domain_nr() and pci_proc_domain() redefinitions. Signed-off-by: Anton Vorontsov Signed-off-by: Russell King commit fa588e0c57048b3d4bfcd772d80dc0615f83fd35 Author: Steve French Date: Thu Apr 22 19:21:55 2010 +0000 [CIFS] Allow null nd (as nfs server uses) on create While creating a file on a server which supports unix extensions such as Samba, if a file is being created which does not supply nameidata (i.e. nd is null), cifs client can oops when calling cifs_posix_open. Signed-off-by: Shirish Pargaonkar Signed-off-by: Steve French commit d03859a4aca3969efd91dc77be7efa2ae45b05d8 Author: Dan Carpenter Date: Thu Apr 22 11:30:59 2010 +0200 nfsd: potential ERR_PTR dereference on exp_export() error paths. We "goto finish" from several places where "exp" is an ERR_PTR. Also I changed the check for "fsid_key" so that it was consistent with the check I added. Signed-off-by: Dan Carpenter Signed-off-by: J. Bruce Fields commit 5771635592267758e7dc5647f2a0088aa6244159 Author: J. Bruce Fields Date: Wed Apr 21 12:27:19 2010 -0400 nfsd4: complete enforcement of 4.1 op ordering Enforce the rules about compound op ordering. Motivated by implementing RECLAIM_COMPLETE, for which the client is implicit in the current session, so it is important to ensure a succesful SEQUENCE proceeds the RECLAIM_COMPLETE. Signed-off-by: J. Bruce Fields commit 4b21d0defcc9680da8a694e92d5fe8eb668c2c0b Author: J. Bruce Fields Date: Sun Mar 7 23:39:01 2010 -0500 nfsd4: allow 4.0 clients to change callback path The rfc allows a client to change the callback parameters, but we didn't previously implement it. Teach the callbacks to rerun themselves (by placing themselves on a workqueue) when they recognize that their rpc task has been killed and that the callback connection has changed. Then we can change the callback connection by setting up a new rpc client, modifying the nfs4 client to point at it, waiting for any work in progress to complete, and then shutting down the old client. Signed-off-by: J. Bruce Fields commit 2bf23875f55af6038a5d1c164a52cec4c24609ba Author: J. Bruce Fields Date: Mon Mar 8 12:37:27 2010 -0500 nfsd4: rearrange cb data structures Mainly I just want to separate the arguments used for setting up the tcp client from the rest. Signed-off-by: J. Bruce Fields commit b12a05cbdfdf7e4d8cbe8fa78e995f971420086b Author: J. Bruce Fields Date: Thu Mar 4 11:32:59 2010 -0500 nfsd4: cl_count is unused Now that the shutdown sequence guarantees callbacks are shut down before the client is destroyed, we no longer have a use for cl_count. We'll probably reinstate a reference count on the client some day, but it will be held by users other than callbacks. Signed-off-by: J. Bruce Fields commit b5a1a81e5c25fb6bb3fdc1812ba69ff6ab638fcf Author: J. Bruce Fields Date: Wed Mar 3 14:52:55 2010 -0500 nfsd4: don't sleep in lease-break callback The NFSv4 server's fl_break callback can sleep (dropping the BKL), in order to allocate a new rpc task to send a recall to the client. As far as I can tell this doesn't cause any races in the current code, but the analysis is difficult. Also, the sleep here may complicate the move away from the BKL. So, just schedule some work to do the job for us instead. The work will later also prove useful for restarting a call after the callback information is changed. Signed-off-by: J. Bruce Fields commit 20133d4cd329af7a02ee5af36bba1796d5ff7b1d Author: Hans de Goede Date: Wed Apr 21 11:04:07 2010 -0400 ALSA: snd-meastro3: Document hardware volume control a bit While working on a fix for the volume being muted on the allegro in my Compaq EVO N600C after suspend, I've learned a few things about the hardware volume control worth documenting. The actual fix for the suspend / resume issue is in the next patch in this set. Signed-off-by: Hans de Goede Signed-off-by: Takashi Iwai commit 6458a54423f9a4963e7e88ff62040117285e6b8c Merge: 719f82d 715aa67 Author: Takashi Iwai Date: Thu Apr 22 16:53:24 2010 +0200 Merge branch 'fix/misc' into topic/misc commit cecc74de25d2cfb08e7702cd38e3f195950f1228 Author: Patrick McHardy Date: Thu Apr 22 13:03:24 2010 +0200 netfilter: ip_tables: convert pr_devel() to pr_debug() We want to be able to use CONFIG_DYNAMIC_DEBUG in netfilter code, switch the few existing pr_devel() calls to pr_debug(). Signed-off-by: Patrick McHardy commit 9ccb8975940c4ee51161152e37058e3d9e06c62f Author: David S. Miller Date: Thu Apr 22 01:02:07 2010 -0700 net: Orphan and de-dst skbs earlier in xmit path. This way GSO packets don't get handled differently. With help from Eric Dumazet. Signed-off-by: David S. Miller Signed-off-by: Eric Dumazet commit e326bed2f47d0365da5a8faaf8ee93ed2d86325b Author: Eric Dumazet Date: Thu Apr 22 00:22:45 2010 -0700 rps: immediate send IPI in process_backlog() If some skb are queued to our backlog, we are delaying IPI sending at the end of net_rx_action(), increasing latencies. This defeats the queueing, since we want to quickly dispatch packets to the pool of worker cpus, then eventually deeply process our packets. It's better to send IPI before processing our packets in upper layers, from process_backlog(). Change the _and_disable_irq suffix to _and_enable_irq(), since we enable local irq in net_rps_action(), sorry for the confusion. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit de498c89254b5b89f676e9c9292396d5ebf52bf2 Author: Roland Dreier Date: Wed Apr 21 08:59:17 2010 +0000 cxgb4: Make unnecessarily global functions static Also put t4_write_indirect() inside "#if 0" to avoid a "defined but not used" compile warning. Signed-off-by: Roland Dreier Signed-off-by: David S. Miller commit 62718b328f972f1559feb96dfccc15fc9f4c9a2c Author: Roland Dreier Date: Wed Apr 21 08:09:21 2010 +0000 cxgb4: Use ntohs() on __be16 value instead of htons() Use the correct direction of byte-swapping function to fix a mistake shown by sparse endianness checking -- c.fl0id is __be16. Signed-off-by: Roland Dreier Acked-by: Dimitris Michailidis Signed-off-by: David S. Miller commit b002a861092b0db128800794a116cc3acc5ec239 Author: Johannes Berg Date: Tue Apr 20 21:06:07 2010 +0000 ethernet: print protocol in host byte order Eric's recent patch added __force, but this place would seem to require actually doing a byte order conversion so the printk is consistent across architectures. Cc: Eric Dumazet Signed-off-by: Johannes Berg Signed-off-by: David S. Miller commit 9a20e3197e7f6097897c6d1f18335a326ee06299 Author: Eric Dumazet Date: Tue Apr 20 20:08:36 2010 +0000 net: Introduce skb_orphan_try() At this point, skb->destructor is not the original one (stored in DEV_GSO_CB(skb)->destructor) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a7c561f2e32f98b477f5fe670b3f294be6b1eae2 Author: Thomas Klein Date: Tue Apr 20 23:11:31 2010 +0000 ehea: fix possible DLPAR/mem deadlock Force serialization of userspace-triggered DLPAR/mem operations Signed-off-by: Thomas Klein Signed-off-by: David S. Miller commit ea96ceac80cc82cb1c54a37bb8aaf4e695e87d0a Author: Thomas Klein Date: Tue Apr 20 23:10:55 2010 +0000 ehea: error handling improvement Reset a port's resources only if they're actually in an error state Signed-off-by: Thomas Klein Signed-off-by: David S. Miller commit 719f82d3987aad4cc9f46d19c35f362672545cad Author: Eliot Blennerhassett Date: Wed Apr 21 18:17:39 2010 +0200 ALSA: Add support of AudioScience ASI boards Added the support of AudioScience ASI boards. The driver has been tested for years on alsa-driver external tree, now finally got merged to the kernel. Signed-off-by: Eliot Blennerhassett Signed-off-by: Takashi Iwai commit fead7960f0b645348fa4757100f4d57654bf9ffa Author: Ian Munsie Date: Tue Apr 20 16:58:33 2010 +1000 perf probe: Add PowerPC DWARF register number mappings This adds mappings from the register numbers from DWARF to the register names used in the PowerPC Regs and Stack Access API. This allows perf probe to be used to record variable contents on PowerPC. This requires the functionality represented by the config symbol HAVE_REGS_AND_STACK_ACCESS_API in order to function, although it will compile without it. That functionality is added for PowerPC in commit 359e4284 ("powerpc: Add kprobe-based event tracer"). Signed-off-by: Ian Munsie Acked-by: Masami Hiramatsu Signed-off-by: Paul Mackerras commit cd932c593995abee1d1a8a0bfe608f7d103d87ad Author: Ian Munsie Date: Tue Apr 20 16:58:32 2010 +1000 perf: Move arch specific code into separate arch directory The perf userspace tool included some architecture specific code to map registers from the DWARF register number into the names used by the regs and stack access API. This moves the architecture specific code out into a separate arch/x86 directory along with the infrastructure required to use it. Signed-off-by: Ian Munsie Acked-by: Masami Hiramatsu Signed-off-by: Paul Mackerras commit d414371795d54fa916938f948105d08928abfbb9 Author: Or Gerlitz Date: Thu Mar 4 13:16:52 2010 +0000 IPoIB: Allow disabling/enabling TSO on the fly through ethtool Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 6fa8f719844b8455033e295f720e739c1dc3804a Author: Vladimir Sokolovsky Date: Wed Apr 14 17:23:39 2010 +0300 IB/mlx4: Add support for masked atomic operations Add support for masked atomic operations (masked compare and swap, masked fetch and add). Signed-off-by: Vladimir Sokolovsky Signed-off-by: Roland Dreier commit 5e80ba8ff0bd33ff4af2365969a231cbdb98cafb Author: Vladimir Sokolovsky Date: Wed Apr 14 17:23:01 2010 +0300 IB/core: Add support for masked atomic operations - Add new IB_WR_MASKED_ATOMIC_CMP_AND_SWP and IB_WR_MASKED_ATOMIC_FETCH_AND_ADD send opcodes that can be used to post "masked atomic compare and swap" and "masked atomic fetch and add" work request respectively. - Add masked_atomic_cap capability. - Add mask fields to atomic struct of ib_send_wr - Add new opcodes to ib_wc_opcode The new operations are described more precisely below: * Masked Compare and Swap (MskCmpSwap) The MskCmpSwap atomic operation is an extension to the CmpSwap operation defined in the IB spec. MskCmpSwap allows the user to select a portion of the 64 bit target data for the “compare” check as well as to restrict the swap to a (possibly different) portion. The pseudo code below describes the operation: | atomic_response = *va | if (!((compare_add ^ *va) & compare_add_mask)) then | *va = (*va & ~(swap_mask)) | (swap & swap_mask) | | return atomic_response The additional operands are carried in the Extended Transport Header. Atomic response generation and packet format for MskCmpSwap is as for standard IB Atomic operations. * Masked Fetch and Add (MFetchAdd) The MFetchAdd Atomic operation extends the functionality of the standard IB FetchAdd by allowing the user to split the target into multiple fields of selectable length. The atomic add is done independently on each one of this fields. A bit set in the field_boundary parameter specifies the field boundaries. The pseudo code below describes the operation: | bit_adder(ci, b1, b2, *co) | { | value = ci + b1 + b2 | *co = !!(value & 2) | | return value & 1 | } | | #define MASK_IS_SET(mask, attr) (!!((mask)&(attr))) | bit_position = 1 | carry = 0 | atomic_response = 0 | | for i = 0 to 63 | { | if ( i != 0 ) | bit_position = bit_position << 1 | | bit_add_res = bit_adder(carry, MASK_IS_SET(*va, bit_position), | MASK_IS_SET(compare_add, bit_position), &new_carry) | if (bit_add_res) | atomic_response |= bit_position | | carry = ((new_carry) && (!MASK_IS_SET(compare_add_mask, bit_position))) | } | | return atomic_response Signed-off-by: Vladimir Sokolovsky Signed-off-by: Roland Dreier commit a1aa8822d577c8714f8d343eea028befbab3da9d Author: Richard Röjfors Date: Wed Apr 21 16:33:29 2010 -0700 ks8842: Add platform data for setting mac address This patch adds platform data to the ks8842 driver. Via the platform data a MAC address, to be used by the controller, can be passed. To ensure this MAC address is used, the MAC address is written after each hardware reset. Signed-off-by: Richard Röjfors Signed-off-by: David S. Miller commit 6846ad282693bd066645aff6f13d2b279d505314 Author: Nikanth Karthikesan Date: Thu Apr 15 02:21:23 2010 +0000 net: small cleanup of lib8390 Remove the always true #if 1. Also the unecessary re-test of ei_local->irqlock and the unreachable printk format string. Signed-off-by: Nikanth Karthikesan Signed-off-by: David S. Miller commit 989a2979205dd34269382b357e6d4b4b6956b889 Author: Eric Dumazet Date: Wed Apr 14 09:55:35 2010 +0000 fasync: RCU and fine grained locking kill_fasync() uses a central rwlock, candidate for RCU conversion, to avoid cache line ping pongs on SMP. fasync_remove_entry() and fasync_add_entry() can disable IRQS on a short section instead during whole list scan. Use a spinlock per fasync_struct to synchronize kill_fasync_rcu() and fasync_{remove|add}_entry(). This spinlock is IRQ safe, so sock_fasync() doesnt need its own implementation and can use fasync_helper(), to reduce code size and complexity. We can remove __kill_fasync() direct use in net/socket.c, and rename it to kill_fasync_rcu(). Signed-off-by: Eric Dumazet Cc: Paul E. McKenney Cc: Lai Jiangshan Signed-off-by: David S. Miller commit 5d7220e8dc24feed4bbd66667b7696906a147ac4 Author: Tetsuo Handa Date: Thu Apr 15 11:29:04 2010 +0900 RDMA/cma: Randomize local port allocation Randomize local port allocation in the way sctp_get_port_local() does. Update rover at the end of loop since we're likely to pick a valid port on the first try. Signed-off-by: Tetsuo Handa Reviewed-by: Sean Hefty Signed-off-by: Roland Dreier commit 53978b46cd946ef1dba96ed6d0276ff656dd5d42 Author: Roland Dreier Date: Wed Apr 21 15:58:28 2010 -0700 RDMA/nes: Make unnecessarily global functions static This allows the compiler to do a bit better; on my x86-64 build: add/remove: 0/2 grow/shrink: 1/0 up/down: 2288/-2365 (-77) function old new delta nes_init_phy 273 2561 +2288 nes_init_1g_phy 469 - -469 nes_init_2025_phy 1896 - -1896 Signed-off-by: Roland Dreier commit ce6e74f23d8018f50609f694b6177c139486ebe5 Author: Chien Tung Date: Tue Mar 9 21:50:40 2010 +0000 RDMA/nes: Make nesadapter->phy_lock usage consistent nes_{read,write}_1G_phy_reg() are using phy_lock while nes_{read,write}_10G_phy_reg() leave that to the caller. Remove phy_lock from 1G routines and leave the locking to the caller. Add additional phy_lock calls around 1G read/write. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit cfdda9d764362ab77b11a410bb928400e6520d57 Author: Steve Wise Date: Wed Apr 21 15:30:06 2010 -0700 RDMA/cxgb4: Add driver for Chelsio T4 RNIC Add an RDMA/iWARP driver for Chelsio T4 Ethernet adapters. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 3a2baff783497321e8322ce29f3a33a21c0d88f5 Author: FUJITA Tomonori Date: Fri Apr 2 04:29:39 2010 +0000 IB/mthca: Use the dma state API instead of pci equivalents The DMA API is preferred; no functional change. Signed-off-by: FUJITA Tomonori Signed-off-by: Roland Dreier commit e7494440573d9d7b5cb0e7ed9ae7d742226583de Author: FUJITA Tomonori Date: Wed Apr 21 15:23:10 2010 -0700 RDMA/amso1100: Use the dma state API instead of pci equivalents The DMA API is preferred; no functional change. Signed-off-by: FUJITA Tomonori Signed-off-by: Roland Dreier commit 73a203d2014f50d874b9e40083ad481ca70408e8 Author: Steve Wise Date: Mon Apr 5 19:59:57 2010 +0000 RDMA/cxgb3: Don't free skbs on NET_XMIT_* indications from LLD The low level cxgb3 driver can return NET_XMIT_CN and friends. The iw_cxgb3 driver should _not_ treat these as errors. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 7960d6b9de7716e9080b47f6dc4d415d967e032d Author: FUJITA Tomonori Date: Fri Apr 2 04:29:38 2010 +0000 RDMA/cxgb3: Use the dma state API instead of pci equivalents The DMA API is preferred; no functional change. Signed-off-by: FUJITA Tomonori Signed-off-by: Roland Dreier commit e5700aff144fbbba46be40049f0c55fb57283777 Author: David S. Miller Date: Wed Apr 21 14:59:20 2010 -0700 tcp: Mark v6 response packets as CHECKSUM_PARTIAL Otherwise we only get the checksum right for data-less TCP responses. Noticed by Herbert Xu. Signed-off-by: David S. Miller commit cecbca96da387428e220e307a9c945e37e2f4d9e Author: Frederic Weisbecker Date: Sun Apr 18 19:08:41 2010 +0200 tracing: Dump either the oops's cpu source or all cpus buffers The ftrace_dump_on_oops kernel parameter, sysctl and sysrq let one dump every cpu buffers when an oops or panic happens. It's nice when you have few cpus but it may take ages if have many, plus you miss the real origin of the problem in all the cpu traces. Sometimes, all you need is to dump the cpu buffer that triggered the opps, most of the time it is our main interest. This patch modifies ftrace_dump_on_oops to handle this choice. The ftrace_dump_on_oops kernel parameter, when it comes alone, has the same behaviour than before. But ftrace_dump_on_oops=orig_cpu will only dump the buffer of the cpu that oops'ed. Similarly, sysctl kernel.ftrace_dump_on_oops=1 and echo 1 > /proc/sys/kernel/ftrace_dump_on_oops keep their previous behaviour. But setting 2 jumps into cpu origin dump mode. v2: Fix double setup v3: Fix spelling issues reported by Randy Dunlap v4: Also update __ftrace_dump in the selftests Signed-off-by: Frederic Weisbecker Acked-by: David S. Miller Acked-by: Steven Rostedt Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Li Zefan Cc: Lai Jiangshan commit 2c964d1f7c87eb71f7902111cd7c8fbba225e4b6 Author: Pavel Shilovsky Date: Wed Apr 21 19:44:24 2010 +0000 [CIFS] Fix losing locks during fork() When process does fork() private_data of files with lock list stays the same for file descriptors of the parent and of the child. While finishing the child closes files and deletes locks from the list even if unlocking fails. When the child process finishes the parent doesn't have lock in lock list and can't unlock previously before fork() locked region after the child process finished. This patch provides behaviour to save locks in lock list if unlocking fails. Signed-off-by: Pavel Shilovsky Reviewed-by: Jeff Layton Signed-off-by: Steve French commit bc1db9af731a74c7eca04df5936214c800774113 Author: Roland Dreier Date: Fri Apr 9 17:13:50 2010 -0700 IB: Explicitly rule out llseek to avoid BKL in default_llseek() Several RDMA user-access drivers have file_operations structures with no .llseek method set. None of the drivers actually do anything with f_pos, so this means llseek is essentially a NOP, instead of returning an error as leaving other file_operations methods unimplemented would do. This is mostly harmless, except that a NULL .llseek means that default_llseek() is used, and this function grabs the BKL, which we would like to avoid. Since llseek does nothing useful on these files, we would like it to return an error to userspace instead of silently grabbing the BKL and succeeding. For nearly all of the file types, we take the belt-and-suspenders approach of setting the .llseek method to no_llseek and also calling nonseekable_open(); the exception is the uverbs_event files, which are created with anon_inode_getfile(), which already sets f_mode the same way as nonseekable_open() would. This work is motivated by Arnd Bergmann's bkl-removal tree. Signed-off-by: Roland Dreier commit 672724403b42da1d276c6cf811e8e34d15efd964 Author: Johannes Berg Date: Wed Apr 21 10:25:36 2010 +0200 radiotap parser: fix endian annotation When I updated this from the corresponding userspace library, an annotation error crept in -- this variable needs to be annotated as little endian. No effect on code generation. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 81b208a6b6e2923dcc2dd5292f0d2ffe20b5d16f Author: Luis R. Rodriguez Date: Tue Apr 20 18:28:36 2010 -0400 ath9k_hw: make all AR9002 initvals use u32 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 020ab48d1e3538d33d7d1c1531c45708ff795ebc Author: Luis R. Rodriguez Date: Tue Apr 20 18:28:35 2010 -0400 ath9k_hw: make two initvals consto for the AR9001 family This makes ar5416Addac_9160 and ar5416Addac_9160 const I guess we skipped them long ago. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7add84aa779b4f7ca39484a82a11e01d7acd4dca Author: Mark Brown Date: Thu Apr 22 02:29:01 2010 +0900 ASoC: Allow unspecified source when stopping WM8994 FLLs Signed-off-by: Mark Brown commit d97a9e47ba148cfc41e354c5cd241f472273207c Author: Jan Engelhardt Date: Wed Apr 21 14:45:51 2010 +0200 netfilter: x_tables: move sleeping allocation outside BH-disabled region The jumpstack allocation needs to be moved out of the critical region. Corrects this notice: BUG: sleeping function called from invalid context at mm/slub.c:1705 [ 428.295762] in_atomic(): 1, irqs_disabled(): 0, pid: 9111, name: iptables [ 428.295771] Pid: 9111, comm: iptables Not tainted 2.6.34-rc1 #2 [ 428.295776] Call Trace: [ 428.295791] [] __might_sleep+0xe5/0xed [ 428.295801] [] __kmalloc+0x92/0xfc [ 428.295825] [] ? xt_jumpstack_alloc+0x36/0xff [x_tables] Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 667f0cee3e0321151aa7a1a5222afe67ca4be0ea Author: David S. Miller Date: Wed Apr 21 03:08:11 2010 -0700 sparc64: Fix stack dumping and tracing when function graph is enabled. Like x86, when the function graph tracer is enabled, emit the ftrace stub as well as the program counter it will be transformed back into. We duplicate a lot of similar stack walking logic in 3 or 4 spots, so eventually we should consolidate things like x86 does. Thanks to Frederic Weisbecker for pointing this out. Signed-off-by: David S. Miller commit 87e8f0e3e6d0b720a2462ebc5667eaa462752f74 Author: David S. Miller Date: Wed Apr 21 02:31:50 2010 -0700 sparc64: Show stack backtrace from show_regs() just like other platforms. Signed-off-by: David S. Miller commit f71b70e115dd0bb34eee4d281a4fb6416e88cfff Author: David S. Miller Date: Wed Apr 21 01:57:01 2010 -0700 tcp: Fix ipv6 checksumming on response packets for real. Commit 6651ffc8e8bdd5fb4b7d1867c6cfebb4f309512c ("ipv6: Fix tcp_v6_send_response transport header setting.") fixed one half of why ipv6 tcp response checksums were invalid, but it's not the whole story. If we're going to use CHECKSUM_PARTIAL for these things (which we are since commit 2e8e18ef52e7dd1af0a3bd1f7d990a1d0b249586 "tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb"), we can't be setting buff->csum as we always have been here in tcp_v6_send_response. We need to leave it at zero. Kill that line and checksums are good again. Signed-off-by: David S. Miller commit 87eb367003887cdc81a5d183efea227b5b488961 Merge: ccb7c77 05d1760 Author: David S. Miller Date: Wed Apr 21 01:14:25 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-6000.c net/core/dev.c commit ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 Merge: b15c7b1 01bf0b6 Author: Ingo Molnar Date: Wed Apr 21 09:47:00 2010 +0200 Merge commit 'v2.6.34-rc5' into tracing/core Merge reason: pick up latest -rc's. Signed-off-by: Ingo Molnar commit 6eca8cc35b50af1037bc919106dd6dd332c959c2 Author: Frederic Weisbecker Date: Wed Apr 21 02:01:05 2010 +0200 perf: Fix perf probe build error When we run into dry run mode, we want to make write_kprobe_trace_event to succeed on writing the event. Let's initialize it to 0. Fixes the following build error: util/probe-event.c:1266: attention : «ret» may be used uninitialized in this function util/probe-event.c:1266: note: «ret» was declared here Signed-off-by: Frederic Weisbecker Acked-by: Masami Hiramatsu Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1271808065-25290-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 Author: Rami Rosen Date: Tue Apr 20 22:39:53 2010 -0700 net: Remove two unnecessary exports (skbuff). There is no need to export skb_under_panic() and skb_over_panic() in skbuff.c, since these methods are used only in skbuff.c ; this patch removes these two exports. It also marks these functions as 'static' and removeS the extern declarations of them from include/linux/skbuff.h Signed-off-by: Rami Rosen Signed-off-by: David S. Miller commit f3192090df1e17dbd0f7c4b3820d31719422eb96 Author: Dmitry Torokhov Date: Tue Apr 20 22:15:44 2010 -0700 Input: kbtab - do not advertise unsupported events The device does not emit EV_MSC/MSC_SERIAL nor EV_KEY/BTN_MIDDLE events so it should not mark them as supported in capabilities bitmaps. This still leaves BTN_TOOL_PEN and BTN_TOUCH events being processed in a funky manner. Signed-off-by: Dmitry Torokhov commit 331cb022d3ac1f85f7842a51495c33c629e947bc Author: Dmitry Torokhov Date: Tue Apr 20 22:06:53 2010 -0700 Input: kbtab - simplify kbtab_disconnect() There is no need to check whether kbtab structure is attached to the interface; if it isn't and we are called we have much bigger problems. Also no need to call usb_kill_urb() in kbtab_disconnect() since it is being called in kbtab_close(). Signed-off-by: Dmitry Torokhov commit ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418 Author: Axel Lin Date: Tue Apr 20 21:59:51 2010 -0700 Input: kbtab - fix incorrect size parameter in usb_buffer_free The size allocated by usb_buffer_alloc() is 8, however the size passed to usb_buffer_free() is 10. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 893d1cdd53d8a748245dbfab62f4bf220316761d Author: Dmitry Torokhov Date: Tue Apr 20 22:30:25 2010 -0700 Input: acecad - don't advertise mouse events The device does not emit events for left/right/middle mouse buttons so it should not mark them as supported in capabilities bitmaps. Signed-off-by: Dmitry Torokhov commit b426571ceab9fbdd50be33a4cb379a119c6028a2 Author: Dmitry Torokhov Date: Tue Apr 20 22:30:22 2010 -0700 Input: acecad - fix some formatting issues Also switch to using input_set_abd_params() helper. Signed-off-by: Dmitry Torokhov commit 5492f6f801c81c9663417cd8e48e759775977c83 Author: Dmitry Torokhov Date: Tue Apr 20 22:20:37 2010 -0700 Input: acecad - simplify usb_acecad_disconnect() There is no need to check whether acecad structure is attached to the interface; if it isn't and we are called we have much bigger problems. Also no need to call usb_kill_urb() in usb_acecad_disconnect() since it is being called in usb_acecad_close(). Signed-off-by: Dmitry Torokhov commit 2ef2ed597669f5e120d0c51c295f00e34b2f0801 Author: Axel Lin Date: Tue Apr 20 21:53:11 2010 -0700 Input: acecad - fix incorrect size parameter in usb_buffer_free The size allocated by usb_buffer_alloc() is 8, however the size passed to usb_buffer_free() in usb_acecad_disconnect() is 10. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit f19159dc5ab9ec28c3b8230689101335d98e2d68 Author: Steve French Date: Wed Apr 21 04:12:10 2010 +0000 [CIFS] Cleanup various minor breakage in previous cFYI cleanup Signed-off-by: Steve French commit b6b38f704a8193daba520493ebdaf7e819962fc8 Author: Joe Perches Date: Wed Apr 21 03:50:45 2010 +0000 [CIFS] Neaten cERROR and cFYI macros, reduce text space Neaten cERROR and cFYI macros, reduce text space ~2.5K Convert '__FILE__ ": " fmt' to '"%s: " fmt', __FILE__' to save text space Surround macros with do {} while Add parentheses to macros Make statement expression macro from macro with assign Remove now unnecessary parentheses from cFYI and cERROR uses defconfig with CIFS support old $ size fs/cifs/built-in.o text data bss dec hex filename 156012 1760 148 157920 268e0 fs/cifs/built-in.o defconfig with CIFS support old $ size fs/cifs/built-in.o text data bss dec hex filename 153508 1760 148 155416 25f18 fs/cifs/built-in.o allyesconfig old: $ size fs/cifs/built-in.o text data bss dec hex filename 309138 3864 74824 387826 5eaf2 fs/cifs/built-in.o allyesconfig new $ size fs/cifs/built-in.o text data bss dec hex filename 305655 3864 74824 384343 5dd57 fs/cifs/built-in.o Signed-off-by: Joe Perches Signed-off-by: Steve French commit 3366e3585fbf0d40ce6f2382b544851cf4df1654 Author: Paul Mundt Date: Tue Mar 30 12:38:01 2010 +0900 sh: Move platform smp ops in to their own structure. This cribs the MIPS plat_smp_ops approach for wrapping up the platform ops. This will allow for mixing and matching different ops on the same platform in the future. Signed-off-by: Paul Mundt commit 4a6feab0ee5240c4bd5378d9f8a46b85718c68a7 Author: Paul Mundt Date: Wed Apr 21 12:20:42 2010 +0900 sh: __cpuinit annotate the CPU init path. All of the regular CPU init path needs to be __cpuinit annotated for CPU hotplug. Signed-off-by: Paul Mundt commit 315e995c63a15cb4d4efdbfd70fe2db191917f7a Author: Nick Piggin Date: Wed Apr 21 03:18:28 2010 +0000 [CIFS] use add_to_page_cache_lru add_to_page_cache_lru is exported, so it should be used. Benefits over using a private pagevec: neater code, 128 bytes fewer stack used, percpu lru ordering is preserved, and finally don't need to flush pagevec before returning so batching may be shared with other LRU insertions. Signed-off-by: Nick Piggin Reviewed-by: Dave Kleikamp Signed-off-by: Steve French commit a9079ca0cb15feda15e7a380092e02d5cd834148 Author: Paul Mundt Date: Wed Apr 21 12:01:06 2010 +0900 sh: Tidy CPU probing and fixup section annotations. This does a detect_cpu_and_cache_system() -> cpu_probe() rename, tidies up the unused return value, and stuffs it under __cpuinit in preparation for CPU hotplug. Signed-off-by: Paul Mundt commit 3bd16668872b5ad0afb22f15ef6c800a8faf7532 Author: Paul Mundt Date: Wed Apr 21 11:38:04 2010 +0900 sh: hw-breakpoints: Kill off stub unthrottle callback. This follows the x86 change and kills off the unthrottle stub. As the x86 change killed off the generic callback it isn't used anymore anyways. Signed-off-by: Paul Mundt commit 0eae88f31ca2b88911ce843452054139e028771f Author: Eric Dumazet Date: Tue Apr 20 19:06:52 2010 -0700 net: Fix various endianness glitches Sparse can help us find endianness bugs, but we need to make some cleanups to be able to more easily spot real bugs. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cb903bf4ee2d6e53210e2174d363e10698112042 Author: David S. Miller Date: Tue Apr 20 18:49:45 2010 -0700 tg3: Enable GRO by default. This was merely an oversight when I added the *_gro_receive() calls. Signed-off-by: David S. Miller commit e4fc9d15db72c8de7d4988e9f419b63b923e1d1d Author: David S. Miller Date: Tue Apr 20 18:44:52 2010 -0700 niu: Enable GRO by default. This was merely an oversight when I added the napi_gro_receive() calls. Signed-off-by: David S. Miller commit 34c111f626e91adb23f90a91d2c7cd4dac9fa4b1 Author: Eric Paris Date: Tue Apr 20 10:21:36 2010 -0400 IMA: drop the word integrity in the audit message integrity_audit_msg() uses "integrity:" in the audit message. This violates the (loosely defined) audit system requirements that everything be a key=value pair and it doesn't provide additional information. This can be obviously gleaned from the message type. Just drop it. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 2f1506cd82e0725ba00c7146a9a9b47824a5edcf Author: Eric Paris Date: Tue Apr 20 10:21:30 2010 -0400 IMA: use audit_log_untrusted_string rather than %s Convert all of the places IMA calls audit_log_format with %s into audit_log_untrusted_string(). This is going to cause them all to get quoted, but it should make audit log injection harder. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 7233e3ee22b1506723411fe437bcf69f678e8cdd Author: Eric Paris Date: Tue Apr 20 10:21:24 2010 -0400 IMA: handle comments in policy IMA policy load parser will reject any policies with a comment. This patch will allow the parser to just ignore lines which start with a #. This is not very robust. # can ONLY be used at the very beginning of a line. Inline comments are not allowed. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 28ef4002ec7b4be27f1110b83e255df8159c786a Author: Eric Paris Date: Tue Apr 20 10:21:18 2010 -0400 IMA: handle whitespace better IMA parser will fail if whitespace is used in any way other than a single space. Using a tab or even using 2 spaces in a row will result in a policy being rejected. This patch makes the kernel ignore whitespace a bit better. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit e9d393bf8660fbbbe00617015224342bac3ea6fc Author: Eric Paris Date: Tue Apr 20 10:21:13 2010 -0400 IMA: reject policies with unknown entries Currently the ima policy load code will print what it doesn't understand but really I think it should reject any policy it doesn't understand. This patch makes it so! Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit b9035b1fd7933c11e68dbbf49b530cc43bf1da65 Author: Eric Paris Date: Tue Apr 20 10:21:07 2010 -0400 IMA: set entry->action to UNKNOWN rather than hard coding ima_parse_rule currently sets entry->action = -1 and then later tests if (entry->action == UNKNOWN). It is true that UNKNOWN == -1 but actually setting it to UNKNOWN makes a lot more sense in case things change in the future. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 7b62e162129c3b28d51016774e0c7c57c710c452 Author: Eric Paris Date: Tue Apr 20 10:21:01 2010 -0400 IMA: do not allow the same rule to specify the same thing twice IMA will accept rules which specify things twice and will only pay attention to the last one. We should reject such rules. Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 6ccd045630054c99ba1bb35673db12cfcf1eea58 Author: Eric Paris Date: Tue Apr 20 10:20:54 2010 -0400 ima: handle multiple rules per write Currently IMA will only accept one rule per write(). This patch allows IMA to accept writes which contain multiple rules but only processes one rule per write. \n is used as the delimiter between rules. IMA will return a short write indicating that it only accepted up to the first \n. This allows simple userspace utilities like cat to be used to load an IMA policy instead of needing a special userspace utility that understood 'one write per rule' Signed-off-by: Eric Paris Acked-by: Mimi Zohar Signed-off-by: James Morris commit 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f Author: Jan Kiszka Date: Mon Apr 19 23:53:06 2010 +0200 UML: Fix compiler warning due to missing task_struct declaration We can't pull in linux/sched.h due to circular dependency, so just forward-declare the struct. This fixes the following warning: CC arch/um/sys-i386/elfcore.o In file included from /data/linux-2.6/include/linux/elf.h:8, from /data/linux-2.6/arch/um/sys-i386/elfcore.c:2: arch/um/sys-i386/asm/elf.h:78: warning: ‘struct task_struct’ declared inside parameter list arch/um/sys-i386/asm/elf.h:78: warning: its scope is only this definition or declaration, which is probably not what you want I guess not many people build against i386 hosts anymore, so this remained widely unnoticed. Signed-off-by: Jan Kiszka Signed-off-by: Jiri Kosina commit aa395145165cb06a0d0885221bbe0ce4a564391d Author: Eric Dumazet Date: Tue Apr 20 13:03:51 2010 +0000 net: sk_sleep() helper Define a new function to return the waitqueue of a "struct sock". static inline wait_queue_head_t *sk_sleep(struct sock *sk) { return sk->sk_sleep; } Change all read occurrences of sk_sleep by a call to this function. Needed for a future RCU conversion. sk_sleep wont be a field directly available. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a200005038955057063fc8ea82129ebc785df41c Author: Eric Paris Date: Tue Apr 20 10:29:42 2010 -0400 SELinux: return error codes on policy load failure policy load failure always return EINVAL even if the failure was for some other reason (usually ENOMEM). This patch passes error codes back up the stack where they will make their way to userspace. This might help in debugging future problems with policy load. Signed-off-by: Eric Paris Acked-by: Stephen Smalley Signed-off-by: James Morris commit c205d932530719d2a6ddb9152650e5bbe80c9400 Author: Chris Ball Date: Sun Jun 7 13:59:51 2009 -0400 viafb: Add 1200x900 DCON/LCD panel modes for OLPC XO-1.5 [jc: extensive merge conflict fixes] Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Chris Ball commit 1317824376482781200980c6f026ef576d7ed1dd Author: Jonathan Corbet Date: Sat Mar 27 13:08:23 2010 -0600 viafb: complete support for VX800/VX855 accelerated framebuffer This patch is a painful merge of change a90bab567ece3e915d0ccd55ab00c9bb333fa8c0 (viafb: Add support for 2D accelerated framebuffer on VX800/VX855) in the OLPC tree, originally by Harald Welte. Harald's changelog read: The VX800/VX820 and the VX855/VX875 chipsets have a different 2D acceleration engine called "M1". The M1 engine has some subtle (and some not-so-subtle) differences to the previous engines, so support for accelerated framebuffer on those chipsets was disabled so far. This merge tries to preserve Harald's changes in the framework of the much-changed 2.6.34 viafb code. Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Jonathan Corbet commit 107ea34db4560e6db41a9da90128ccc5e60f6b21 Author: Harald Welte Date: Wed May 20 01:36:03 2009 +0800 viafb: Determine type of 2D engine and store it in chip_info This will help us for the upcoming support for 2D acceleration using the M1 engine. [jc: fixed merge conflicts] Signed-off-by: Harald Welte commit f1b99aa9dbe908b2839885aa999d6e8512fe1040 Author: Jonathan Corbet Date: Fri Apr 9 14:06:16 2010 -0600 viafb: Unify duplicated set_bpp() code As suggested by Florian: make both mode-setting paths use the same code. Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Jonathan Corbet commit 9ca43cf41d014e12f4b25d4538f362d7513448dd Author: Jonathan Corbet Date: Sat Mar 27 12:14:52 2010 -0600 viafb: Retain GEMODE reserved bits Commit c3e25673843153ea75fda79a47cf12f10a25ca37 (viafb: 2D engine rewrite) changed the setting of the GEMODE register so that the reserved bits are no longer preserved. Fix that; at the same time, move this code to its own function and restore the use of symbolic constants. Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Jonathan Corbet commit 1b1f8cd299d3c5a90c2ec1c24c271a0b536e5891 Author: Jonathan Corbet Date: Fri Mar 26 15:45:39 2010 -0600 viafb: Unmap the frame buffer on initialization error This was part of Harald's "make viafb a first-class citizen using pci_driver" patch, but somehow got dropped when that patch went into mainline. Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Jonathan Corbet commit b72a5070c74f5ca9a45a03c2d625daab66d0a820 Author: Harald Welte Date: Tue May 19 15:50:58 2009 +0800 viafb: use proper pci config API This patch alters viafb to use the proper Linux in-kernel API to access PCI configuration space, rather than poking at I/O ports by itself. Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Harald Welte commit 109771a68bedda77606500dc14455eca92df6769 Author: Harald Welte Date: Tue May 19 17:12:58 2009 +0800 viafb: Fix various resource leaks during module_init() The current code executed from module_init() in viafb does not have proper error checking and [partial] resoure release paths in case an error happens half way through driver initialization. This patch adresses the most obvious of those issues, such as a leftover i2c bus if module_init (and thus module load) fails. [jc: fixed merge conflicts] [jc: also restored -ENOMEM return on ioremap() fail] Cc: Florian Tobias Schandinat Cc: ScottFang@viatech.com.cn Cc: JosephChan@via.com.tw Signed-off-by: Harald Welte commit ee839a2127a4f74505c5597966919ca57413f4de Author: Mark Brown Date: Tue Apr 20 13:57:08 2010 +0900 ASoC: Tone down debugging for WM8994 class W It's a little verbose during path changes. Signed-off-by: Mark Brown commit 7d48a6acbcf5325a2551e948bd1557a46dec4c76 Author: Mark Brown Date: Tue Apr 20 13:36:11 2010 +0900 ASoC: Set full range of WM8994 FLL Fratio values Use all the available Fratio values when configuring the WM8994 FLL, not just 0 and 3, following more complete characterisation of the device performance. Signed-off-by: Mark Brown commit 136ff2a272ad4bee33bf85f8c490ff8a2dd08f96 Author: Mark Brown Date: Tue Apr 20 12:56:18 2010 +0900 ASoC: Support FLL input clock selection on WM8994 The WM8994 FLL can be clocked from one of four inputs, the two MCLKs and the LRCLK and BCLK of the AIF associated with the FLL. Allow all four inputs to be used rather than defaulting to MCLK1. Signed-off-by: Mark Brown commit 4f6f22d7bef77dfb6b27eaed4240784339c546e6 Author: Phil Carmody Date: Wed Apr 14 17:03:13 2010 +0300 ASoC: da7210: Fencepost error in reg cache read An index equal to the array size may not be accessed. Signed-off-by: Phil Carmody Acked-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7bdfcaaff5de368a88a4f784f7283b66c17d051d Author: Juuso Oikarinen Date: Tue Apr 20 13:15:56 2010 +0300 mac80211: Fix ieee80211_sta_conn_mon_timer with hw connection monitoring When IEEE80211_HW_CONNECTION_MONITOR is configured by the driver, starting of ieee80211_sta_conn_mon_timer should be prevented, as it is then not needed. This is currently partially the case. As it seems, when a probe-response is received from the AP the timer is still restarted, thus restarting the host based connection keep-alive mechanism. These probe-responses happen at least when scanning while associated. Fix this by preventing starting of the ieee80211_sta_conn_mon_timer in the ieee80211_rx_mgmt_probe_resp function. Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 58b5190e740241b33fcd901855436aa5d0c5e087 Author: Felix Fietkau Date: Mon Apr 19 19:57:37 2010 +0200 ath9k: set the STBC flag in rate control if the peer supports it Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 074a8c0db255e79960593122b5458c9a9c0551fa Author: Felix Fietkau Date: Mon Apr 19 19:57:36 2010 +0200 ath9k: add support for Tx and Rx STBC Supported only for single stream rates by the hardware Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f79d9bad37cb1e7ef23d60b1dd0b7859957ced9e Author: Felix Fietkau Date: Mon Apr 19 19:57:35 2010 +0200 mac80211: add flags for STBC (Space-Time Block Coding) Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 3bb065a7420c90421d6bbea5f7cffe36bd79a048 Author: Felix Fietkau Date: Mon Apr 19 19:57:34 2010 +0200 ath9k: initialize the number of tx/rx streams correctly AR9300 based hardware can 3x3 MCS rates, this should be set in the HT capabilities. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c666387682faaec7d7b4a8afd30b0b6bc0816ddb Author: Felix Fietkau Date: Mon Apr 19 19:57:33 2010 +0200 ath9k: reduce the bits_per_symbol table size, support more streams Instead of increasing bits_per_symbol for supporting more streams, keep it single-stream only and multiply the values by the numer of streams. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0e668cde0d78fb1b5f1f5e9a4bf7f9900269c98e Author: Felix Fietkau Date: Mon Apr 19 19:57:32 2010 +0200 ath9k: update the ath_max_4ms_framelen table Include MCS0-31 and also add SGI for HT20. This makes it possible to support more different rate combinations with newer hardware. Based on a patch by Selvam. T. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7817e4ceb64a53c518bc45b02819e0e57a4c4d83 Author: Felix Fietkau Date: Mon Apr 19 19:57:31 2010 +0200 ath9k: update the MCS mask for MCS16 and above Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0a8cea844d93d5fd689140ac913acc5fdcf1fdb1 Author: Felix Fietkau Date: Mon Apr 19 19:57:30 2010 +0200 ath9k: clean up tx buffer handling Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c9c99e5e440013c420fd8ec41ee83e89909d5186 Author: Felix Fietkau Date: Mon Apr 19 19:57:29 2010 +0200 ath9k: check for specific rx stuck conditions and recover from them Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 80725f454e58937ad546103e6a141c46b0d65a1b Author: Stanislaw Gruszka Date: Tue Apr 20 08:16:37 2010 +0200 mac80211: document IEEE80211_CONF_CHANGE_QOS Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 55ee82b500551f80720de57a00d2990d56cf08a8 Author: Holger Schurig Date: Mon Apr 19 10:24:22 2010 +0200 ath5k: basic support for survey This adds the first element of survey data, the noise floor figure. Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 1289723ef238908ca8d95ff48a46ee0de970f882 Author: Holger Schurig Date: Mon Apr 19 10:23:57 2010 +0200 mac80211: sample survey implementation for mac80211 & hwsim This adds the survey function to both mac80211 itself and to mac80211_hwsim. For the latter driver, we simply invent some noise level.A real driver which cannot determine the real channel noise MUST NOT report any noise, especially not a magically conjured one :-) Signed-off-by: Holger Schurig Signed-off-by: John W. Linville commit 03ceedea972a82d343fa5c2528b3952fa9e615d5 Author: Daniel Yingqiang Ma Date: Tue Apr 13 15:12:07 2010 +0800 ath9k: Group Key fix for VAPs When I set up multiple VAPs with ath9k, I encountered an issue that the traffic may be lost after a while. The detailed phenomenon is 1. After a while the clients connected to one of these VAPs will get into a state that no broadcast/multicast packets can be transfered successfully while the unicast packets can be transfered normally. 2. Minutes latter the unitcast packets transfer will fail as well, because the ARP entry is expired and it can't be freshed due to the broadcast trouble. It's caused by the group key overwritten and someone discussed this issue in ath9k-devel maillist before, but haven't work out a fix yet. I referred the method in madwifi, and made a patch for ath9k. The method is to set the high bit of the sender(AP)'s address, and associated that mac and the group key. It requires the hardware supports multicast frame key search. It seems true for AR9160. Not sure whether it's the correct way to fix this issue. But it seems to work in my test. The patch is attached, feel free to revise it. Signed-off-by: Daniel Yingqiang ma Signed-off-by: John W. Linville commit 0df6e9402e9f6f77b2d431f35ba0f8906b9ca8f3 Author: Jiri Kosina Date: Tue Apr 20 17:47:24 2010 +0200 UML: add kernel.h include to signal.c Commit 814f75ec5a94a48 ("UML: Drop private round_down definition") dropped the private round_down() macro and makes signal.c use the one from kernel.h instead. kernel.h is implicitly included through uaccess.h -> sched.h -> kernel.h but we'd rather make this dependency explicit. Signed-off-by: Jiri Kosina commit e4eb0450c5d61dd0064ef0904d74088d35284ae2 Author: Robert Moore Date: Thu Apr 8 14:57:43 2010 +0800 ACPICA: Update version to 20100331. Version 20100331. Signed-off-by: Robert Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 0f849d2cc6863c7874889ea60a871fb71399dd3f Author: Lin Ming Date: Tue Apr 6 14:52:37 2010 +0800 ACPICA: Minimize the differences between linux GPE code and ACPICA code base We have ported Rafael's major GPE changes (ACPI: Use GPE reference counting to support shared GPEs) into ACPICA code base. But the port and Rafael's original patch have some differences, so we made below patch to make linux GPE code consistent with ACPICA code base. Most changes are about comments and coding styles. Other noticeable changes are based on: Rafael: Reduce code duplication related to GPE lookup https://patchwork.kernel.org/patch/86237/ Rafael: Always use the same lock for GPE locking https://patchwork.kernel.org/patch/90471/ A new field gpe_count in struct acpi_gpe_block_info to record the number of individual GPEs in block. Rename acpi_ev_save_method_info to acpi_ev_match_gpe_method. Signed-off-by: Rafael J. Wysocki Signed-off-by: Robert Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit aa2110cb1a7510f9b834adfb39b05d4843a35d35 Author: Lin Ming Date: Thu Apr 8 14:34:27 2010 +0800 ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT Some BIOS on Toshiba machines corrupt the DSDT, so add a new boot option acpi=copy_dsdt to workaround it. Add warning message to ask users to use this option if corrupt DSDT detected. Also build a DMI blacklist to check it and automatically copy DSDT. https://bugzilla.kernel.org/show_bug.cgi?id=14679 Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 43323cb4c4b619414913f54fef9d492aabadd033 Author: Bob Moore Date: Wed Apr 7 11:05:11 2010 +0800 ACPICA: Update DSDT copy/detection. Move initialization of DSDT pointer. Emit address of DSDT in the dump of both table headers (good/bad DSDT). Now handles the case where the root table can be reallocated, which would invalidate the original pointer. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 69ec87efa815d69140423014bb5f91e034faac22 Author: Lin Ming Date: Thu Apr 1 11:14:12 2010 +0800 ACPICA: Add subsystem option to force copy of DSDT to local memory Optionally copy the entire DSDT to local memory (instead of simply mapping it.) There are some BIOSs that corrupt or replace the original DSDT, creating the need for this option. Default is FALSE, do not copy the DSDT. https://bugzilla.kernel.org/show_bug.cgi?id=14679 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 729df0f848daf2f17d02107199fa92efe909d995 Author: Lin Ming Date: Thu Apr 1 10:47:56 2010 +0800 ACPICA: Add detection of corrupted/replaced DSDT This change adds support to detect a DSDT that has been corrupted and/or replaced from outside the OS (by firmware). This is typically catastrophic for the system, but has been seen on some machines. https://bugzilla.kernel.org/show_bug.cgi?id=14679 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit c1637e9c649a0eb72c467041d78275aabdd48a41 Author: Bob Moore Date: Thu Apr 1 11:09:00 2010 +0800 ACPICA: Add write support for DataTable operation regions The original implementation only supported reading from a DataTable region. However, some machines have been seen that actually write to the ACPI table contained in such a region. This change adds support for writing to a DataTable region. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 333b04ae338e3421297d46c508f053a6767d2883 Author: Alexey Starikovskiy Date: Thu Apr 1 11:06:34 2010 +0800 ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy When copying the root table to the new allocation, the length used was incorrect. The new size was used instead of the current table size, meaning too much data was copied. Signed-off-by: Alexey Starikovskiy Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit a7499bc84eabb200f9dc23770a46d9a31b1e763a Author: Bob Moore Date: Thu Apr 1 11:04:54 2010 +0800 ACPICA: Update comments/headers, no functional change Also split some long lines. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 21e44ba85b0bc9ec970dd2ddb37966ef8c23ad24 Author: Bob Moore Date: Fri Mar 5 18:01:03 2010 +0800 ACPICA: Update version to 20100304 Version 20100304. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit e0f40281d52161dddeb1bc12879425266a53f26f Author: Lin Ming Date: Fri Mar 5 17:59:54 2010 +0800 ACPICA: Fix for possible fault in acpi_ex_release_mutex Fixed a problem with the AML Mutex handling function acpi_ex_release_mutex where the function could fault under the very rare condition when the interpreter has blocked, the interpreter lock is released, the interpreter is then reentered via the same thread, and attempts to acquire a mutex that was previously acquired. FreeBSD report 140979. http://www.freebsd.org/cgi/query-pr.cgi?pr=140979 Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit f6a22b0bc417042e83117f52ab1a03696af185ab Author: Bob Moore Date: Fri Mar 5 17:56:40 2010 +0800 ACPICA: Standardize integer output for ACPICA warnings/errors Always use 0x prefix for hex output, use %u for integer output (all integers are unsigned.) Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 0e264f0bc22207b99f33ee06e614186480682f15 Author: Bob Moore Date: Wed Mar 3 16:30:35 2010 +0800 ACPICA: Add support for MCHI table Disassembler and header file support for MCHI - Managment Controller Host Interface table. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 4cdf1a562bfb5852954aadbe8515557b8acc8168 Author: Lin Ming Date: Wed Mar 3 16:28:28 2010 +0800 ACPICA: Enhance configuration for output of AML Debug Object This change will enable debug object output via a global variable, acpi_gbl_enable_aml_debug_object. This will help with remote machine debugging. Also, moved all debug object support code to a new file, exdebug.c. Entire debug object module can now be configured out of the ACPICA build if desired. Signed-off-by: Lin Ming Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 40f0a5d0a16e68a68ab3d230f1ddd96c81cf5340 Author: Justin P. Mattock Date: Mon Apr 19 11:51:16 2010 -0700 Fix comment typo in percpu.h Fix a typo in arch/x86/include/asm/percpu.h Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 814f75ec5a94a4897fdfd605bf5ed4fa6f459c90 Author: Jan Kiszka Date: Mon Apr 19 23:53:05 2010 +0200 UML: Drop private round_down definition Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case. Signed-off-by: Jan Kiszka Signed-off-by: Jiri Kosina commit 5156d0118bb66f0a296b8059afb061c7ae4fda9d Author: Jan Kiszka Date: Mon Apr 19 23:53:08 2010 +0200 UML: Clean up asm/system.h Remove duplicates and unused prototypes. Signed-off-by: Jan Kiszka Acked-by: WANG Cong Signed-off-by: Jiri Kosina commit 1896950b6138a2a82771780d4dbd5a5d940d4739 Author: Jan Kiszka Date: Mon Apr 19 23:53:04 2010 +0200 UML: Remove unused variable from line driver Signed-off-by: Jan Kiszka Acked-by: WANG Cong Signed-off-by: Jiri Kosina commit 6c79bf0f2440fd250c8fce8d9b82fcf03d4e8350 Author: Bart De Schuymer Date: Tue Apr 20 16:22:01 2010 +0200 netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPPoE traffic The MTU for IP traffic encapsulated inside PPPoE traffic is smaller than the MTU of the Ethernet device (1500). Connection tracking gathers all IP packets and sometimes will refragment them in ip_fragment(). We then need to subtract the length of the encapsulating header from the mtu used in ip_fragment(). The check in br_nf_dev_queue_xmit() which determines if ip_fragment() has to be called is also updated for the PPPoE-encapsulated packets. nf_bridge_copy_header() is also updated to make sure the PPPoE data length field has the correct value. Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit 62910554656cdcd6b6f84a5154c4155aae4ca231 Merge: 22265a5 ab93047 Author: Patrick McHardy Date: Tue Apr 20 16:02:01 2010 +0200 Merge branch 'master' of /repos/git/net-next-2.6 Conflicts: Documentation/feature-removal-schedule.txt net/ipv6/netfilter/ip6t_REJECT.c net/netfilter/xt_limit.c Signed-off-by: Patrick McHardy commit 22265a5c3c103cf8c50be62e6c90d045eb649e6d Author: Patrick McHardy Date: Tue Apr 20 15:07:32 2010 +0200 netfilter: xt_TEE: resolve oif using netdevice notifiers Replace the runtime oif name resolving by netdevice notifier based resolving. When an oif is given, a netdevice notifier is registered to resolve the name on NETDEV_REGISTER or NETDEV_CHANGE and unresolve it again on NETDEV_UNREGISTER or NETDEV_CHANGE to a different name. Signed-off-by: Patrick McHardy commit ab9304717f7624c41927f442e6b6d418b2d8b3e4 Author: Jiri Pirko Date: Tue Apr 20 01:45:37 2010 -0700 net: emphasize rtnl lock required in call_netdevice_notifiers Since netdev_chain is guarded by rtnl_lock, ASSERT_RTNL should be present here to make sure that all callers of call_netdevice_notifiers does the locking properly. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit b249dcb82d327e419d3cb45773b146ebb5faf419 Author: Eric Dumazet Date: Mon Apr 19 21:56:38 2010 +0000 rps: consistent rxhash In case we compute a software skb->rxhash, we can generate a consistent hash : Its value will be the same in both flow directions. This helps some workloads, like conntracking, since the same state needs to be accessed in both directions. tbench + RFS + this patch gives better results than tbench with default kernel configuration (no RPS, no RFS) Also fixed some sparse warnings. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e36fa2f7e92f25aab2e3d787dcfe3590817f19d3 Author: Eric Dumazet Date: Mon Apr 19 21:17:14 2010 +0000 rps: cleanups struct softnet_data holds many queues, so consistent use "sd" name instead of "queue" is better. Adds a rps_ipi_queued() helper to cleanup enqueue_to_backlog() Adds a _and_irq_disable suffix to net_rps_action() name, as David suggested. incr_input_queue_head() becomes input_queue_head_incr() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 88253e845996670f56635b054550fa45e1fec3d8 Author: Paul Mundt Date: Tue Apr 20 15:37:23 2010 +0900 sh: Zero out aliases counter when using SH-X3 hardware assistance. This zeroes out the number of cache aliases in the cache info descriptors when hardware alias avoidance is enabled. This cuts down on the amount of flushing taken care of by common code, and also permits coherency control to be disabled for the single CPU and 4k page size case. Signed-off-by: Paul Mundt commit d4a8ca246146099e9068fc87cd2bc565896bc186 Author: Takashi Iwai Date: Tue Apr 20 08:20:31 2010 +0200 ASoC: missing conversions to snd_soc_codec_*_drvdata() Conversions to snd_soc_codec_{get|set}_drvdata() were missing in some files in the previous commit. Signed-off-by: Takashi Iwai commit dcf46b9443ad48a227a61713adea001228925adf Author: Zhang, Yanmin Date: Tue Apr 20 10:13:58 2010 +0800 perf & kvm: Clean up some of the guest profiling callback API details Fix some build bug and programming style issues: - use valid C - fix up various style details Signed-off-by: Zhang Yanmin Cc: Avi Kivity Cc: Peter Zijlstra Cc: Sheng Yang Cc: Marcelo Tosatti Cc: oerg Roedel Cc: Jes Sorensen Cc: Gleb Natapov Cc: Zachary Amsden Cc: zhiteng.huang@intel.com Cc: tim.c.chen@intel.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <1271729638.2078.624.camel@ymzhang.sh.intel.com> Signed-off-by: Ingo Molnar commit 1d5cc550ede76825ab401941fb1165f2056e2c46 Author: Paul Mundt Date: Tue Apr 20 14:34:15 2010 +0900 sh: dwarf unwinder needs linux/module.h. Previously the struct module definition was pulled in from other headers, but we want the reference to be explicit. Fixes up randconfig build issues. Signed-off-by: Paul Mundt commit 6f262d8e1acb7b1605b811700326163fa707d355 Author: wzt.wzt@gmail.com Date: Mon Apr 19 09:16:17 2010 +0800 Security: Fix the comment of cap_file_mmap() In the comment of cap_file_mmap(), replace mmap_min_addr to be dac_mmap_min_addr. Signed-off-by: Zhitong Wang Acked-by: Eric Paris Signed-off-by: James Morris commit f5acb907dc24c3822f408211bad1cd6e5d0433cf Author: Eric Dumazet Date: Mon Apr 19 14:40:57 2010 -0700 rps: static functions store_rps_map() & store_rps_dev_flow_table_cnt() are static. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e8958330190c57c0d32bee88b64a12de2f58059f Author: Xose Vazquez Perez Date: Mon Apr 19 11:54:16 2010 +0200 wireless: rt2x00: rt2800usb: identify Allwin devices Applied common sense, no info from the manufacturer: (0x8516, 0x2070) is RT2070 (0x8516, 0x2770) is RT2770 (0x8516, 0x2870) is RT2870 [...] Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 67e0f392779e35a96c43bc240ef5d30a701d153e Author: Johannes Berg Date: Mon Apr 19 11:03:13 2010 +0200 mac80211: add missing newline One HT debugging printk is missing a newline, add it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 088899c43ce8bc54c6de519e4b1a1fc41b95867e Author: David Kilroy Date: Mon Apr 19 08:16:23 2010 +0100 orinoco: have sparse check endian issues Orinoco should be endian clean, so enable the checking. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 69c264de2ada18bd9da6c9f582a8babd3dcf5f18 Author: David Kilroy Date: Mon Apr 19 08:16:22 2010 +0100 orinoco: use cfg80211_find_ie Instead of using a local function. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit c3d415030c1a00cc21935c38f8761db46ef1d7ff Author: David Kilroy Date: Mon Apr 19 08:16:21 2010 +0100 orinoco: implement set_wiphy_params ... to set fragmentation and RTS thresholds. Also report RTS retry settings during wiphy init. Note that the existing semantics for enabling microwave robustness are preserved on firmwares that have it. Signed-off-by: David Kilroy Signed-off-by: John W. Linville commit 3393a608c4979a94d1887efc05b792849d361a65 Author: Juuso Oikarinen Date: Mon Apr 19 10:12:52 2010 +0300 mac80211: Prevent running sta_cleanup timer unnecessarily The sta_cleanup timer is used to periodically expire buffered frames from the tx buf. The timer is executing periodically, regardless of the need for it. This is wasting resources. Fix this simply by not restarting the sta_cleanup timer if the tx buffer was empty. Restart the timer when there is some more tx-traffic. Cc: Janne Ylälehto Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 2aab4c273ad837fbcf2955aee32b9ec4706c2521 Author: Johannes Berg Date: Mon Apr 19 11:00:24 2010 +0200 mac80211: fix stopping RX BA session from timer Kalle reported that his system deadlocks since my recent work in this area. The reason quickly became apparent: we try to cancel_timer_sync() a timer from within itself. Fix that by making the function aware of the context it is called from. Reported-by: Kalle Valo Signed-off-by: Johannes Berg Tested-by: Kalle Valo Signed-off-by: John W. Linville commit 93d95b12b3ba06e0e1f3e43a370ee61539d8cb90 Author: Daniel Halperin Date: Sun Apr 18 09:28:18 2010 -0700 mac80211: fix typo in comments The flag is called IEEE80211_TX_STAT_AMPDU rather than using the whole word STATUS. Signed-off-by: Daniel Halperin Signed-off-by: John W. Linville commit 76026660c3699a82d1df2d04f6dd81af01d9d19a Merge: 317a929 e7cb495 Author: John W. Linville Date: Mon Apr 19 16:37:59 2010 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 88751275b8e867d756e4f86ae92afe0232de129f Author: Eric Dumazet Date: Mon Apr 19 05:07:33 2010 +0000 rps: shortcut net_rps_action() net_rps_action() is a bit expensive on NR_CPUS=64..4096 kernels, even if RPS is not active. Tom Herbert used two bitmasks to hold information needed to send IPI, but a single LIFO list seems more appropriate. Move all RPS logic into net_rps_action() to cleanup net_rx_action() code (remove two ifdefs) Move rps_remote_softirq_cpus into softnet_data to share its first cache line, filling an existing hole. In a future patch, we could call net_rps_action() from process_backlog() to make sure we send IPI before handling this cpu backlog. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a03b1a5c95e8bcb07512122995bbf5bd3c39f2b9 Author: Vladislav Zolotarov Date: Mon Apr 19 01:15:17 2010 +0000 bnx2x: Date and version Set version to 1.52.53-1. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d9e8b185a9aef1553c26fcffc92b18db31f79e08 Author: Vladislav Zolotarov Date: Mon Apr 19 01:15:08 2010 +0000 bnx2x: Don't report link down if has been already down Author: Yaniv Rosner Signed-off-by: Yaniv Rosner Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d3dbfee0d5ee4690824cbc5685bc9fe47a12bb8b Author: Vladislav Zolotarov Date: Mon Apr 19 01:14:49 2010 +0000 bnx2x: Rework power state handling code Move "don't shut down the power" logic into bnx2x_set_power_state() to make the code cleaner. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8eb5a20ccc67d85d52ead88fb263eb28814ca2b4 Author: Vladislav Zolotarov Date: Mon Apr 19 01:14:37 2010 +0000 bnx2x: use mask in test_registers() to avoid parity error Properly mask the value to be written to the register (according to the register size) during the self-test. Otherwise immediate parity error would be generated. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 1ac218c83fbfc6bcdbef36b38f79d0ee08420285 Author: Vladislav Zolotarov Date: Mon Apr 19 01:14:18 2010 +0000 bnx2x: Fixed MSI-X enabling flow Try to enable less MSI-X vectors if initial request has failed. Author: Dmitry Kravkov Signed-off-by: Dmitry Kravkov Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit dea7aab1923a9ee81c5cafaa4bd47266abf30186 Author: Vladislav Zolotarov Date: Mon Apr 19 01:14:07 2010 +0000 bnx2x: Added new statistics Added total_mcast/bcast_pkts_transmitted statistics. Author: Dmitry Kravkov Signed-off-by: Dmitry Kravkov Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit cdaa7cb84b63e0491582ef62fd0c7bf22a57e519 Author: Vladislav Zolotarov Date: Mon Apr 19 01:13:57 2010 +0000 bnx2x: White spaces White spaces, code readability and prints. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2145a92057a94d2d1e3e9674fe03774cda7455ad Author: Vladislav Zolotarov Date: Mon Apr 19 01:13:49 2010 +0000 bnx2x: Protect code with NOMCP Don't run code that can't be run if MCP is not present. This will prevent NULL pointer dereferencing. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 02e3c6cb3f09ac10a1f16d16cf31c8ecaafd2c67 Author: Vladislav Zolotarov Date: Mon Apr 19 01:13:33 2010 +0000 bnx2x: Increase DMAE max write size for 57711 Increase DMAE max write size for 57711 to the maximum allowed value. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 34f24c7fc095a2d884e634ff430ab0da6f2a0669 Author: Vladislav Zolotarov Date: Mon Apr 19 01:13:23 2010 +0000 bnx2x: Use VPD-R V0 entry to display firmware revision Author: Dmitry Kravkov Signed-off-by: Dmitry Kravkov Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 72fd0718332e6514fb9db325e89ffc694bb31f6e Author: Vladislav Zolotarov Date: Mon Apr 19 01:13:12 2010 +0000 bnx2x: Parity errors handling for 57710 and 57711 This patch introduces the parity errors handling code for 57710 and 57711 chips. HW is configured to stop all DMA transactions to the host and sending packets to the network once parity error is detected, which is meant to prevent silent data corruption. At the same time HW generates the attention interrupt to every function of the device where parity has been detected so that driver can start the recovery flow. The recovery is actually resetting the chip and restarting the driver on all active functions of the chip where the parity error has been reported. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 3c4ab2aaa90826060b1e8d4036f9bb8325f8759e Author: J. Bruce Fields Date: Mon Apr 19 15:12:51 2010 -0400 nfsd4: indentation cleanup Looks like a put-and-paste mistake. Signed-off-by: J. Bruce Fields commit 5b775eb1c04c2ef33f5e17035e368214214ef9c2 Author: Jan Engelhardt Date: Mon Apr 19 16:07:47 2010 +0200 netfilter: xtables: remove old comments about reentrancy Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit cd58bcd9787ef4c16ab6e442c4f1bf3539b3ab39 Author: Jan Engelhardt Date: Mon Apr 19 16:06:52 2010 +0200 netfilter: xt_TEE: have cloned packet travel through Xtables too Since Xtables is now reentrant/nestable, the cloned packet can also go through Xtables and be subject to rules itself. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit f3c5c1bfd430858d3a05436f82c51e53104feb6b Author: Jan Engelhardt Date: Mon Apr 19 16:05:10 2010 +0200 netfilter: xtables: make ip_tables reentrant Currently, the table traverser stores return addresses in the ruleset itself (struct ip6t_entry->comefrom). This has a well-known drawback: the jumpstack is overwritten on reentry, making it necessary for targets to return absolute verdicts. Also, the ruleset (which might be heavy memory-wise) needs to be replicated for each CPU that can possibly invoke ip6t_do_table. This patch decouples the jumpstack from struct ip6t_entry and instead puts it into xt_table_info. Not being restricted by 'comefrom' anymore, we can set up a stack as needed. By default, there is room allocated for two entries into the traverser. arp_tables is not touched though, because there is just one/two modules and further patches seek to collapse the table traverser anyhow. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit e281b19897dc21c1071802808d461627d747a877 Author: Jan Engelhardt Date: Mon Apr 19 14:17:47 2010 +0200 netfilter: xtables: inclusion of xt_TEE xt_TEE can be used to clone and reroute a packet. This can for example be used to copy traffic at a router for logging purposes to another dedicated machine. References: http://www.gossamer-threads.com/lists/iptables/devel/68781 Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit a1645ce12adb6c9cc9e19d7695466204e3f017fe Author: Zhang, Yanmin Date: Mon Apr 19 13:32:50 2010 +0800 perf: 'perf kvm' tool for monitoring guest performance from host Here is the patch of userspace perf tool. Signed-off-by: Zhang Yanmin Signed-off-by: Avi Kivity commit ff9d07a0e7ce756a183e7c2e483aec452ee6b574 Author: Zhang, Yanmin Date: Mon Apr 19 13:32:45 2010 +0800 KVM: Implement perf callbacks for guest sampling Below patch implements the perf_guest_info_callbacks on kvm. Signed-off-by: Zhang Yanmin Signed-off-by: Avi Kivity commit 39447b386c846bbf1c56f6403c5282837486200f Author: Zhang, Yanmin Date: Mon Apr 19 13:32:41 2010 +0800 perf: Enhance perf to allow for guest statistic collection from host Below patch introduces perf_guest_info_callbacks and related register/unregister functions. Add more PERF_RECORD_MISC_XXX bits meaning guest kernel and guest user space. Signed-off-by: Zhang Yanmin Signed-off-by: Avi Kivity commit 3cf6fa1e334a3a4af702f92229690195018b747f Author: Paul Mundt Date: Mon Apr 19 17:27:17 2010 +0900 sh: Enable SH-X3 hardware synonym avoidance handling. This enables support for the hardware synonym avoidance handling on SH-X3 CPUs for the case where dcache aliases are possible. icache handling is retained, but we flip on broadcasting of the block invalidations due to the lack of coherency otherwise on SMP. Signed-off-by: Paul Mundt commit d9c944463d8f3f7cafaaba8f3e44df62ce817484 Author: Paul Mundt Date: Mon Apr 19 16:27:47 2010 +0900 sh: mach-sdk7786: pm_power_off support. This wires up power-off support for the SDK7786 board. Signed-off-by: Paul Mundt commit fc6055a5ba31e2c14e36e8939f9bf2b6d586a7f5 Author: Eric Dumazet Date: Fri Apr 16 12:18:22 2010 +0000 net: Introduce skb_orphan_try() Transmitted skb might be attached to a socket and a destructor, for memory accounting purposes. Traditionally, this destructor is called at tx completion time, when skb is freed. When tx completion is performed by another cpu than the sender, this forces some cache lines to change ownership. XPS was an attempt to give tx completion to initial cpu. David idea is to call destructor right before giving skb to device (call to ndo_start_xmit()). Because device queues are usually small, orphaning skb before tx completion is not a big deal. Some drivers already do this, we could do it in upper level. There is one known exception to this early orphaning, called tx timestamping. It needs to keep a reference to socket until device can give a hardware or software timestamp. This patch adds a skb_orphan_try() helper, to centralize all exceptions to early orphaning in one spot, and use it in dev_hard_start_xmit(). "tbench 16" results on a Nehalem machine (2 X5570 @ 2.93GHz) before: Throughput 4428.9 MB/sec 16 procs after: Throughput 4448.14 MB/sec 16 procs UDP should get even better results, its destructor being more complex, since SOCK_USE_WRITE_QUEUE is not set (four atomic ops instead of one) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9958da0501fced47c1ac5c5a3a7731c87e45472c Author: Eric Dumazet Date: Sat Apr 17 04:17:02 2010 +0000 net: remove time limit in process_backlog() - There is no point to enforce a time limit in process_backlog(), since other napi instances dont follow same rule. We can exit after only one packet processed... The normal quota of 64 packets per napi instance should be the norm, and net_rx_action() already has its own time limit. Note : /proc/net/core/dev_weight can be used to tune this 64 default value. - Use DEFINE_PER_CPU_ALIGNED for softnet_data definition. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a289cc7c70da784a2d370b91885cab4f966dcb0f Author: Randy Dunlap Date: Fri Apr 16 17:51:42 2010 -0700 x86, UV: uv_irq.c: Fix all sparse warnings Fix all sparse warnings in building uv_irq.c. arch/x86/kernel/uv_irq.c:46:17: warning: symbol 'uv_irq_chip' was not declared. Should it be static? arch/x86/kernel/uv_irq.c:143:50: error: no identifier for function argument arch/x86/kernel/uv_irq.c:162:13: error: typename in expression arch/x86/kernel/uv_irq.c:162:13: error: undefined identifier 'restrict' arch/x86/kernel/uv_irq.c:250:44: error: no identifier for function argument arch/x86/kernel/uv_irq.c:260:17: error: typename in expression arch/x86/kernel/uv_irq.c:260:17: error: undefined identifier 'restrict' arch/x86/kernel/uv_irq.c:233:50: warning: incorrect type in argument 3 (different signedness) arch/x86/kernel/uv_irq.c:233:50: expected int *pnode arch/x86/kernel/uv_irq.c:233:50: got unsigned int * arch/x86/include/asm/uv/uv_hub.h:318:44: warning: incorrect type in argument 2 (different address spaces) arch/x86/include/asm/uv/uv_hub.h:318:44: expected void volatile [noderef] *addr arch/x86/include/asm/uv/uv_hub.h:318:44: got unsigned long * Signed-off-by: Randy Dunlap Cc: Dimitri Sivanich Cc: Russ Anderson Cc: Robin Holt Cc: Mike Travis Cc: Cliff Wickman Cc: Jack Steiner LKML-Reference: <20100416175142.f4b59683.randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar commit 8770acf0494ae06de6abd34f951a436f8f15d1de Author: Eric Dumazet Date: Sat Apr 17 00:54:36 2010 -0700 rps: rps_sock_flow_table is mostly read Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 408b79bcc32d7221a4975771ab6bff3d3173d530 Author: J. Bruce Fields Date: Thu Apr 15 15:11:09 2010 -0400 nfsd4: consistent session flag setting We should clear these flags on any new create_session, not just on the first one. Signed-off-by: J. Bruce Fields commit b2c812e22de88bb79c290c0e718280f10b64a48d Author: Mark Brown Date: Wed Apr 14 15:35:19 2010 +0900 ASoC: Add indirection for CODEC private data One of the features of the multi CODEC work is that it embeds a struct device in the CODEC to provide diagnostics via a sysfs class rather than via the device tree, at which point it's much better to use the struct device private data rather than having two places to store it. Provide an accessor function to allow this change to be made more easily, and update all the CODEC drivers are updated. To ensure use of the accessor the private data structure member is renamed, meaning that if code developed with older an older core that still uses private_data is merged it will fail to build. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 890c681275ab02623de1187f2d97fc355d76f372 Merge: d21e0f4 8392609 Author: Mark Brown Date: Sat Apr 17 10:45:54 2010 +0900 Merge branch 'for-2.6.34' into for-2.6.35 commit fec5e652e58fa6017b2c9e06466cb2a6538de5b4 Author: Tom Herbert Date: Fri Apr 16 16:01:27 2010 -0700 rfs: Receive Flow Steering This patch implements receive flow steering (RFS). RFS steers received packets for layer 3 and 4 processing to the CPU where the application for the corresponding flow is running. RFS is an extension of Receive Packet Steering (RPS). The basic idea of RFS is that when an application calls recvmsg (or sendmsg) the application's running CPU is stored in a hash table that is indexed by the connection's rxhash which is stored in the socket structure. The rxhash is passed in skb's received on the connection from netif_receive_skb. For each received packet, the associated rxhash is used to look up the CPU in the hash table, if a valid CPU is set then the packet is steered to that CPU using the RPS mechanisms. The convolution of the simple approach is that it would potentially allow OOO packets. If threads are thrashing around CPUs or multiple threads are trying to read from the same sockets, a quickly changing CPU value in the hash table could cause rampant OOO packets-- we consider this a non-starter. To avoid OOO packets, this solution implements two types of hash tables: rps_sock_flow_table and rps_dev_flow_table. rps_sock_table is a global hash table. Each entry is just a CPU number and it is populated in recvmsg and sendmsg as described above. This table contains the "desired" CPUs for flows. rps_dev_flow_table is specific to each device queue. Each entry contains a CPU and a tail queue counter. The CPU is the "current" CPU for a matching flow. The tail queue counter holds the value of a tail queue counter for the associated CPU's backlog queue at the time of last enqueue for a flow matching the entry. Each backlog queue has a queue head counter which is incremented on dequeue, and so a queue tail counter is computed as queue head count + queue length. When a packet is enqueued on a backlog queue, the current value of the queue tail counter is saved in the hash entry of the rps_dev_flow_table. And now the trick: when selecting the CPU for RPS (get_rps_cpu) the rps_sock_flow table and the rps_dev_flow table for the RX queue are consulted. When the desired CPU for the flow (found in the rps_sock_flow table) does not match the current CPU (found in the rps_dev_flow table), the current CPU is changed to the desired CPU if one of the following is true: - The current CPU is unset (equal to RPS_NO_CPU) - Current CPU is offline - The current CPU's queue head counter >= queue tail counter in the rps_dev_flow table. This checks if the queue tail has advanced beyond the last packet that was enqueued using this table entry. This guarantees that all packets queued using this entry have been dequeued, thus preserving in order delivery. Making each queue have its own rps_dev_flow table has two advantages: 1) the tail queue counters will be written on each receive, so keeping the table local to interrupting CPU s good for locality. 2) this allows lockless access to the table-- the CPU number and queue tail counter need to be accessed together under mutual exclusion from netif_receive_skb, we assume that this is only called from device napi_poll which is non-reentrant. This patch implements RFS for TCP and connected UDP sockets. It should be usable for other flow oriented protocols. There are two configuration parameters for RFS. The "rps_flow_entries" kernel init parameter sets the number of entries in the rps_sock_flow_table, the per rxqueue sysfs entry "rps_flow_cnt" contains the number of entries in the rps_dev_flow table for the rxqueue. Both are rounded to power of two. The obvious benefit of RFS (over just RPS) is that it achieves CPU locality between the receive processing for a flow and the applications processing; this can result in increased performance (higher pps, lower latency). The benefits of RFS are dependent on cache hierarchy, application load, and other factors. On simple benchmarks, we don't necessarily see improvement and sometimes see degradation. However, for more complex benchmarks and for applications where cache pressure is much higher this technique seems to perform very well. 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. The RPC test is an request/response test similar in structure to netperf RR test ith 100 threads on each host, but does more work in userspace that netperf. e1000e on 8 core Intel No RFS or RPS 104K tps at 30% CPU No RFS (best RPS config): 290K tps at 63% CPU RFS 303K tps at 61% CPU RPC test tps CPU% 50/90/99% usec latency Latency StdDev No RFS/RPS 103K 48% 757/900/3185 4472.35 RPS only: 174K 73% 415/993/2468 491.66 RFS 223K 73% 379/651/1382 315.61 Signed-off-by: Tom Herbert Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e7cb49550eb25f2e551d7d7f3bb71560df83680c Author: Johannes Berg Date: Tue Apr 13 01:04:35 2010 -0700 iwlwifi: make scan antenna forcing more generic Some future hardware will also require some antenna overrides so make the current logic more generic; right now it is semantically based on a workaround for off-channel reception but the reasons for the new antenna overrides will be different. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit ee102603c04d84d3079e3d593d88d5254085efa0 Author: Johannes Berg Date: Tue Apr 13 01:04:34 2010 -0700 iwlwifi: remove monitor check Off-channel reception is acceptable in monitor mode, and checking for monitor mode this way is not really correct anyway since it could be the case while operating. Now iwl_is_monitor_mode() is no longer used so remove it completely. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit fa58b6a3b34944bb9fc0129ba2534bd91d082d61 Author: Johannes Berg Date: Tue Apr 13 01:04:33 2010 -0700 iwlwifi: don't check monitor for scanning Monitor mode operation need not (and probably should not) affect scanning this way since real monitoring can not properly happen while scanning anyway. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit b2e8690d5a4d1868ee12f50aa00c138bec985b3c Author: Johannes Berg Date: Tue Apr 13 01:04:32 2010 -0700 iwlwifi: rename TX_CMD_FLG_BT_DIS_MSK The flag name is a little misleading, this flag instructs the device to ignore bluetooth messages for purposes of frame transmissions, so rename the flag to TX_CMD_FLG_IGNORE_BT. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 65b52bde687b609dc9cfc63eaf31da24b4f5663a Author: Johannes Berg Date: Tue Apr 13 01:04:31 2010 -0700 iwlwifi: make BT coex config a virtual method Some future hardware will require a different command to be sent for bluetooth coexist, so make this a virtual method that can be changed on a per-device basis. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit f4388adc92464397bb08a62c62c98b3b654bccc2 Author: Wey-Yi Guy Date: Mon Apr 12 18:32:11 2010 -0700 iwlwifi: more code clean up for agn devices Since multiple new devices having similar uCode architecture and use same registers address, remove more reference to 5000 series to eliminate the confusion. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 82ca9341763107615a15da6e59b9535d49eb91c3 Author: Wey-Yi Guy Date: Mon Apr 12 14:02:36 2010 -0700 iwlwifi: sanity check for turn on aggregation tid Perform sanity check for turn on aggregation tid. Also remove the option for turn on all the aggregation tids at once since it is deprecated function and not being used. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 33e6f816105b5cfaafbbf42682807cc317e87cb5 Author: Wey-Yi Guy Date: Fri Apr 9 09:36:11 2010 -0700 iwlwifi: PA type for 6000g2 series For 6000g2 series of NICs, PA type is determined by uCode, driver do not have to set the register for internal/external PA. It is a workaround just for 6000 series NICs. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 1780221141047c83c99f9d02b504700080cc35c9 Author: Wey-Yi Guy Date: Fri Apr 9 09:12:56 2010 -0700 iwlwifi: add hw revision for 6000g2 NIC Add hardware revision for 6000g2 series of NIC Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit c8d5420d958e2ed0945d89d5cc20369310b0559b Author: Shanyu Zhao Date: Thu Apr 8 19:03:55 2010 -0700 iwlwifi: remove redundant iwl_dump_lq_cmd() This function is called twice in a row, remove the second one. Signed-off-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit b8c76267cfb9a025afdd122bc2a8942dbf493dd1 Author: Abhijeet Kolekar Date: Thu Apr 8 15:29:07 2010 -0700 iwlwifi: add debugfs ops to iwlwifi Seperate debugfs functions into iwlagn specific debugfs file and Add debugfs ops to iwlwifi. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit 69e72801224693bb520cf3ece5e6bf67f0448c96 Author: Wey-Yi Guy Date: Wed Apr 7 20:12:23 2010 -0700 iwlwifi: remove duplicated debug functions Use the show uCode statistics function for uCode debugging purposes only; it is being duplicated in both debugfs and sysfs. remove the one from sysfs. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 4b3e8062807822271e02aafc0432e9a2497cb46c Author: Shanyu Zhao Date: Wed Apr 7 18:06:36 2010 -0700 iwlwifi: bring up 6000 Series 2x2 AGN Gen2 adapters This patch is to bring up 6000 Series 2x2 AGN Gen2 adapters. Seperate various version numbers from 6000 Series definitions; Add module firmware declaration for the new adapters; Add additional device IDs and subsystem IDs; Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 7944f8e4acbb76bc8fde64dbffef43d2c8b5d053 Author: Wey-Yi Guy Date: Tue Apr 6 21:10:33 2010 -0700 iwlwifi: more generic eeprom defines Some definition for eeprom apply to more than 5000 series device, change the name to reflect it for easy reading. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit b6e4c55aaee4fd40526a6816e60c68dd62e565c4 Author: Johannes Berg Date: Tue Apr 6 04:12:42 2010 -0700 iwlwifi: trigger scan synchronously Scan requesting doesn't need to be asynchronous since all code paths leading up to it can sleep. Make the scan request a new util operation that is hw-specific (to account for 3945 vs. agn) and call it right in place. This patch moves a lot of code into iwlagn as it need not be in iwlcore. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 811ecc995b18eb58067ffa75b961ece3b84a1f03 Author: Johannes Berg Date: Tue Apr 6 04:12:41 2010 -0700 iwlwifi: rename priv->scan to priv->scan_cmd I keep checking what "priv->scan" is, so rename it to "priv->scan_cmd" which more clearly tells us what it is. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit b165cf09c0248262232c7566df5ae40284cee7d6 Author: Johannes Berg Date: Tue Apr 6 04:12:40 2010 -0700 iwlwifi: remove scan_pass_start Since we no longer do a multi-pass scan, keeping track of how long each pass took is pointless since there will only be one. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 92ae80eec7ac642f249b7a2fc02f41441d128a62 Author: Johannes Berg Date: Tue Apr 6 04:12:39 2010 -0700 iwlwifi: remove next_scan_jiffies This logic is just confusing, if anything it belongs into mac80211. Also, even if we do scan during the EAPOL handshake, that will not cause any problems, just a short delay. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 6708dc863880777ffe5fc55c86bfd80f886f53d6 Author: Johannes Berg Date: Tue Apr 6 04:12:38 2010 -0700 iwlwifi: correct atomic bitops usage With atomic bitops, test_and_{set,clear}_bit should be used instead of separate test_bit and set_bit/clear_bit. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 00700ee007cf842ef2eb20201080ceddcfdaf9ad Author: Johannes Berg Date: Tue Apr 6 04:12:37 2010 -0700 iwlwifi: remove scan_bands logic Since mac80211 will now never request scanning multiple bands, we can remove all the associated logic and scan a single band only in each scan. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 3a23d69582fa4bfcb443631bcd3d0d2afcc19208 Author: Wey-Yi Guy Date: Sat Apr 3 16:44:39 2010 -0700 iwlwifi: set correct single/dual stream mask Even the initial single/dual stream values will be overridden later when issue link quality command; but still make sense not to use hard-code value during initialization. Single/Dual stream mask are used to indicate the best antenna for SISO/MIMO; different NIC has different tx antenna configuration; so the parameter need to based on the valid tx antenna. 1x2 device: single tx antenna available, only SISO is valid configuration, but still need to set up MIMO configuration, so set it up with antenna A & B as default. 2x2 device: two tx antenna available, dual_stream will use both valid antenna. 3x3 device: three tx antenna available, skip the first antenna and choice the second and third antenna for dual_stream. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 8715fa28fb4fad62f6004d276ec8e1aa5e664e76 Merge: a5e944f f2fa1b0 Author: Reinette Chatre Date: Fri Apr 16 13:43:40 2010 -0700 Merge branch 'wireless-2.6' into wireless-next-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-6000.c commit 317a929dcd39bceff93974dac5fbdafa9b2a33ac Author: Stanislaw Gruszka Date: Fri Apr 16 15:47:56 2010 +0200 iwlwifi: initialize iwl_wimax_coex_cmd.flags iwl_wimax_coex_cmd.flags can be really uninitialized, so fix that. Signed-off-by: Stanislaw Gruszka Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e Author: Stanislaw Gruszka Date: Fri Apr 16 15:46:41 2010 +0200 iwlwifi: check scan request ie_len In mac80211 we always check both scan_req->ie and scan_req->ie_len against zero before usage, in iwlwifi we should do the same. Remove not needed "left -= ie_len" while at it. Signed-off-by: Stanislaw Gruszka Acked-by: Reinette Chatre Signed-off-by: John W. Linville commit a02a2956809d88b42b9a1f8003d60a343353b5ea Author: Grazvydas Ignotas Date: Fri Apr 16 13:22:12 2010 +0300 wl1251: add support for dedicated IRQ line wl1251 has WLAN_IRQ pin for generating interrupts to host processor, which is mandatory in SPI mode and optional in SDIO mode (which can use SDIO interrupts instead). However TI recommends using deditated IRQ line for SDIO too. Add support for using dedicated interrupt line with SDIO, but also leave ability to switch to SDIO interrupts in case it's needed. Signed-off-by: Grazvydas Ignotas Reviewed-by: Bob Copeland Signed-off-by: John W. Linville commit 7f1f5a0060e377ff6a15903487b39223e12b8568 Author: Sujith Date: Fri Apr 16 11:54:03 2010 +0530 ath9k_htc: Fix sparse endian warnings This patch fixes a bunch of endian issues that were exposed by sparse. It's a miracle that the driver worked at all till now. The Lord be praised. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 6ce34ec11c6297562e70e27c57a24cd27d4cd2b1 Author: Sujith Date: Fri Apr 16 11:54:01 2010 +0530 ath9k_htc: Handle WMI timeouts properly If a WMI command has timed out for some reason, a late WMI response would end up updating the response region of a new WMI request that has been issued in the meantime. Fix this race condition by dropping a WMI response if a new WMI command has been issued. Signed-off-by: Sujith Signed-off-by: John W. Linville commit eac8e385e9446e591aacbc9ef2c2a3b0836dd2d4 Author: Sujith Date: Fri Apr 16 11:54:00 2010 +0530 ath9k_htc: Add dropped SKB count to debugfs Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0daa3e3a7d85d70cdd4d9cc8e589e79a4a37a5ef Author: Sujith Date: Fri Apr 16 11:53:58 2010 +0530 ath9k_htc: Remove GPIO set on unload There is no point in trying to set the LED pin when the module is being unloaded. The target would be reset anyway. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 7d0d0df0eca695c83a08dc386824a9d1d7c526a4 Author: Sujith Date: Fri Apr 16 11:53:57 2010 +0530 ath9k_hw: Use buffered register writes This patch adds macros at certain places which could be optimized for multiple register writes. The performance of ath9k_htc improves considerably, especially reducing the latency involved in a scan run. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 6819d57f07440a8f9540967d9212a70e9c98eceb Author: Sujith Date: Fri Apr 16 11:53:56 2010 +0530 ath9k_hw: Relocate Opmode initialization Programming the opmode in the HW can be done before the assoc_id and STA_ID registers are setup. This helps ath9k_htc when multiple register writes are used. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 20b3efd979c0d5d9fdf497a98668a806266a63e4 Author: Sujith Date: Fri Apr 16 11:53:55 2010 +0530 ath9k_hw: Add macros for multiple register writes Signed-off-by: Sujith Signed-off-by: John W. Linville commit 4a22fe108e62367c10c3abeb469d6972ba3299f5 Author: Sujith Date: Fri Apr 16 11:53:53 2010 +0530 ath9k_htc: Implement multiple register write support This patch adds support for writing multiple registers in a single USB command. Specific calls from the HW code that performs multiple register writes would be modified to make use of this in subsequent patches. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 50f56316aed044e42c1bcd7572926e80aac9af46 Author: Sujith Date: Fri Apr 16 11:53:50 2010 +0530 ath: Add buffered register write operations This is required to implement delayed/buffered register writes in ath9k_htc. Signed-off-by: Sujith Signed-off-by: John W. Linville commit fcb9392ff7ccb010818f3609420fd5416f6ca22e Author: Sujith Date: Fri Apr 16 11:53:48 2010 +0530 ath9k_htc: Cleanup beacon configuration This patch cleans up beacon configuration, removing a redundant interface type check and updating beacon interval in the correct place. Signed-off-by: Sujith Signed-off-by: John W. Linville commit e88402fbdd9c5dbbae7b16c575d4e0b9e9b6fd40 Author: Samuel Ortiz Date: Fri Apr 16 09:28:44 2010 +0800 iwmc3200wifi: check sparse endianness annotations Add -D__CHECK_ENDIAN__ to driver ccflags so that sparse will always check endianness by default. Signed-off-by: Samuel Ortiz Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 3c997e8849c5b982662f2a9b3e8cb64260382faa Author: Samuel Ortiz Date: Fri Apr 16 09:28:43 2010 +0800 iwmc3200wifi: Fix sparse warnings Signed-off-by: Samuel Ortiz Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 1c0fc65e6de4e941ff483df445e721d6edb1f84b Author: Benoit Papillault Date: Fri Apr 16 00:07:26 2010 +0200 ath5k/ath9k: Fix 64 bits TSF reads According to tests, both TSF lower and upper registers kept counting, so the higher part could have been updated after the lower part has been read, as shown in the following log where the upper part is read first and the lower part next. tsf = {00000003-fffffffd} tsf = {00000003-00000001} tsf = {00000004-0000000b} This patch corrects this by checking that the upper part has not been changed while the lower part was read. It has been tested in an IBSS network where artifical IBSS merges have been done in order to trigger hundreds of rollover for the TSF lower part. It follows the logic mentionned by Derek, with only 2 register reads needed at each additional steps instead of 3 (the minimum number of register reads is still 3). Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit 733f0ea4498a24db5b8ac048ef99983600f1eff9 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:42 2010 -0400 ath9k_hw: add the PCI ID for the first AR9300 device The first AR9003 hardware family device supported is the AR9300, which has the vendor:device id 168c:0030 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 9b9cc61c46822ced22bc09d9aaa9f0f1859719cb Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:41 2010 -0400 ath9k_hw: Abort rx if hw is not coming out of full sleep in reset Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit afe754d66fbde0a0c07d954d5f1ad36d10136c72 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:40 2010 -0400 ath9k: Enable TXOK and TXERR interrupts for TX EDMA Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit b0a3344834fcaf30e472ccc661c8842281453402 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:39 2010 -0400 ath9k: add LDPC support LDPC is enabled by the rate control if the its determined that the target peer supports LDPC. We would have already intersected the HT capabilities so if our peer supports LDPC so do we. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ce01805a226328228a885b4a6e4b632b4e73f8ee Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:38 2010 -0400 ath9k_hw: add LDPC support for AR9003 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0a56bd0ae3f84dbd63535205b18b1a736abaa920 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:37 2010 -0400 mac80211: add LDPC control flag LDPC will be enabled through the rate control algorithm for each buffer the the tx_info flags. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e5003249ae7165654e13fd4809caa346820547f5 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:36 2010 -0400 ath9k: Add Tx EDMA support Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit eb8232535bbeaf51f7c4826265ad96bf966829f3 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:35 2010 -0400 ath9k_hw: Compute pointer checksum over the link descriptor Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5088c2f1a2475546d9a79b515bde6d65b8681e51 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:34 2010 -0400 ath9k: Initialize and configure tx status for EDMA Also add a function to clean up tx status ring. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 4adfcdedd4e0c05c1b659da5f2b8bc4e2d4a86df Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:33 2010 -0400 ath9k: Setup appropriate tx desc for regular dma and edma Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3deb4da554c3ad9b059f51d19eebadf8525da4a4 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:32 2010 -0400 ath9k_hw: set cwmin and cwmax to 0 for for AR9003 upon txq reset Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 79de23751a79a1270e45559296256ecb3dd35e12 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:31 2010 -0400 ath9k_hw: enable CRC check of descriptors for AR9003 Enable CRC check on the descriptor fetched from host on AR9003 upon reseting the TX queue. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a9616f417eb0e529023c44dac61420f3df39d8f7 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:30 2010 -0400 ath9k: add RXLP and RXHP to debugfs counters Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 994089db034059f4b545ddef9fab466091894071 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:29 2010 -0400 ath9k_hw: Fill descriptor abstrations for AR9003 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit b622a720b45def8dce816244a83b82992da4fe20 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:28 2010 -0400 ath9k_hw: move AR9002 mac ops to its own file Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 744d402580f959072f6b805a98745837f185c8e0 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:27 2010 -0400 ath9k_hw: Add function to configure tx status ring buffer Also reset tx status ring suring chip reset. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit cc610ac0557b0ad0dcffdff1230cef28a970d755 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:26 2010 -0400 ath9k_hw: Define abstraction for tx desc access Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d8903a5361817bd96ceed212ad27a380e7ef4d8e Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:25 2010 -0400 ath9k: Load SW filtered NF values and start NF cal during full reset for AR9003 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 6c94fdc97a27bd681afeaf05d9101b3f9a06f986 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:24 2010 -0400 ath9k_hw: skip WEP aggregation enable code for AR9003 The AR9002 hardware code enables aggregation for WEP but mac80211 doesn't enable aggregation with WEP, and the AR9003 code family does not need this so skip it for now for AR9003 but leave the code and annotate we should eventually consider how to remove this in consideration for the HAL unification goals. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 78ec26778803abd4ebb105bb19c729100c829837 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:23 2010 -0400 ath9k_hw: skip asynch fifo enablement to AR9003 The asynch fifo code is specific to >= AR9287 so stuff it into the AR9002 hardware family code and skip it for AR9003 cards. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 57b32227cd7f1f81f4143d8bc82a5ffe37ab4df9 Author: Felix Fietkau Date: Thu Apr 15 17:39:22 2010 -0400 ath9k_hw: Update ath9k_hw_set_dma for AR9300 Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c14a85dad438ee2c3d0bec6f11295d3a6efd4127 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:21 2010 -0400 ath9k_hw: add TX/RX gain register initialization for AR9003 This is done depending on what the EEPROM settings indicates. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ec83903e67f9d1e8398568c77dc4fdd333531e96 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:20 2010 -0400 ath9k_hw: add the AR9300 SREV hw name print Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7f62a136910f70d9b412f48f764321ff20ce6f38 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:19 2010 -0400 ath9k_hw: Configure Tx interrupt mitigation timer Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit ebd5a14a450e31611696dfe96781a3b8915d835c Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:18 2010 -0400 ath9k_hw: move the RF claim stuff to AR9002 hardware family Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 57b98384e5450996300d77ece61739b58325a84f Author: Felix Fietkau Date: Thu Apr 15 17:39:17 2010 -0400 ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6c84ce08aaf5995afc7ff7b4c54069c2431fca87 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:16 2010 -0400 ath9k_hw: Fill get_isr() for AR9003 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 1547da37db9b56eb98eb0f33b84d49ab4e83e01e Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:15 2010 -0400 ath9k_hw: add OFDM spur mitigation for AR9003 We add this now as OFDM spur mitigation required accessing the EEPROM for the AR9003 devices. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 15c9ee7af8a3527a82013ea447da2d8c491aabfe Author: Senthil Balasubramanian Date: Thu Apr 15 17:39:14 2010 -0400 ath9k_hw: Implement AR9003 eeprom callbacks Signed-off-by: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 49101676b2f1a66e0043509423e876414c73b5aa Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:13 2010 -0400 ath9k_hw: restore mac address reading logic Once upon a time the AR_EEPROM_MAC macro was added to let us add a random attribute to the three 4-bytes of MAC addresses entries we read from the EEPROM. This was good while a random high-enough value was used which did not conflict with any of the already existing enum eeprom_param values. With AR9003 support the enums overlap and it means we either increment the random offset or just restore the reading logic to match what the HAL has. I choose to do the later to synchronize the logic on both code bases. This should fix reading the MAC address from the EEPROM on AR9003 hardware. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0b8f6f2b1b18c7a3cb70fbb44ab5f4883d59f738 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:12 2010 -0400 ath9k_hw: rename eep_AR9287_ops to eep_ar9287_ops Signed-off-by: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit df23acaa5d3239745805650e2f27a4252182c063 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:11 2010 -0400 ath9k_hw: complete AR9003 calibration This goes with some new shiny TX IQ calibration that AR9003 hardware family supports. Signed-off-by: Luis R. Rodriguez Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4b01931e3a3ca5ec49604e2b279b8b9dd42fbe4c Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:10 2010 -0400 ath9k_hw: fill in the callbacks for calibration for AR9003 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 77d6d39a77939e5ed7e2ec72a1c1dce828ee582e Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:09 2010 -0400 ath9k_hw: abstract loading noisefloor This is the last call on calib.c which acceses PHY stuff, with this change we calib.c is now generic between both all supported hardware families. Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 400b738678bf6f0b65a76a4ec2925473ba3e06ff Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:08 2010 -0400 ath9k_hw: abstract the AR_PHY_AGC_CONTROL register access This is so we can share routines which access this register on calib.c Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 668602404d7398d841681c5e23fd8a9a45e4bb30 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:07 2010 -0400 ath9k_hw: Initialize interrupt mask for AR9003 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 55e82df4be45305bfb5e7ecb877a349ed4da8ed2 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:39:06 2010 -0400 ath9k_hw: Abstract the routine which returns interrupt status Also move interrupt related code to mac.c Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 991312d88cb8844e3e1a1e57a72823802da36fcd Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:05 2010 -0400 ath9k_hw: move TX/RX gain INI stuff to its own hardware family code The AR9003 TX/RX gain is currently initialized with the other components, so for now AR9003 does not implment this callback, after hardware bring up we can test moving the TX/RX gain there as well and if it works well move them to its own callback as well. Since all INI stuff is now moved out hw.c no longer needs to include and touch any original INI headers/structs. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d8f492b7d9a4c1cfdac69ba18a81acbd86d1dc6e Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:04 2010 -0400 ath9k_hw: move the cck channel 14 INI to the AR9002 hw code This is specific to the AR9002 family only. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b3950e6a52b1d0279787ef44ba1efac2f3414260 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:03 2010 -0400 ath9k_hw: split the generic hardware code by hardware family Move out the generic hardware family code out into their own files, we have one for AR5008, AR9001, and AR9002 family (ar9002_hw.c) and another file for the new AR9003 hardware family (ar9003_hw.c). Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 204729fd182bd56180323d9293c31038dde32995 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:02 2010 -0400 ath9k_hw: add the config_pci_powersave AR9003 callback Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 590b7d2f10f4552e5b7570c84dc565d3cb7825c9 Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:01 2010 -0400 ath9k_hw: add the AR9003 ar9003_hw_init_cal callback Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 795f5e2ca672727a96bacf97075976cfe1249fcf Author: Luis R. Rodriguez Date: Thu Apr 15 17:39:00 2010 -0400 ath9k_hw: split calib code by hardware families Calibration code touches phy registers and since these change the calibration code needs to be abstracted. Noise floor calibration is the only thing remaining but since the remaining calls only touch the AR_PHY_AGC_CONTROL register we'll just define that register conditionally, that will be done separately. The goal is to remove the dependency of ar9002_phy.h on calib.c This also adds stubs to be filled for AR9003 calibration code. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0df13da4555320f6dc9b901fd5f22cf54065c708 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:59 2010 -0400 ath9k_hw: move the cal AR9100 calibration settings The calibration settings should go into the respective hardware family AR9002 calibration settings callback, ar9002_hw_init_cal_settings(). Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b43d59fb3e2977945df061e7c405679f31acb26e Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:58 2010 -0400 ath9k_hw: rename getNoiseFloorThresh() to ath9k_hw_loadnf() Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 37c3e8b9d7f2d689b0aca89a8ac4aa12476df633 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:57 2010 -0400 ath9k_hw: rename the PA calib routines to match their families Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit af6757e95efca3d5965a7d3d087190bef99ac45f Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:56 2010 -0400 ath9k_hw: simplify OLC temp compensation for AR9002 We can do the family revision check on the top level caller. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 2b5facfe7669b36a04845928abd1fcc153990026 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:55 2010 -0400 ath9k_hw: move the AR9280 OLC temp comp to its own helper Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 80b99932fd43ce3477fb2d952f12657963a2562d Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:54 2010 -0400 ath9k_hw: shift code for AR9280 OLC temp comp We're bailing out on the alternative code path so remove the else branch. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit becdbc542f3f3395138b45d7ae445886fa0feef7 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:53 2010 -0400 ath9k_hw: rename PA calib for AR9287 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e83a1134de299e6453c6d8bc99cf3af3972bb84a Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:52 2010 -0400 ath9k_hw: add a helper for the OLC tem compensation for AR9002 Open Loop Control temperature compensation changes between our hardware so use a helper for it. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4d001d18f2e738f3b53bfd1cd493987e3e61421a Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:51 2010 -0400 ath9k_hw: add a helper for Power Amplifier calibration for AR9002 The code can be simplified and shared between two locations if we bring this into a helper. During reset we do not account for the skip count. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 939ad86de538d23533d2f9dd43f80725789d43ba Author: Senthil Balasubramanian Date: Thu Apr 15 17:38:50 2010 -0400 ath9k_hw: the eep_map is used only for AR9280 PCI card ini fixup We can reorganize the code in such a way that eep_map can be removed, which makes the code more clearer. Signed-off-by: Senthil Balasubramanian Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 641d99217f507024720d21f0a76a8075824fcc46 Author: Felix Fietkau Date: Thu Apr 15 17:38:49 2010 -0400 ath9k_hw: Split out the function for reading the noise floor Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b5c80475abaad015699384ca64ef8229fdd88758 Author: Felix Fietkau Date: Thu Apr 15 17:38:48 2010 -0400 ath9k: Add Rx EDMA support Signed-off-by: Felix Fietkau Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit c38d4d2eb988717f7a8be24faeada648b5dac52a Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:47 2010 -0400 ath9k: Make bf_desc of ath_buf opaque Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 6d913f7db3ff5cc5c9b673d8db8e4a8b9f86d85b Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:46 2010 -0400 ath9k: Remove ATH9K_TX_SW_ABORTED and introduce a bool for this purpose Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit d826c83277a2a661cd0d37d051d5a4931b8463ff Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:45 2010 -0400 ath9k: Use memcpy in ath_clone_txbuf() Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 5c3a338fcfd25de1f8434f9e504aa7e2a425d3ce Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:44 2010 -0400 ath9k: Use abstraction to get link pointer Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 87d5efbbd6b6df6111404f9c12ad1b9a957498c5 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:43 2010 -0400 ath9k_hw: Add abstraction to set/get link pointer Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3f3a1c8031fd87a7d0195d0a8e8101d04c283fcc Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:42 2010 -0400 ath9k_hw: Move code which populates ds_data to ath9k_hw Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 162c3be3780dcb241ce0c9d49626c6cfb90f9f61 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:41 2010 -0400 ath9k_hw: Define tx control struct for AR9003 Store appropriate desc length which will be used by the ath9k module while duplicating tx desc. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit af914a9ffd60a841054e9fd248f12630df0698c5 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:40 2010 -0400 ath9k_hw: add all the AR9003 PHY callbacks Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c16fcb49b3849b4dceec9e4bbeb013b0713c7b38 Author: Felix Fietkau Date: Thu Apr 15 17:38:39 2010 -0400 ath9k_hw: Split off ANI control to the PHY ops Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit cffb5e49a147cfc6491f561f9b330e1001276185 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:38 2010 -0400 ath9k_hw: add helpers for processing the AR9003 INI Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 13ce3e997c8a63269e49f1b6c239035d79bb18e8 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:37 2010 -0400 ath9k_hw: add initvals for the AR9003 hardware family The AR9003 hardware family now initializes hardware by block components and into stages: pre, core and init. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit af01c04e21816da01454e1d580891f394465b77e Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:36 2010 -0400 ath9k_hw: split initvals.h by hardware family The initvals.h file is over 7000 lines now, so instead of adding AR9003 initvals to it instead lets split the current initvals.h by hardware family: AR5008, AR9001, AR9002 The AR9003 family will have its own initval file later. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ca3755540707539ea3ccf45e0c777d946f768f62 Author: Felix Fietkau Date: Thu Apr 15 17:38:35 2010 -0400 ath9k_hw: Implement spur mitigation on AR9003 Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 317d33280c63f32bd84c49aacaaae047e981b441 Author: Felix Fietkau Date: Thu Apr 15 17:38:34 2010 -0400 ath9k_hw: Implement PLL control on AR9003 Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit f7abf0c1958ab363874cad0d799a1bb43880145a Author: Felix Fietkau Date: Thu Apr 15 17:38:33 2010 -0400 ath9k_hw: Set the channel on AR9003 Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7152451aa12558ab032f319a119ceb928396b905 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:32 2010 -0400 ath9k_hw: add common channel select helpers for ar900[23] Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit da6f1d7f5f46d71f85d69a6521a16b83ad00e7e3 Author: Felix Fietkau Date: Thu Apr 15 17:38:31 2010 -0400 ath9k_hw: Add AR9003 PHY register definitions Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 84e2169b0fead5d87de0a29f17a06fba904bc46b Author: Senthil Balasubramanian Date: Thu Apr 15 17:38:30 2010 -0400 ath9k_hw: prevent reset control register zeroing on AR9003 reset Also, no need for the udelay(2) on AR9003 hardware. Signed-off-by: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1f3f06184006dff1ec439c56dcee9a99ed93e985 Author: Senthil Balasubramanian Date: Thu Apr 15 17:38:29 2010 -0400 ath9k_hw: update the chip tests for AR9003 The AR9003 family requires a change on the loop and can also skip testing the PHY timing registers. This chip test can now be used by all Atheros hardware families, including legacy. We can eventually move this out to the generic ath module. Signed-off-by: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ad7b806065f5791696a1c9a4c2665f6421cbbf05 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:28 2010 -0400 ath9k_hw: Add few routines for rx edma support * Set rx buf size in register 0x60 * Set rxdp on the respective hw rx queue (HP and LP queues) * Process rx descriptor Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit ae3bb6d4628dae7ead588263177a0674221fea78 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:27 2010 -0400 ath9k_hw: Fill rx_enable() for the AR9003 hardware family Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit cee1f625bfcabeed39138547be21d8995357f8e1 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:26 2010 -0400 ath9k_hw: Add abstraction for rx enable Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit ceb2644576bcb9fe7b79614512c1efe2bf3c307c Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:25 2010 -0400 ath9k_hw: Fill few hw cap for edma HP & LP queue depth and rx status length. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1adf02ffad449ea955e21393e05b0e45ef2c16a4 Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:24 2010 -0400 ath9k_hw: Add hw cap flag for EDMA for the AR9003 family AR9003 supports extended DMA (EDMA), this comes with some bells and whistles on top of the legacy DMA that we are used to. Mark AR9003 and later chips EDMA capable. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3448f912c64bac4431b657b47b4e6e57565b656f Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:23 2010 -0400 ath9k: disable the MIB interrupt if ANI is disabled Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 31a0bd3c7564ec79cf86a3eb9f9aaa3c47099d9b Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:22 2010 -0400 ath9k_hw: disable ANI for AR9003 ANI is still being debugged on AR9003 by our systems team so it should not yet be enabled yet. When ANI will be enabled all ANI functionality is expected to be enabled so fill the ANI functionality to all for AR9003 for now as well. Cc: Enis Akay Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 61accab9b5cfc2a7f42c88f30656d9f1771400d3 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:21 2010 -0400 ath9k_hw: add the AR9003 ar9003_hw_macversion_supported() Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit bab1f62e214f19d2edb1b5508ad5ba1b0a8a22ec Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:20 2010 -0400 ath9k_hw: move init config and default after chip is up This allows us to add SREV checks on these helpers. Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8525f2801df14b6c4ae6a96127e47d646be5304c Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:19 2010 -0400 ath9k_hw: Add AR9003 PHY support This add stubs for PHY support for the AR9003 hardware family. Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit db3cc53a2faea2da5730304af06a77d343f314a5 Author: Senthil Balasubramanian Date: Thu Apr 15 17:38:18 2010 -0400 ath9k_hw: Add the PCI IDs for AR9300 and fill up the pci_id_tables Also, clean up and reorganize the AR9287 macro to have better ordering. We won't add the PCI ID to the supported device list until we have some functional code for it. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 647739645bea4a5628f9e4eaf8022dcc5875c535 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:17 2010 -0400 ath9k_hw: add a private callback for PLL control computation The PLL control computation used to program the AR_RTC_PLL_CONTROL register varies between our harware so just add a private callback for it. AR9003 will use its own callback. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit bbd79af5639bd51af1119e5df866568063a1b011 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:16 2010 -0400 ath9k_hw: add some comments for ath9k_set_power_network_sleep() Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e041228fed0c9fe8b5c3b8e0ca66b08178b26a87 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:15 2010 -0400 ath9k_hw: skip PLL initialization on AR9003 on Power-On-Reset This is not required for the AR9003 family. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 8fe6536850ae49609704a263cbc7542133536922 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:14 2010 -0400 ath9k_hw: Move some RF ops to the private callbacks The PHY split is easier done in a few steps. First move the RF ops to the private ops and rename them accordingly. We split PHY stuff up first for the AR5008 and AR9002 families. There are some callbacks that AR9002 share with the AR5008 familiy so we set those first, if AR9002 has some different callbacks it will override them upon hardware init. Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit aed1baf1ab10f4b6bd40952a9deb791dbba48f3a Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:13 2010 -0400 ath9k_hw: remove wrapper ath9k_hw_write_regs() This is used only once by ath9k_hw_process_ini() to write an array of phy registers through REG_WRITE_ARRAY(), but we already call REG_WRITE_ARRAY() multiple times on the same caller so just remove this pointless wrapper. We'll eventually just move the ath9k_hw_process_ini() caller as an callback to abstract away between different hardware families. Although this change is subtle I should note that this does change the delay pattern on writing the next series of registers. REG_WRITE_ARRAY() uses a counter for each register write and does a udelay(1) every 64 writes. By removing this call it means that the counter is processed for all the iniBB_RfGain registers and is incremented on ath9k_hw_process_ini(), before this the after the call ath9k_hw_write_regs() was made the register counter was kept at the same index number prior to the call. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 42d5bc3faabcc9d7ea1cfe9237d71ef7dce386e3 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:12 2010 -0400 ath9k_hw: AR9003 does not have AR_RC_AHB skip its setting AR9003 does not have a reset control for AHB. Signed-off-by: Luis R. Rodriguez Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 783dfca1fceb0140e629d671b67e4be7e8dc7f8d Author: Felix Fietkau Date: Thu Apr 15 17:38:11 2010 -0400 ath9k_hw: add support for GPIO differences on AR9003 Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2c5204aa83c3a21c5c3e044342dadf4520cc4558 Author: Felix Fietkau Date: Thu Apr 15 17:38:10 2010 -0400 ath9k_hw: add simple register abstraction for some AR9300 registers Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0bef631c5a029e67b908872649b94c9251260a92 Author: Felix Fietkau Date: Thu Apr 15 17:38:09 2010 -0400 ath9k_hw: fix a missing hex prefix for a register mask This is not a stable code fix as this register is not used anywhere. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 086a864c9a3ad3c70d68dfb87892c5613a09906c Author: Felix Fietkau Date: Thu Apr 15 17:38:08 2010 -0400 ath9k_hw: add a macro for abstracting generic timer access Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit b0550327da7fcab5b4b0f09a450432ee9ae4ca19 Author: Felix Fietkau Date: Thu Apr 15 17:38:07 2010 -0400 ath9k_hw: add silicon revision macros for AR9300 AR9300 will be the first device supported of the AR9003 family. AR9300 1.0 hardware exists but it is not going to be sold anywhere so we completely skip its support. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit d70357d56942fa587e39505547cb69e10a8d59a0 Author: Luis R. Rodriguez Date: Thu Apr 15 17:38:06 2010 -0400 ath9k_hw: start building an abstraction layer for hardware routines ath9k supports the AR5008, AR9001 and AR9002 family of Atheros chipsets, all 802.11n. The new breed of 802.11n chips, the AR9003 family will be supported as well soon. To help with its support we're going to add a few callbacks for hardware routines which differ considerably instead of adding branch checks for the revision at runtime. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ac1a474d71d6cbf94bf26889da5768f5f2b0ca2b Author: Dan Williams Date: Thu Apr 15 13:32:58 2010 -0700 libertas: Davinci platforms need more time loading helper firmware Davinci platforms apparently need more time in-between helper firmware blocks. Even though this is an increased delay, we only take this hit once at initialization time. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 96021f096e5178582af296a2fbb6df7dbd6b695c Author: Dan Williams Date: Thu Apr 15 13:27:44 2010 -0700 libertas: consolidate SDIO firmware wait code Consolidate a bunch of C&P code that waits for the firmware to be ready. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit edbe056a5a70aac20127189ca99d042640fd3366 Author: Larry Finger Date: Thu Apr 15 14:00:11 2010 -0500 rtl818x: Move configuration details to the rtl818x directory In preparation for new rtl818x devices, move the existing rtl818x configuration into the rtl818x directory. Signed-off-by: Larry Finger Acked-by: Hin-Tak Leung Signed-off-by: John W. Linville commit 8c00b39f33bc5340be9b053963321eb9ea6a78ee Author: Grazvydas Ignotas Date: Thu Apr 15 18:23:23 2010 +0300 wl1251: register platform_device to pass board data wl1251 is embedded chip that can be connected using SDIO bus, and is not an actual SDIO card. For this reason there is a need to pass some board specific data, like 'EEPROM is attached' flag or power control callback. However currently there is no way to pass this data through SDIO subsystem, so this patch registers dummy platform_device to allow that, until we have a better solution to this. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit 103823db62ffca028c7a214c80266519d2ea7d8d Author: Christian Lamparter Date: Thu Apr 15 14:17:07 2010 +0200 p54pci: fix serious sparse warning This patch fixes a bug which was just recently introduced by ("p54pci: prevent stuck rx-ring on slow system"). make M=drivers/net/wireless/p54 C=2 CF=-D__CHECK_ENDIAN__ CHECK drivers/net/wireless/p54/p54pci.c drivers/net/wireless/p54/p54pci.c:143:11: warning: cast to restricted __le32 CC [M] drivers/net/wireless/p54/p54pci.o Reported-by: Johannes Berg Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 2fddd880668ee124cb56429f458b74d2772f6cb6 Author: Xose Vazquez Perez Date: Thu Apr 15 13:25:49 2010 +0200 wireless: rt2x00: rt2800usb: identify Hawking devices 0x0e66,0x0009 HWUN2 Hawking Technologies Hi-Gain Wireless-150N USB Adapter w/ Upgradable Antenna 0x0e66,0x000b HWDN2 Hawking Technologies Hi-Gain USB Wireless-150N Dish Adapter 0x0e66,0x0013 Hawking Technologies Hi-Gain Wireless-N USB Adapter 0x0e66,0x0017 Hawking Wireless-N Network Adapter 0x0e66,0x0018 Hawking Wireless-N Network Adapter Hawking Technologies Technical Support guys say: All our N adapters use the same chipset. Ralink RT 2870 chipset. Signed-off-by: Xose Vazquez Perez Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 745b1ae31ba6644a943ec2b6da2d03f00d8b2dd2 Author: Helmut Schaa Date: Thu Apr 15 09:13:35 2010 +0200 rt2x00: rt2800pci: fix tx path by not accessing the skb after it was DMA mapped rt2800pci used the callback write_tx_desc to write the tx descriptor but also to update the txwi which is part of the dma mapped skb. Since the memory was already DMA mapped _before_ the call to write_tx_desc the device didn't get the txwi data at all or only sporadically. The call order is basically as follows (from rt2x00queue.c): 1) write_tx_data 2) rt2x00queue_map_txskb 3) write_tx_desc Hence, we shouldn't touch the skb in write_tx_desc anymore. To fix this issue create a new rt2800pci_write_tx_data callback and use it for updating the txwi _before_ the memory gets DMA mapped. The tx descriptor is still written (as before) in write_tx_desc. This patch allows basic TX on an rt305x soc device but I'm pretty sure that it will fix pci based cards as well. I can associate just fine with an AP now but I wasn't able to get a wpa secured connection working yet. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 410866930ea1929b0fdfb533dd84ddaa234b06e4 Author: Helmut Schaa Date: Thu Apr 15 09:13:13 2010 +0200 rt2x00: add txdesc parameter to write_tx_data Extend the write_tx_data callback with a txdesc parameter to allow access to the tx desciptor while preparing the tx data. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 7834704be4777fc0ed67c4486ef8c5691078d135 Author: Nishant Sarmukadam Date: Wed Apr 14 22:03:02 2010 -0700 cfg80211: Avoid sending IWEVASSOCREQIE and IWEVASSOCRESPIE events with NULL event body In a scenario, where a cfg80211 driver (station mode) does not send assoc request and assoc response IEs in cfg80211_connect_result after a successful association to an AP, cfg80211 sends IWEVASSOCREQIE and IWEVASSOCRESPIE to the user space application with NULL data. This can cause an issue at the event recipient. An example of this is when cfg80211 sends IWEVASSOCREQIE and IWEVASSOCRESPIE events with NULL event body to wpa_supplicant. The wpa_supplicant overwrites the assoc request and assoc response IEs for this station with NULL data. If the association is WPA/WPA2, the wpa_supplicant is not able to generate EAPOL handshake messages, since the IEs are NULL. With the patch, req_ie and resp_ie will be NULL by avoiding the assignment if the driver has not sent the IEs to cfg80211. The event sending code sends the events only if resp_ie and req_ie are not NULL. This will ensure that the events are not sent with NULL event body. Signed-off-by: Nishant Sarmukadam Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 61c2a80b960361a930a4e3c4c0df694713b9dafd Author: Grazvydas Ignotas Date: Wed Apr 14 13:05:48 2010 +0300 wl1251: read default MAC address from EEPROM when available Some wl1251 hardware configurations (like in WG7210 module) have EEPROM attached where NVS data is kept, which includes MAC address. In such configurations, let's read default MAC address from EEPROM, instead of using random one. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 Merge: 1cff399 0340c7d Author: Takashi Iwai Date: Fri Apr 16 15:20:06 2010 +0200 Merge remote branch 'alsa/devel' into topic/misc commit 0340c7dccd80d8706c636e030a6ebbddbddca690 Author: Jaroslav Kysela Date: Fri Apr 16 13:10:10 2010 +0200 ALSA: Release v1.0.23 Signed-off-by: Jaroslav Kysela commit ca4c2adaf2d7efcc43e16c8010cf4c30def75058 Author: Jaroslav Kysela Date: Fri Apr 16 10:32:54 2010 +0200 ALSA: usb/mixer - use get_iface_desc() rather than direct structure Signed-off-by: Jaroslav Kysela commit f09d045e2a61d2fdae3d0127208f18c9f44acf80 Merge: dc57da3 27762b2 Author: Jaroslav Kysela Date: Fri Apr 16 10:37:41 2010 +0200 Merge branch 'topic/usb' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel commit b5d43998234331b9c01bd2165fdbb25115f4387f Author: Shan Wei Date: Thu Apr 15 16:48:48 2010 +0000 ipv6: fix the comment of ip6_xmit() ip6_xmit() is used by upper transport protocol. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 4e15ed4d930297c127d280ca1d0c785be870def4 Author: Shan Wei Date: Thu Apr 15 16:43:08 2010 +0000 net: replace ipfragok with skb->local_df As Herbert Xu said: we should be able to simply replace ipfragok with skb->local_df. commit f88037(sctp: Drop ipfargok in sctp_xmit function) has droped ipfragok and set local_df value properly. The patch kills the ipfragok parameter of .queue_xmit(). Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 0eecb784942792863b77dfe11e0c7e286e92db85 Author: Shan Wei Date: Thu Apr 15 16:39:14 2010 +0000 ipv6: cancel to setting local_df in ip6_xmit() commit f88037(sctp: Drop ipfargok in sctp_xmit function) has droped ipfragok and set local_df value properly. So the change of commit 77e2f1(ipv6: Fix ip6_xmit to send fragments if ipfragok is true) is not needed. So the patch remove them. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit a4fbf8415c462208e77251779d80dbc81914cebd Author: Joe Perches Date: Thu Apr 15 15:37:13 2010 -0700 net/l2tp/l2tp_debugfs.c: Convert NIPQUAD to %pI4 Signed-off-by: Joe Perches Acked-by: James Chapman Signed-off-by: David S. Miller commit 3eb14b944f2b5b6efe4e0ae3fe9601db78437d57 Merge: 791f58c 5c01d56 Author: David S. Miller Date: Thu Apr 15 14:31:06 2010 -0700 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 791f58c0640f906d3f63518d3f02630dbbafb7a2 Merge: fd793d8 8de53df Author: David S. Miller Date: Thu Apr 15 14:14:05 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6 commit 5c01d5669356e13f0fb468944c1dd4c6a7e978ad Merge: fea0691 a5e944f Author: John W. Linville Date: Thu Apr 15 16:21:34 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/wl12xx/wl1271_main.c commit f0d57a54aa9fdf3a4d9435d44c69b20388ad0b3b Author: Patrick McHardy Date: Thu Apr 15 19:09:01 2010 +0200 netfilter: ipt_LOG/ip6t_LOG: use more appropriate log level as default Use KERN_NOTICE instead of KERN_EMERG by default. This only affects kernel internal logging (like conntrack), user-specified logging rules contain a seperate log level. Signed-off-by: Patrick McHardy commit 8de53dfbf9a0a0f7538c005137059c5c021476e1 Author: Patrick McHardy Date: Thu Apr 15 13:29:28 2010 +0200 ipv4: ipmr: fix NULL pointer deref during unres queue destruction Fix an oversight in ipmr_destroy_unres() - the net pointer is unconditionally initialized to NULL, resulting in a NULL pointer dereference later on. Fix by adding a net pointer to struct mr_table and using it in ipmr_destroy_unres(). Signed-off-by: Patrick McHardy commit b0ebb739a8f68039f03e80b3476b204fe5adf0d7 Author: Patrick McHardy Date: Thu Apr 15 13:29:28 2010 +0200 ipv4: ipmr: fix invalid cache resolving when adding a non-matching entry The patch to convert struct mfc_cache to list_heads (ipv4: ipmr: convert struct mfc_cache to struct list_head) introduced a bug when adding new cache entries that don't match any unresolved entries. The unres queue is searched for a matching entry, which is then resolved. When no matching entry is present, the iterator points to the head of the list, but is treated as a matching entry. Use a seperate variable to indicate that a matching entry was found. Signed-off-by: Patrick McHardy commit 66496d4973dcb848d163805fa6b485850b7555e3 Author: Patrick McHardy Date: Thu Apr 15 13:29:27 2010 +0200 ipv4: ipmr: fix IP_MROUTE_MULTIPLE_TABLES Kconfig dependencies IP_MROUTE_MULTIPLE_TABLES should depend on IP_MROUTE. Signed-off-by: Patrick McHardy commit 90348e0ede4e74f9404c4d08cce1dbb1baa05b06 Author: Ulrich Weber Date: Thu Apr 15 12:37:18 2010 +0200 netfilter: ipv6: move xfrm_lookup at end of ip6_route_me_harder xfrm_lookup should be called after ip6_route_output skb_dst_set, otherwise skb_dst_set of xfrm_lookup is pointless Signed-off-by: Ulrich Weber Signed-off-by: Patrick McHardy commit e179e6322ac334e21a3c6d669d95bc967e5d0a80 Author: Bart De Schuymer Date: Thu Apr 15 12:26:39 2010 +0200 netfilter: bridge-netfilter: Fix MAC header handling with IP DNAT - fix IP DNAT on vlan- or pppoe-encapsulated traffic: The functions neigh_hh_output() or dst->neighbour->output() overwrite the complete Ethernet header, although we only need the destination MAC address. For encapsulated packets, they ended up overwriting the encapsulating header. The new code copies the Ethernet source MAC address and protocol number before calling dst->neighbour->output(). The Ethernet source MAC and protocol number are copied back in place in br_nf_pre_routing_finish_bridge_slow(). This also makes the IP DNAT more transparent because in the old scheme the source MAC of the bridge was copied into the source address in the Ethernet header. We also let skb->protocol equal ETH_P_IP resp. ETH_P_IPV6 during the execution of the PF_INET resp. PF_INET6 hooks. - Speed up IP DNAT by calling neigh_hh_bridge() instead of neigh_hh_output(): if dst->hh is available, we already know the MAC address so we can just copy it. Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit ea2d9b41bd418894d1ee25de1642c3325d71c397 Author: Bart De Schuymer Date: Thu Apr 15 12:14:51 2010 +0200 netfilter: bridge-netfilter: simplify IP DNAT Remove br_netfilter.c::br_nf_local_out(). The function br_nf_local_out() was needed because the PF_BRIDGE::LOCAL_OUT hook could be called when IP DNAT happens on to-be-bridged traffic. The new scheme eliminates this mess. Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit 1cff399ecd9125d8e6a634a1957be1aeb3195a12 Author: Brian Waters Date: Thu Apr 15 04:03:29 2010 -0400 ALSA: i2c: Fixed 8 checkpatch errors Fixed 8 checkpatch errors (ERROR: do not use assignment in if condition) in sound/i2c/i2c.c. Signed-off-by: Brian Waters Signed-off-by: Takashi Iwai commit 09a40af5240de02d848247ab82440ad75b31ab11 Author: Mike Galbraith Date: Thu Apr 15 07:29:59 2010 +0200 sched: Fix UP update_avg() build warning update_avg() is only used for SMP builds, move it to the nearest SMP block. Reported-by: Stephen Rothwell Signed-off-by: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <1271309399.14779.17.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit b257c14ceb1194a6181144210056d38f22127189 Merge: 371fd7e 2ba3abd Author: Ingo Molnar Date: Thu Apr 15 09:35:24 2010 +0200 Merge branch 'linus' into sched/core Merge reason: merge the latest fixes, update to -rc4. Signed-off-by: Ingo Molnar commit fd793d8905720595caede6bd26c5df6c0ecd37f8 Author: Changli Gao Date: Thu Apr 15 00:16:59 2010 -0700 net: CONFIG_SMP should be CONFIG_RPS Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit b5a80b7e91d6c067339e4d81a0176a835e9bf910 Merge: 84b13fd f6c903f Author: Ingo Molnar Date: Thu Apr 15 09:16:51 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit b0e28f1effd1d840b36e961edc1def81e01b1ca1 Author: Eric Dumazet Date: Thu Apr 15 00:14:07 2010 -0700 net: netif_rx() must disable preemption Eric Paris reported netif_rx() is calling smp_processor_id() from preemptible context, in particular when caller is ip_dev_loopback_xmit(). RPS commit added this smp_processor_id() call, this patch makes sure preemption is disabled. rps_get_cpus() wants rcu_read_lock() anyway, we can dot it a bit earlier. Reported-by: Eric Paris Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 84b13fd596522db47f9545d5124c30cc00dfdf5a Merge: f921281 a0cccc2 Author: Ingo Molnar Date: Thu Apr 15 09:13:26 2010 +0200 Merge branch 'perf/live' into perf/core Conflicts: tools/perf/builtin-record.c Merge reason: add the live tracing feature, resolve conflict. Signed-off-by: Ingo Molnar commit 7b2bfdbc0dee5a321b5c02febe157adebd33ab3a Author: Jens Taprogge Date: Wed Apr 14 23:42:04 2010 +0200 ALSA: hda - Add initial support for Thinkpad T410s HDA codec attached please find a patch that adds support for at least the T410s HDA codec. Most likely it will also add support for the T410 and T510 based models. The patch was derived from Ideapad support. Support for the laptop's and docking-station output connectors as well as the docking-station microphone connector and the laptops internal devices has been tested. Since it has been developed without a data-sheet available, support for digital outputs and the laptop's microphone input may well be incorrect. Microphone mute functionality is not included: The microphone mute button seems to be reported through thinkpad_acpi key 0000101b. The mute button LED seems to be wired to thinkpad_acpi led number 15. Signed-off-by: Jens Taprogge Signed-off-by: Takashi Iwai commit 039f0f3a5b724a1ed022247301565f1a43d27544 Merge: b265fae 8815cd0 Author: Takashi Iwai Date: Thu Apr 15 09:09:02 2010 +0200 Merge branch 'fix/hda' into topic/hda commit fea069152614cdeefba4b2bf80afcddb9c217fc8 Merge: 5f6c018 a8d3782 Author: David S. Miller Date: Wed Apr 14 22:52:46 2010 -0700 Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit dc825b17904a06bbd2f79d720b23156e4c01a22f Author: Paul Mundt Date: Thu Apr 15 13:13:52 2010 +0900 sh: intc: IRQ auto-distribution support. This implements support for hardware-managed IRQ balancing as implemented by SH-X3 cores (presently only hooked up for SH7786, but can probably be carried over to other SH-X3 cores, too). CPUs need to specify their distribution register along with the mask definitions, as these follow the same format. Peripheral IRQs that don't opt out of balancing will be automatically distributed at the whim of the hardware block, while each CPU needs to verify whether it is handling the IRQ or not, especially before clearing the mask. Signed-off-by: Paul Mundt commit fecf066c2d2fbc7e6a7e7e3a5af772a165bdd7b0 Author: Paul Mundt Date: Thu Apr 15 11:59:28 2010 +0900 sh: Disable IRQ balancing for timer and IPI IRQs. Make sure that the timer IRQs and IPIs aren't enabled for IRQ balancing. IPIs are disabled as a result of being percpu while the timers simply disable balancing outright. Signed-off-by: Paul Mundt commit f92128193094c288bc315db1694fafeaeb7ee1d0 Author: Frederic Weisbecker Date: Wed Apr 14 22:09:02 2010 +0200 perf: Make the trace events sample period default to 1 Trace events are mostly used for tracing and then require not to be lost when possible. As opposite to hardware events that really require to trigger after a given sample period, trace events mostly need to trigger everytime. It is a frustrating experience to trace with perf and realize we lost a lot of events because we forgot the "-c 1" option. Then default sample_period to 1 for trace events but let the user override it. Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Thomas Gleixner commit bdef3b02ceeb97f5f67fcfa6dff13c4e70b34fb7 Author: Frederic Weisbecker Date: Wed Apr 14 20:05:17 2010 +0200 perf: Always record tracepoints raw samples from perf record Trace events are mostly used for tracing rather than simple counting. Don't bother anymore with adding -R when using them, just record raw samples of trace events every time. Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Thomas Gleixner commit 7865e817e9b4b378ac57ab7f16183100b95466ce Author: Frederic Weisbecker Date: Wed Apr 14 19:42:07 2010 +0200 perf: Make -f the default for perf record Force the overwriting mode by default if append mode is not explicit. Adding -f every time one uses perf on a daily basis quickly becomes a burden. Keep the -f among the options though to avoid breaking some random users scripts. Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Thomas Gleixner commit a1e2f60e3efc812bf66a2be0d8530ee175003f6d Author: Thomas Gleixner Date: Wed Apr 14 23:58:03 2010 +0200 perf: Fix dynamic field detection Checking if a tracing field is an array with a dynamic length requires to check the field type and seek the "__data_loc" string that prepends the actual type, as can be found in a trace event format file: field:__data_loc char[] name; offset:16; size:4; signed:1; But we actually use strcmp() to check if the field type fully matches "__data_loc", which may fail as we trip over the rest of the type. To fix this, use strncmp to only check if it starts with "__data_loc". Signed-off-by: Thomas Gleixner Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Tom Zanussi Cc: Steven Rostedt LKML-Reference: <1271282283-23721-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 95476b64ab11d528de2557366ec584977c215b9e Author: Frederic Weisbecker Date: Wed Apr 14 23:42:18 2010 +0200 perf: Fix hlist related build error hlist helpers need to be available for all software events, not only trace events. Pull them out outside the ifdef CONFIG_EVENT_TRACING section. Fixes: kernel/perf_event.c:4573: error: implicit declaration of function 'swevent_hlist_put' kernel/perf_event.c:4614: error: implicit declaration of function 'swevent_hlist_get' kernel/perf_event.c:5534: error: implicit declaration of function 'swevent_hlist_release Reported-by: Ingo Molnar Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1271281338-23491-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 5f6c01819979afbfec7e0b15fe52371b8eed87e8 Author: Jesse Brandeburg Date: Wed Apr 14 16:04:23 2010 -0700 ixgbe: fix bug with vlan strip in promsic mode The ixgbe driver was setting up 82598 hardware correctly, so that when promiscuous mode was enabled hardware stripping was turned off. But on 82599 the logic to disable/enable hardware stripping is different, and the code was not updated correctly when the hardware vlan stripping was enabled as default. This change comprises the creation of two new helper functions and calling them from the right locations to disable and enable hardware stripping of vlan tags at appropriate times. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e743d31312d00932391b123dfac3324d2b9e8c81 Author: Eric Dumazet Date: Wed Apr 14 15:59:40 2010 -0700 drivers: net: use skb_headlen() replaces (skb->len - skb->data_len) occurrences by skb_headlen(skb) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f6c903f5856ffa75ae19dcee4dbb5093e320d45c Author: Masami Hiramatsu Date: Wed Apr 14 18:40:07 2010 -0400 perf probe: Show function entry line as probe-able Function entry line should be shown as probe-able line, because each function has declared line attribute. LKML-Reference: <20100414224007.14630.96915.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit de1439d8a521d22c3219fc007a570fcf944ac789 Author: Masami Hiramatsu Date: Wed Apr 14 17:44:00 2010 -0300 perf probe: Support DW_OP_plus_uconst in DW_AT_data_member_location DW_OP_plus_uconst can be used for DW_AT_data_member_location. This patch adds DW_OP_plus_uconst support when getting structure member offset. Commiter note: Fixed up the size_t format specifier in one case: cc1: warnings being treated as errors util/probe-finder.c: In function ‘die_get_data_member_location’: util/probe-finder.c:270: error: format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’ make: *** [/home/acme/git/build/perf/util/probe-finder.o] Error 1 LKML-Reference: <20100414223958.14630.5230.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit dda4ab34fe1905d3d590572b776dd92aa0866558 Author: Masami Hiramatsu Date: Wed Apr 14 18:39:50 2010 -0400 perf probe: Fix line range to show end line Line range should reject the range if the number of lines is 0 (e.g. "sched.c:1024+0"), and it should show the lines include the end of line number (e.g. "sched.c:1024-2048" should show 2048th line). LKML-Reference: <20100414223950.14630.42263.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit d3b63d7ae04879a817bac5c0bf09749f73629d32 Author: Masami Hiramatsu Date: Wed Apr 14 18:39:42 2010 -0400 perf probe: Fix a bug that --line range can be overflow Since line_finder.lno_s/e are signed int but line_range.start/end are unsigned int, it is possible to be overflow when converting line_range->start/end to line_finder->lno_s/e. This changes line_range.start/end and line_list.line to signed int and adds overflow checks when setting line_finder.lno_s/e. LKML-Reference: <20100414223942.14630.72730.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit dd259c5db26ccda46409dbf6efc79d5a2b259e38 Author: Masami Hiramatsu Date: Wed Apr 14 18:39:35 2010 -0400 perf probe: Fix mis-estimation for shortening filename Fix mis-estimation size for making a short filename. Since the buffer size is 32 bytes and there are '@' prefix and '\0' termination, maximum shorten filename length should be 30. This means, before searching '/', it should be 31 bytes. LKML-Reference: <20100414223935.14630.11954.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit 7ca5989dd065cbc48a958666c273794686ea7525 Author: Masami Hiramatsu Date: Wed Apr 14 18:39:28 2010 -0400 perf probe: Fix to use correct debugfs path finder Instead of using debugfs_path, use debugfs_find_mountpoint() to find actual debugfs path. LKML-Reference: <20100414223928.14630.38326.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Reported-by: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit 02b95dadc8a1d2c302513e5fa24c492380d26e93 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:56 2010 -0400 perf probe: Remove xstrdup()/xstrndup() from util/probe-{event, finder}.c Remove all xstr*dup() calls from util/probe-{event,finder}.c since it may cause 'sudden death' in utility functions and it makes reusing it from other code difficult. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171756.3790.89607.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit e334016f1d7250a6523b3a44ccecfe23af6e2f57 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:49 2010 -0400 perf probe: Remove xzalloc() from util/probe-{event, finder}.c Remove all xzalloc() calls from util/probe-{event,finder}.c since it may cause 'sudden death' in utility functions and it makes reusing it from other code difficult. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171749.3790.33303.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 146a143948ed9e8b248c0ec59937f3e9e1bbc7e5 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:42 2010 -0400 perf probe: Remove die() from probe-event code Remove die() and DIE_IF() code from util/probe-event.c since these 'sudden death' in utility functions make reusing it from other code (especially tui/gui) difficult. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171742.3790.33650.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit b55a87ade3839c33ab94768a0b5955734073f987 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:35 2010 -0400 perf probe: Remove die() from probe-finder code Remove die() and DIE_IF() code from util/probe-finder.c since these 'sudden death' in utility functions make reusing it from other code (especially tui/gui) difficult. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171735.3790.88853.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit a34a985499895a46a4dacff727d0fbc63cdc75e8 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:29 2010 -0400 perf probe: Support DW_OP_call_frame_cfa in debuginfo When building kernel without CONFIG_FRAME_POINTER, gcc uses CFA (canonical frame address) for frame base. With this patch, perf probe just gets CFI (call frame information) from debuginfo and search corresponding CFA from the CFI. IOW, this allows perf probe works correctly on the kernel without CONFIG_FRAME_POINTER. ./perf probe -fn sched_slice:12 lw.weight Fatal: DW_OP 156 is not supported. (^^^ DW_OP_call_frame_cfa) ./perf probe -fn sched_slice:12 lw.weight Add new event: probe:sched_slice (on sched_slice:12 with weight=lw.weight) Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171728.3790.98217.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 11a1ca3554b377d2a8a318a3cbf8ce10a7a2a8e4 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:22 2010 -0400 perf probe: Support basic type casting Add basic type casting for arguments to perf probe. This allows users to specify the actual type of arguments. Of course, if user sets invalid types, kprobe-tracer rejects that. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171722.3790.50372.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 4984912eb23113a4007940cd09c8351c0623ea5f Author: Masami Hiramatsu Date: Mon Apr 12 13:17:15 2010 -0400 perf probe: Query basic types from debuginfo Query the basic type information (byte-size and signed-flag) from debuginfo and pass that to kprobe-tracer. This is especially useful for tracing the members of data structure, because each member has different byte-size on the memory. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171715.3790.23730.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 93ccae7a2227466a0d071fe52c51319f2f34c365 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:08 2010 -0400 tracing/kprobes: Support basic types on dynamic events Support basic types of integer (u8, u16, u32, u64, s8, s16, s32, s64) in kprobe tracer. With this patch, users can specify above basic types on each arguments after ':'. If omitted, the argument type is set as unsigned long (u32 or u64, arch-dependent). e.g. echo 'p account_system_time+0 hardirq_offset=%si:s32' > kprobe_events adds a probe recording hardirq_offset in signed-32bits value on the entry of account_system_time. Cc: Ingo Molnar Cc: Steven Rostedt Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171708.3790.18599.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit df0faf4be02996135bc3a06b4f34360449c78084 Author: Masami Hiramatsu Date: Mon Apr 12 13:17:00 2010 -0400 perf probe: Use the last field name as the argument name Set the last field name to the argument name when the argument is refering a data-structure member. e.g. ./perf probe --add 'vfs_read file->f_mode' Add new event: probe:vfs_read (on vfs_read with f_mode=file->f_mode) This probe records file->f_mode, but the argument name becomes "f_mode". This enables perf-trace command to parse trace event format correctly. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171700.3790.72961.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit 48481938b02471d505296d7557ed296eb093d496 Author: Masami Hiramatsu Date: Mon Apr 12 13:16:53 2010 -0400 perf probe: Support argument name Set given names to event arguments. The syntax is same as kprobe-tracer, you can add 'NAME=' right before each argument. e.g. ./perf probe vfs_read foo=file then, 'foo' is set to the argument name as below. ./perf probe -l probe:vfs_read (on vfs_read@linux-2.6-tip/fs/read_write.c with foo) Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker LKML-Reference: <20100412171653.3790.74624.stgit@localhost6.localdomain6> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit fcd1498405c2c88ac632e7c3c3fce3213d9196db Author: Frederic Weisbecker Date: Wed Apr 14 19:11:29 2010 +0200 perf tools: Fix accidentally preprocessed snprintf callback struct sort_entry has a callback named snprintf that turns an entry into a string result. But there are glibc versions that implement snprintf through a macro. The following expression is then going to get the snprintf call preprocessed: ent->snprintf(...) to finally end up in a build error: util/hist.c: Dans la fonction «hist_entry__snprintf» : util/hist.c:539: erreur: «struct sort_entry» has no member named «__builtin___snprintf_chk» To fix this, prepend struct sort_entry callbacks with an "se_" prefix. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo commit a5e944f1d955f3819503348426763e21e0413ba6 Author: Xose Vazquez Perez Date: Wed Apr 14 12:16:00 2010 +0200 wireless: rt2x00: rt2800usb: identify Sitecom devices A very useful information was provided by Sitecom R&D guys: Please find the information regarding our latest Ralink adapters below; WL-302 - VID: 0x0DF6, PID: 0x002D - Ralink RT2771 WL-315 - VID: 0x0DF6, PID: 0x0039 - Ralink RT2770 WL-319 - VID: 0x182D, PID: 0x0037 - Ralink RT2860 WL-321 - VID: 0x0DF6, PID: 0x003B - Ralink RT2770 WL-324 - VID: 0x0DF6, PID: 0x003D - Ralink RT2870 WL-329 - VID: 0x0DF6, PID: 0x0041 - Ralink RT3572 WL-343 - VID: 0x0DF6, PID: 0x003E - Ralink RT3070 WL-344 - VID: 0x0DF6, PID: 0x0040 - Ralink RT3071 WL-345 - VID: 0x0DF6, PID: 0x0042 - Ralink RT3072 WL-608 - VID: 0x0DF6, PID: 0x003F - Ralink RT2070 Note: PID: 0x003C, 0x004A, and 0x004D: --these products do not exist; devices were never produced/shipped-- The WL-349v4 USB dongle (0x0df6,0x0050) will be shipped soon (it isn't available yet), and uses a Ralink RT3370 chipset. Signed-off-by: Xose Vazquez Perez Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 94d0bbe849190255b93fede8eb46809a38f9b8bf Author: Christian Lamparter Date: Tue Apr 13 18:10:26 2010 +0200 ar9170usb: add a couple more USB IDs This patch adds the following 5 entries to the usbid device table: * Netgear WNA1000 * Proxim ORiNOCO Dual Band 802.11n USB Adapter * 3Com Dual Band 802.11n USB Adapter * H3C Dual Band 802.11n USB Adapter * WNC Generic 11n USB dongle CC: Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit afa5ec27f4d69952d4ae11f182258bf53d85fcf5 Author: Grazvydas Ignotas Date: Tue Apr 13 01:21:40 2010 +0300 wl1251: don't require NVS data when EEPROM is used If EEPROM is used, NVS data is now loaded but ignored. Stop loading it to avoid need of dummy NVS file for modules with EEPROM. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit f8e1d0803d2db9ef0116941a4ce46069a2009ea6 Author: Ming Lei Date: Tue Apr 13 00:29:27 2010 +0800 ath9k-htc: fix lockdep warning and kernel warning after unplugging ar9271 usb device This patch fixes two warnings below after unplugging ar9271 usb device: -one is a kernel warning[1] -another is a lockdep warning[2] The root reason is that __skb_queue_purge can't be executed in hardirq context, so the patch forks ath9k_skb_queue_purge(ath9k version of _skb_queue_purge), which frees skb with dev_kfree_skb_any which can be run in hardirq context safely, then prevent the lockdep warning and kernel warning after unplugging ar9271 usb device. [1] kernel warning [ 602.894005] ------------[ cut here ]------------ [ 602.894005] WARNING: at net/core/skbuff.c:398 skb_release_head_state+0x71/0x87() [ 602.894005] Hardware name: 6475EK2 [ 602.894005] Modules linked in: ath9k_htc ath9k ath9k_common ath9k_hw ath bridge stp llc sunrpc ipv6 cpufreq_ondemand acpi_cpufreq freq_table kvm_intel kvm arc4 ecb mac80211 snd_hda_codec_conexant snd_hda_intel snd_hda_codec snd_hwdep thinkpad_acpi snd_pcm snd_timer hwmon iTCO_wdt snd e1000e pcspkr i2c_i801 usbhid iTCO_vendor_support wmi cfg80211 yenta_socket rsrc_nonstatic pata_acpi snd_page_alloc soundcore uhci_hcd ohci_hcd ehci_hcd usbcore i915 drm_kms_helper drm i2c_algo_bit i2c_core video output [last unloaded: ath] [ 602.894005] Pid: 2506, comm: ping Tainted: G W 2.6.34-rc3-wl #20 [ 602.894005] Call Trace: [ 602.894005] [] warn_slowpath_common+0x7c/0x94 [ 602.894005] [] ? __skb_queue_purge+0x43/0x4a [ath9k_htc] [ 602.894005] [] warn_slowpath_null+0x14/0x16 [ 602.894005] [] skb_release_head_state+0x71/0x87 [ 602.894005] [] __kfree_skb+0x16/0x81 [ 602.894005] [] kfree_skb+0x7e/0x86 [ 602.894005] [] __skb_queue_purge+0x43/0x4a [ath9k_htc] [ 602.894005] [] __hif_usb_tx+0x1c1/0x21b [ath9k_htc] [ 602.894005] [] hif_usb_tx_cb+0x12f/0x154 [ath9k_htc] [ 602.894005] [] usb_hcd_giveback_urb+0x91/0xc5 [usbcore] [ 602.894005] [] ehci_urb_done+0x7a/0x8b [ehci_hcd] [ 602.894005] [] qh_completions+0x2ee/0x376 [ehci_hcd] [ 602.894005] [] ehci_work+0x95/0x76e [ehci_hcd] [ 602.894005] [] ? ehci_irq+0x2f/0x1d4 [ehci_hcd] [ 602.894005] [] ehci_irq+0x1a6/0x1d4 [ehci_hcd] [ 602.894005] [] ? __rcu_process_callbacks+0x7a/0x2df [ 602.894005] [] ? handle_fasteoi_irq+0x22/0xd2 [ 602.894005] [] usb_hcd_irq+0x4a/0xa7 [usbcore] [ 602.894005] [] handle_IRQ_event+0x77/0x14f [ 602.894005] [] ? skb_release_data+0xc9/0xce [ 602.894005] [] handle_fasteoi_irq+0x92/0xd2 [ 602.894005] [] handle_irq+0x88/0x91 [ 602.894005] [] do_IRQ+0x63/0xc9 [ 602.894005] [] ? ip_flush_pending_frames+0x4d/0x5c [ 602.894005] [] ret_from_intr+0x0/0x16 [ 602.894005] [] ? __delete_object+0x5a/0xb1 [ 602.894005] [] ? _raw_write_unlock_irqrestore+0x47/0x7e [ 602.894005] [] ? _raw_write_unlock_irqrestore+0x4c/0x7e [ 602.894005] [] __delete_object+0x5a/0xb1 [ 602.894005] [] delete_object_full+0x25/0x31 [ 602.894005] [] kmemleak_free+0x26/0x45 [ 602.894005] [] kfree+0xaa/0x149 [ 602.894005] [] ? sock_def_write_space+0x84/0x89 [ 602.894005] [] ? ip_flush_pending_frames+0x4d/0x5c [ 602.894005] [] skb_release_data+0xc9/0xce [ 602.894005] [] __kfree_skb+0x1e/0x81 [ 602.894005] [] kfree_skb+0x7e/0x86 [ 602.894005] [] ip_flush_pending_frames+0x4d/0x5c [ 602.894005] [] raw_sendmsg+0x653/0x709 [ 602.894005] [] inet_sendmsg+0x54/0x5d [ 602.894005] [] ? sock_recvmsg+0xc6/0xdf [ 602.894005] [] sock_sendmsg+0xc0/0xd9 [ 602.894005] [] ? might_fault+0x68/0xb8 [ 602.894005] [] ? might_fault+0xb1/0xb8 [ 602.894005] [] ? copy_from_user+0x2f/0x31 [ 602.894005] [] ? verify_iovec+0x54/0x91 [ 602.894005] [] sys_sendmsg+0x1da/0x241 [ 602.894005] [] ? finish_task_switch+0x0/0xc9 [ 602.894005] [] ? finish_task_switch+0x0/0xc9 [ 602.894005] [] ? trace_hardirqs_on_caller+0x16/0x150 [ 602.894005] [] ? _raw_spin_unlock_irq+0x56/0x63 [ 602.894005] [] ? finish_task_switch+0xa4/0xc9 [ 602.894005] [] ? finish_task_switch+0x0/0xc9 [ 602.894005] [] ? need_resched+0x23/0x2d [ 602.894005] [] ? trace_hardirqs_on_caller+0x16/0x150 [ 602.894005] [] ? trace_hardirqs_on_thunk+0x3a/0x3f [ 602.894005] [] system_call_fastpath+0x16/0x1b [ 602.894005] ---[ end trace 91ba2d8dc7826839 ]--- [2] lockdep warning [ 169.363215] ====================================================== [ 169.365390] [ INFO: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected ] [ 169.366334] 2.6.34-rc3-wl #20 [ 169.366872] ------------------------------------------------------ [ 169.366872] khubd/78 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire: [ 169.366872] (clock-AF_INET){++.?..}, at: [] sock_def_write_space+0x1e/0x89 [ 169.366872] [ 169.366872] and this task is already holding: [ 169.366872] (&(&hif_dev->tx.tx_lock)->rlock){-.-...}, at: [] hif_usb_stop+0x24/0x53 [ath9k_htc] [ 169.366872] which would create a new lock dependency: [ 169.366872] (&(&hif_dev->tx.tx_lock)->rlock){-.-...} -> (clock-AF_INET){++.?..} [ 169.366872] [ 169.366872] but this new dependency connects a HARDIRQ-irq-safe lock: [ 169.366872] (&(&hif_dev->tx.tx_lock)->rlock){-.-...} [ 169.366872] ... which became HARDIRQ-irq-safe at: [ 169.366872] [] __lock_acquire+0x2c6/0xd2b [ 169.366872] [] lock_acquire+0xec/0x119 [ 169.366872] [] _raw_spin_lock+0x40/0x73 [ 169.366872] [] hif_usb_tx_cb+0x5e/0x154 [ath9k_htc] [ 169.366872] [] usb_hcd_giveback_urb+0x91/0xc5 [usbcore] [ 169.366872] [] ehci_urb_done+0x7a/0x8b [ehci_hcd] [ 169.366872] [] qh_completions+0x2ee/0x376 [ehci_hcd] [ 169.366872] [] ehci_work+0x95/0x76e [ehci_hcd] [ 169.366872] [] ehci_irq+0x1a6/0x1d4 [ehci_hcd] [ 169.366872] [] usb_hcd_irq+0x4a/0xa7 [usbcore] [ 169.366872] [] handle_IRQ_event+0x77/0x14f [ 169.366872] [] handle_fasteoi_irq+0x92/0xd2 [ 169.366872] [] handle_irq+0x88/0x91 [ 169.366872] [] do_IRQ+0x63/0xc9 [ 169.366872] [] ret_from_intr+0x0/0x16 [ 169.366872] [] cpuidle_idle_call+0xa7/0x115 [ 169.366872] [] cpu_idle+0x68/0xc4 [ 169.366872] [] rest_init+0x104/0x10b [ 169.366872] [] start_kernel+0x3f1/0x3fc [ 169.366872] [] x86_64_start_reservations+0xb3/0xb7 [ 169.366872] [] x86_64_start_kernel+0xf8/0x107 [ 169.366872] [ 169.366872] to a HARDIRQ-irq-unsafe lock: [ 169.366872] (clock-AF_INET){++.?..} [ 169.366872] ... which became HARDIRQ-irq-unsafe at: [ 169.366872] ... [] __lock_acquire+0x33a/0xd2b [ 169.366872] [] lock_acquire+0xec/0x119 [ 169.366872] [] _raw_write_lock_bh+0x45/0x7a [ 169.366872] [] tcp_close+0x165/0x34d [ 169.366872] [] inet_release+0x55/0x5c [ 169.366872] [] sock_release+0x1f/0x6e [ 169.366872] [] sock_close+0x27/0x2b [ 169.366872] [] __fput+0x125/0x1ca [ 169.366872] [] fput+0x1a/0x1c [ 169.366872] [] filp_close+0x68/0x72 [ 169.366872] [] sys_close+0xad/0xe7 [ 169.366872] [] system_call_fastpath+0x16/0x1b (Trimmed at the "other info that might help us debug this" line in the interest of brevity... -- JWL) Signed-off-by: Ming Lei Acked-by: Sujith Signed-off-by: John W. Linville commit 0fa35a5836df2b8f285d6f53dfb4316c34621f88 Author: Ming Lei Date: Tue Apr 13 00:29:15 2010 +0800 ath9k-htc:respect usb buffer cacheline alignment in reg out path In ath9k-htc register out path, ath9k-htc will pass skb->data into usb hcd and usb hcd will do dma mapping and unmapping to the buffer pointed by skb->data, so we should pass a cache-line aligned address. This patch replace __dev_alloc_skb with alloc_skb to make skb->data pointed to a cacheline aligned address simply since ath9k-htc does not skb_push on the skb and pass it to mac80211, also use kfree_skb to free the skb allocated by alloc_skb(we can use kfree_skb safely in hardirq context since skb->destructor is NULL always in the path). Signed-off-by: Sujith Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit e6c6d33cb7d18721e56ce4bb5a0e22593956ef14 Author: Ming Lei Date: Tue Apr 13 00:29:05 2010 +0800 ath9k-htc:respect usb buffer cacheline alignment in reg in path In ath9k-htc register in path, ath9k-htc will pass skb->data into usb hcd and usb hcd will do dma mapping and unmapping to the buffer pointed by skb->data, so we should pass a cache-line aligned address. This patch replace __dev_alloc_skb with alloc_skb to make skb->data pointed to a cacheline aligned address simply since ath9k-htc does not skb_push on the skb and pass it to mac80211, also use kfree_skb to free the skb allocated by alloc_skb(we can use kfree_skb safely in hardirq context since skb->destructor is NULL always in the path). Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit f28a7b30cdaa936bdbdc0a2018241936fb56cae6 Author: Ming Lei Date: Tue Apr 13 00:28:53 2010 +0800 ath9k-htc:respect usb buffer cacheline alignment in ath9k_hif_usb_alloc_rx_urbs In ath9k_hif_usb_alloc_rx_urbs, ath9k-htc will pass skb->data into usb hcd and usb hcd will do dma mapping and unmapping to the buffer pointed by skb->data, so we should pass a cache-line aligned address. This patch replace __dev_alloc_skb with alloc_skb to make skb->data pointed to a cacheline aligned address simply since ath9k-htc does not skb_push on the skb and pass it to mac80211, also use kfree_skb to free the skbs allocated by alloc_skb(we can use kfree_skb safely in hardirq context since skb->destructor is NULL always in the path). Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit 87d77c4ef132599eb3a6c49520719d39f7341efd Author: Bruno Randolf Date: Mon Apr 12 16:38:52 2010 +0900 ath5k: treat RXORN as non-fatal We get RXORN interrupts when all receive buffers are full. This is not necessarily a fatal situation. It can also happen when the bus is busy or the CPU is not fast enough to process all frames. Older chipsets apparently need a reset to come out of this situration, but on newer chips we can treat RXORN like RX, as going thru a full reset does more harm than good, there. The exact chip revisions which need a reset are unknown - this guess AR5K_SREV_AR5212 ("venice") is copied from the HAL. Inspired by openwrt 413-rxorn.patch: "treat rxorn like rx, reset after rxorn seems to do more harm than good" Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 0edc9a6709d8e7d4f26c7f2a4b5ebdb641f8dfa0 Author: Bruno Randolf Date: Mon Apr 12 16:38:47 2010 +0900 ath5k: Use high bitrates for ACK/CTS There was a confusion in the usage of the bits AR5K_STA_ID1_ACKCTS_6MB and AR5K_STA_ID1_BASE_RATE_11B. If they are set (1), we will get lower bitrates for ACK and CTS. Therefore ath5k_hw_set_ack_bitrate_high(ah, false) actually resulted in high bitrates, which i think is what we want anyways. Cleared the confusion and added some documentation. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit b8f7fb13d2d7ff14818fd1d3edd8b834d38b0217 Author: Cliff Wickman Date: Wed Apr 14 11:35:46 2010 -0500 x86, UV: Improve BAU performance and error recovery - increase performance of the interrupt handler - release timed-out software acknowledge resources - recover from continuous-busy status due to a hardware issue - add a 'throttle' to keep a uvhub from sending more than a specified number of broadcasts concurrently (work around the hardware issue) - provide a 'nobau' boot command line option - rename 'pnode' and 'node' to 'uvhub' (the 'node' terminology is ambiguous) - add some new statistics about the scope of broadcasts, retries, the hardware issue and the 'throttle' - split off new function uv_bau_retry_msg() from uv_bau_process_message() per community coding style feedback. - simplify the argument list to uv_bau_process_message(), per community coding style feedback. Signed-off-by: Cliff Wickman Cc: linux-mm@kvack.org Cc: Jack Steiner Cc: Russ Anderson Cc: Mike Travis Cc: "H. Peter Anvin" Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Ingo Molnar commit df8290bf7ea6b3051e2f315579a6e829309ec1ed Author: Frederic Weisbecker Date: Fri Apr 9 00:28:14 2010 +0200 perf: Make clock software events consistent with general exclusion rules The cpu/task clock events implement their own version of exclusion on top of exclude_user and exclude_kernel. The result is that when the event triggered in the kernel but we have exclude_kernel set, we try to rewind using task_pt_regs. There are two side effects of this: - we call task_pt_regs even on kernel threads, which doesn't give us the desired result. - if the event occured in the kernel, we shouldn't rewind to the user context. We want to actually ignore the event. get_irq_regs() will always give us the right interrupted context, so use its result and submit it to perf_exclude_context() that knows when an event must be ignored. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar commit 76e1d9047e4edefb8ada20aa90d5762306082bd6 Author: Frederic Weisbecker Date: Mon Apr 5 15:35:57 2010 +0200 perf: Store active software events in a hashlist Each time a software event triggers, we need to walk through the entire list of events from the current cpu and task contexts to retrieve a running perf event that matches. We also need to check a matching perf event is actually counting. This walk is wasteful and makes the event fast path scaling down with a growing number of events running on the same contexts. To solve this, we store the running perf events in a hashlist to get an immediate access to them against their type:event_id when they trigger. v2: - Fix SWEVENT_HLIST_SIZE definition (and re-learn some basic maths along the way) - Only allocate hlist for online cpus, but keep track of the refcount on offline possible cpus too, so that we allocate it if needed when it becomes online. - Drop the kref use as it's not adapted to our tricks anymore. v3: - Fix bad refcount check (address instead of value). Thanks to Eric Dumazet who spotted this. - While exiting cpu, move the hlist release out of the IPI path to lock the hlist mutex sanely. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar commit e2941054ed596dd67a6094b7aca165af1b1f9926 Author: Nicolas Ferre Date: Wed Apr 14 17:54:04 2010 +0100 ARM: 6056/1: AT91: at91sam9g10 chip identification changed A bit in the at91sam9g10 identification number changed between Engineering Sample and final product. This patch will identify both as being at91sam9g10. Signed-off-by: Nicolas Ferre Acked-by: Andrew Victor Signed-off-by: Russell King commit 72638ddd1422df38d1b1b269038cfc8d66152c10 Author: Linus Walleij Date: Thu Apr 8 07:40:13 2010 +0100 ARM: 6034/1: ARM: U300: set f_max to 24 MHz for MMCI This employs the frequency setting mechanism introduced to the MMCI to specify that this system can actually be clocked at 24 MHz. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 808d97ccbe8e8251b1435e86c762965fd7e8a75e Author: Linus Walleij Date: Thu Apr 8 07:39:38 2010 +0100 ARM: 6033/1: ARM: MMCI: pass max frequency from platform This introduce the field f_max into the mmci_platform_data, making it possible to pass in a desired block clocking frequency from a board configuration. This is often more desirable than using a module parameter. We keep the module parameter as a fallback as well as the default frequency specified for this parameter if a parameter is not provided. This also adds some kerneldoc style documentation to the platform data struct in mmci.h. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 771dc157e06d69fcece0b2c8a29b9010345d8e9a Author: Linus Walleij Date: Thu Apr 8 07:38:52 2010 +0100 ARM: 6032/1: ARM: MMCI: support 8bit mode on the ST Micro version This adds support for an 8bit wide bus to the card (data lines MCIDAT0 through 7 exist) on the ST Micro version and alters the U300 platform to support this. Also add some ST_ prefix to the ST-specific registers. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 8e797a7e4f588fb3b9cfe9860b00dcd3b14f8b60 Author: Srinidhi Kasagar Date: Sat Apr 3 19:10:45 2010 +0100 ARM: 6027/1: ux500: enable l2x0 support This enables the l2x0 support and ensures that the secondary CPU can see the page table and secondary data at this point. Signed-off-by: srinidhi kasagar Acked-by: Linus Walleij Signed-off-by: Russell King commit b4bf665c5761837f693e87ab27870a5868185ccc Author: David S. Miller Date: Wed Apr 14 06:45:44 2010 -0700 virtio_net: Fix mis-merge. Pointed out by Stephen Rothwell. Signed-off-by: David S. Miller commit ab4364d31f14ae5ab95bafba5b33f5d35b25ca41 Author: Martyn Welch Date: Wed Apr 14 12:08:28 2010 +0100 stk17ta8: renaming e-mail corrections following split of GE Fanuc joint venture This patch corrects author and copyright notices in the stk17ta8 driver following the split-up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch Acked-by: Thomas Hommel Signed-off-by: Jiri Kosina commit b265faed8c3ddac2aec8fffdbb3c2a40803e2bcc Merge: 60508ab 3d83e57 Author: Takashi Iwai Date: Wed Apr 14 14:39:21 2010 +0200 Merge branch 'fix/hda' into topic/hda commit e193ba290f0228453341b41ab2bbdd963259f97e Author: Russell King Date: Thu Dec 24 18:32:13 2009 +0000 ARM: dma: add /proc/dma support to arch/arm/kernel/dma.c We have our own private implementation for ISA-like DMA which has been missing exposure via the /proc/dma interface. Add support for this. Signed-off-by: Russell King commit f76348a360fe92063e07a8f54b0c1ea67f91e76c Author: Russell King Date: Thu Dec 24 12:57:01 2009 +0000 ARM: remove unnecessary cache flush This cache flush occurs when we first insert a page into the page tables, where a page did not exist previously. There can be no cache lines associated with this virtual mapping, so this cache flush is redundant. Tested-by: Mike Rapoport Tested-by: Mikael Pettersson Signed-off-by: Russell King commit dad1e54b121d93ed47690d77736af63d3f11d657 Merge: 1253332 0110d6f Author: David S. Miller Date: Wed Apr 14 05:01:33 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/pcmcia/smc91c92_cs.c drivers/net/virtio_net.c commit 1253332f75f3774cc84d0b7693152656848901f9 Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:17 2010 +0000 stmmac: updated the drv module version Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 8f617541750e9b81ec50e31169e9994d7bc3aaae Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:16 2010 +0000 stmmac: fix vlan support setup Moved STMMAC_VLAN_TAG_USED from stmmac.h to common.h header because it is used within the device and descriptor cores. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 3d90c508dc6737d5b241a1f8807e1287f015f7f8 Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:15 2010 +0000 stmmac: get the descriptor structure from platform Output for chip that uses the Enhanced descriptors: [snip] STMMAC driver: platform registration... done! DWMAC1000 - user ID: 0x10, Synopsys ID: 0x33 Enhanced descriptor structure no valid MAC address;please, use ifconfig or nwhwconfig! eth0 - (dev. name: stmmaceth - id: 0, IRQ #134 IO base addr: 0xfd110000) STMMAC MII Bus: probed [snip] Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit e326e8503dfc73e4f79d488a78ee3d7cde10081f Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:14 2010 +0000 stmmac: new descriptor field for the driver's platform The new enh_desc is used for selecting the enhanced descriptors structure. There are several scenarios; some chips (mac10/100 or gmac) want to use the enhanced descriptors; others want the normal ones. For example, on ST platforms: MAC10/100 uses the normal desc structure and the GMAC uses the enhanced one. It can be useful to get this information from the platform. This could also be decided at run-time looking at the chip's ID number; but it could happen that chips with the same ID want to use different descriptor structure. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 688911c2f5e5e4f33b5a1c32839184f1fdf814ee Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:13 2010 +0000 stmmac: fix Transmit FIFO flush operation Fix the Transmit FIFO flush operation; it was disabled while reworking the descriptor structures. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 56b106ae7b1f6b7cef4ef7e79a03b59cfc940923 Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:12 2010 +0000 stmmac: rework normal and enhanced descriptors Currently the driver assumes that the mac10/100 can only use the normal descriptor structure and the gmac can only use the enhanced structures. This patch removes the descriptor's code from the dma files and adds two new files just for handling the normal and enhanced descriptors. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 3c32be635c18ead00d460b7bdad1da52622ff40f Author: Giuseppe CAVALLARO Date: Tue Apr 13 20:21:11 2010 +0000 stmmac: split core and dma for the mac10/100 The patch splits core and dma parts for the mac10/100 device. This was already done for the GMAC device. It should make more flexible the driver to support other chips. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 6e8699f7d68589e0e9ab324f598a3357bceb40bc Author: Albin Tonnerre Date: Sat Apr 3 11:40:28 2010 +0100 ARM: 6026/1: ARM: Add support for LZMA-compressed kernel images This patch allows using a kernel image compressed with LZMA on ARM. Extracting the image is fairly slow, but it might be useful on machines with a very limited amount of storage, as the size benefit is quite significant (about 25% smaller with LZMA compared to GZIP) Tested-by: Martin Michlmayr Tested-by: Paulius Zaleckas Signed-off-by: Albin Tonnerre Signed-off-by: Russell King commit ff37f6e5910c4fd7ad42063d89c0687def665941 Author: viresh kumar Date: Thu Apr 1 12:49:09 2010 +0100 ARM: 6021/1: ST SPEAr: Added ARM PrimeXsys System Controller SP810 header file Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 70f4c0bf9e4d067744ee453bc37c0c4adcea6e53 Author: viresh kumar Date: Thu Apr 1 12:31:29 2010 +0100 ARM: 6020/1: ST SPEAr: Adding gpio pad multiplexing support GPIO Pads in spear platform are are multiplexed in various machines. This patch adds support for this pad multiplexing. Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit b77932a4d265586748f05a8c8fad7ef4174c0296 Author: viresh kumar Date: Thu Apr 1 12:31:17 2010 +0100 ARM: 6019/1: ST SPEAr: Added default configuration files for SPEAr machines Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit fc0c195aa8877fd46d837c8c4a9a61386a124401 Author: viresh kumar Date: Thu Apr 1 12:31:21 2010 +0100 ARM: 6018/1: ST SPEAr: Updated Maintainers and added Documentation/arm/SPEAr Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit bc4e814e5d5e2851f0a0679eaad14f60abae2a6d Author: viresh kumar Date: Thu Apr 1 12:30:58 2010 +0100 ARM: 6017/1: ST SPEAr: Added source files for SPEAr3xx machine family Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit cee37e501ea34958d6d33d75d2bd21d9c343e379 Author: viresh kumar Date: Thu Apr 1 12:31:05 2010 +0100 ARM: 6016/1: ST SPEAr: Added support for SPEAr platform and machines in arch/arm/ Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 8f590d4541fb678a638777ab987709217cb71365 Author: viresh kumar Date: Thu Apr 1 12:31:01 2010 +0100 ARM: 6015/1: ST SPEAr: Added source files for SPEAr6xx machine family Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 8c0236fc465c71d98203bcf5609db01b9cf5f70f Author: viresh kumar Date: Thu Apr 1 12:30:46 2010 +0100 ARM: 6014/1: ST SPEAr: Added clock framework for SPEAr platform and machines Clock framework for SPEAr is based upon clkdev framework for ARM Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 986435e3596cbae662b86812e4563fbb6013b994 Author: viresh kumar Date: Thu Apr 1 12:30:49 2010 +0100 ARM: 6013/1: ST SPEAr: Added source files for SPEAr platform Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Shiraz Hashim Signed-off-by: Russell King commit bf976b51a32e255523c69022c1f21bf9ad527fc5 Author: viresh kumar Date: Thu Apr 1 12:30:42 2010 +0100 ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Shiraz Hashim Signed-off-by: Russell King commit e024c3d50c53999d15e3b8a21e0abbbf74c32140 Author: viresh kumar Date: Thu Apr 1 12:30:31 2010 +0100 ARM: 6011/1: ST SPEAr: Added basic header files for SPEAr6xx machine family Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Rajeev Kumar Signed-off-by: Russell King commit 3f10940e4fb69d312602078f2c5234206797ca31 Author: Arnd Bergmann Date: Sat Apr 10 16:46:21 2010 +0200 x86/microcode: Use nonseekable_open() No need to seek on this file, so prevent it outright so we can avoid using default_llseek - removes one more BKL usage. Signed-off-by: Arnd Bergmann [drop useless llseek = no_llseek and smp_lock.h inclusion] Signed-off-by: Frederic Weisbecker Cc: Arnd Bergmann Cc: H. Peter Anvin Cc: Dmitry Adamushko LKML-Reference: <1270910781-8786-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit a7e9c45219b2d40a80fbd1b7337cbecab85be2bd Author: viresh kumar Date: Thu Apr 1 12:30:19 2010 +0100 ARM: 6010/1: ST SPEAr: Added basic header files for SPEAr3xx machine family Reviewed-by: Linus Walleij Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 67be0b8dbaffc5ecdcc4dae3c8824a5197204c55 Author: Christian Glindkamp Date: Tue Apr 13 14:55:27 2010 +0100 ARM: 6055/1: AT91: add defconfig for taskit PortuxG20 and Stamp9G20 Support for both boards can easily be built into one kernel image, so there is no need to add one defconfig for each of them. Signed-off-by: Christian Glindkamp Acked-by: Andrew Victor Signed-off-by: Russell King commit 9b404b7cc3b066c57078b87f475562c37a74b814 Author: Christian Glindkamp Date: Tue Apr 13 14:55:10 2010 +0100 ARM: 6054/1: AT91: taskit PortuxG20 and Stamp9G20 board support Both boards share the same board file, as the PortuxG20 is basically an SBC based on the Stamp9G20. Signed-off-by: Christian Glindkamp Acked-by: Andrew Victor Signed-off-by: Russell King commit 99e6a23adfadc2da2006f3715c4332c3bf502c07 Author: Mika Westerberg Date: Sat Mar 27 12:05:14 2010 +0100 ARM: 5998/1: ep93xx: added chip revision reading function Added a new function: ep93xx_chip_revision() which reads chip revision from the sysconfig register. Signed-off-by: Mika Westerberg Acked-by: H Hartley Sweeten Signed-off-by: Russell King commit b370e082e7c4bd47195b2ec117ceeadd9286d8c0 Author: Hartley Sweeten Date: Thu Mar 18 18:04:06 2010 +0100 ARM: 5992/1: ep93xx: pass platform startup data as __initdata A number of the peripherals for the ep93xx are registered at startup using platform_data that is passed from the board init code to the core code. This data is then copied to a local static variable in the core code. Since the data is copied, the original data can be marked as __initdata and discarded after startup is complete. This adds the __initdata tag to all the appropriate data in the various ep93xx board init's. Specifically, all the struct ep93xx_eth_data, struct ep93xxfb_mach_info, and struct i2c_gpio_platform_data. Also, document the various registration functions and note what data should be marked as __initdata. While here, also cleanup a couple over zealous whitespace tabs. Signed-off-by: H Hartley Sweeten Acked-by: Ryan Mallon Signed-off-by: Russell King commit b0c4c898833250ed143e615c32ea1be0e2155fdc Author: Hartley Sweeten Date: Fri Apr 2 18:04:47 2010 +0100 ARM: 6025/1: vic: factor out common init code This factors out the common initialization code for the two vic vendors into easier maintainable functions. Tested-by: Linus Walleij Tested-by: Alessandro Rubini Cc: Andrea Gallo Cc: Ben Dooks Signed-off-by: H Hartley Sweeten Signed-off-by: Russell King commit b15c7b1cee119999e9eafcd602d24a595e77adac Merge: c1ab9ca aa27497 Author: Ingo Molnar Date: Wed Apr 14 12:15:23 2010 +0200 Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core commit a0cccc2e8e9fb16cbed3a117b30e3fbac3092ee3 Author: Tom Zanussi Date: Thu Apr 1 23:59:25 2010 -0500 perf trace: Invoke live mode automatically if record/report not specified Currently, live mode is invoked by explicitly invoking the record and report sides and connecting them with a pipe e.g. $ perf trace record rwtop -o - | perf trace report rwtop 5 -i - In terms of usability, it's not that bad, but it does require the user to type and remember more than necessary. This patch allows the user to accomplish the same thing without specifying the separate record/report steps or the pipe. So the same command as above can be accomplished more simply as: $ perf trace rwtop 5 Notice that the '-i -' and '-o -' aren't required in this case - they're added internally, and that any extra arguments are passed along to the report script (but not to the record script). The overall effect is that any of the scripts listed in 'perf trace -l' can now be used directly in live mode, with the expected arguments, by simply specifying the script and args to 'perf trace'. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-12-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 00b21a01935892a2b97613f10300434998f45093 Author: Tom Zanussi Date: Thu Apr 1 23:59:24 2010 -0500 perf trace/scripting: Enable scripting shell scripts for live mode It should be possible to run any perf trace script in 'live mode'. This requires being able to pass in e.g. '-i -' or other args, which the current shell scripts aren't equipped to handle. In a few cases, there are required or optional args that also need special handling. This patch makes changes the current set of shell scripts as necessary. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-11-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 47902f3611b392209e2a412bf7ec02dca95e666d Author: Tom Zanussi Date: Thu Apr 1 23:59:23 2010 -0500 perf trace/scripting: Add rwtop and sctop scripts A couple of scripts, one in Python and the other in Perl, that demonstrate 'live mode' tracing. For each, the output of the perf event stream is fed continuously to the script, which continuously aggregates the data and reports the current results every 3 seconds, or at the optionally specified interval. After the current results are displayed, the aggregations are cleared and the cycle begins anew. To run the scripts, simply pipe the output of the 'perf trace record' step as input to the corresponding 'perf trace report' step, using '-' as the filename to -o and -i: $ perf trace record sctop -o - | perf trace report sctop -i - Also adds clear_term() utility functions to the Util.pm and Util.py utility modules, for use by any script to clear the screen. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-10-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit c7929e4727e8ff2d6fc8327188820e3b1c2f1dc3 Author: Tom Zanussi Date: Thu Apr 1 23:59:22 2010 -0500 perf: Convert perf header build_ids into build_id events Bypasses the build_id perf header code and replaces it with a synthesized event and processing function that accomplishes the same thing, used when reading/writing perf data to/from a pipe. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-9-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 9215545e99d8c0b27323df2de504f4294bf5e407 Author: Tom Zanussi Date: Thu Apr 1 23:59:21 2010 -0500 perf: Convert perf tracing data into a tracing_data event Bypasses the tracing_data perf header code and replaces it with a synthesized event and processing function that accomplishes the same thing, used when reading/writing perf data to/from a pipe. The tracing data is pretty large, and this patch doesn't attempt to break it down into component events. The tracing_data event itself doesn't actually contain the tracing data, rather it arranges for the event processing code to skip over it after it's read, using the skip return value added to the event processing loop in a previous patch. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-8-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit cd19a035f3b63fee6dcbdb5371c4b22276f7dc8c Author: Tom Zanussi Date: Thu Apr 1 23:59:20 2010 -0500 perf: Convert perf event types into event type events Bypasses the event type perf header code and replaces it with a synthesized event and processing function that accomplishes the same thing, used when reading/writing perf data to/from a pipe. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-7-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 2c46dbb517a10b18d459e6ceffefde5bfb290cf6 Author: Tom Zanussi Date: Thu Apr 1 23:59:19 2010 -0500 perf: Convert perf header attrs into attr events Bypasses the attr perf header code and replaces it with a synthesized event and processing function that accomplishes the same thing, used when reading/writing perf data to/from a pipe. Making the attrs into events allows them to be streamed over a pipe along with the rest of the header data (in later patches). It also paves the way to allowing events to be added and removed from perf sessions dynamically. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-6-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit c239da3b4b55dbb8f30bcb8d1a0d63fc44a567c3 Author: Tom Zanussi Date: Thu Apr 1 23:59:18 2010 -0500 perf trace: Introduce special handling for pipe input Adds special treatment for stdin - if the user specifies '-i -' to perf trace, the intent is that the event stream be read from stdin rather than from a disk file. The actual handling of the '-' filename is done by the session; this just adds a signal handler to stop reporting, and turns off interference by the pager. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-5-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 46656ac7fb3252f8a3db29b18638e0e8067849ba Author: Tom Zanussi Date: Thu Apr 1 23:59:17 2010 -0500 perf report: Introduce special handling for pipe input Adds special treatment for stdin - if the user specifies '-i -' to perf report, the intent is that the event stream be written to stdin rather than from a disk file. The actual handling of the '-' filename is done by the session; this just adds a signal handler to stop reporting, and turns off interference by the pager. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-4-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 529870e37473a9fc609078f03cc5b4148cf06a87 Author: Tom Zanussi Date: Thu Apr 1 23:59:16 2010 -0500 perf record: Introduce special handling for pipe output Adds special treatment for stdout - if the user specifies '-o -' to perf record, the intent is that the event stream be written to stdout rather than to a disk file. Also, redirect stdout of forked child to stderr - in pipe mode, stdout of the forked child interferes with the stdout perf stream, so redirect it to stderr where it can still be seen but won't be mixed in with the perf output. Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 8dc58101f2c838355d44402aa77646649d10dbec Author: Tom Zanussi Date: Thu Apr 1 23:59:15 2010 -0500 perf: Add pipe-specific header read/write and event processing code This patch makes several changes to allow the perf event stream to be sent and received over a pipe: - adds pipe-specific versions of the header read/write code - adds pipe-specific version of the event processing code - adds a range of event types to be used for header or other pseudo events, above the range used by the kernel - checks the return value of event handlers, which they can use to skip over large events during event processing rather than actually reading them into event objects. - unifies the multiple do_read() functions and updates its users. Note that none of these changes affect the existing perf data file format or processing - this code only comes into play if perf output is sent to stdout (or is read from stdin). Signed-off-by: Tom Zanussi Acked-by: Thomas Gleixner Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: k-keiichi@bx.jp.nec.com Cc: acme@ghostprotocols.net LKML-Reference: <1270184365-8281-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 9756c4daad3efb8e72c3e2efcc9d87b5874d98af Author: Martyn Welch Date: Wed Apr 14 09:24:16 2010 +0100 rtc: e-mail corrections following split of GE Fanuc joint venture This patch corrects author and copyright notices following the split-up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch Signed-off-by: Jiri Kosina commit c05556421742eb47f80301767653a4bcb19de9de Author: Ian Munsie Date: Tue Apr 13 18:37:33 2010 +1000 perf: Fix endianness argument compatibility with OPT_BOOLEAN() and introduce OPT_INCR() Parsing an option from the command line with OPT_BOOLEAN on a bool data type would not work on a big-endian machine due to the manner in which the boolean was being cast into an int and incremented. For example, running 'perf probe --list' on a PowerPC machine would fail to properly set the list_events bool and would therefore print out the usage information and terminate. This patch makes OPT_BOOLEAN work as expected with a bool datatype. For cases where the original OPT_BOOLEAN was intentionally being used to increment an int each time it was passed in on the command line, this patch introduces OPT_INCR with the old behaviour of OPT_BOOLEAN (the verbose variable is currently the only such example of this). I have reviewed every use of OPT_BOOLEAN to verify that a true C99 bool was passed. Where integers were used, I verified that they were only being used for boolean logic and changed them to bools to ensure that they would not be mistakenly used as ints. The major exception was the verbose variable which now uses OPT_INCR instead of OPT_BOOLEAN. Signed-off-by: Ian Munsie Acked-by: David S. Miller Cc: # NOTE: wont apply to .3[34].x cleanly, please backport Cc: Git development list Cc: Ian Munsie Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: KOSAKI Motohiro Cc: Hitoshi Mitake Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Eric B Munson Cc: Valdis.Kletnieks@vt.edu Cc: WANG Cong Cc: Thiago Farina Cc: Masami Hiramatsu Cc: Xiao Guangrong Cc: Jaswinder Singh Rajput Cc: Arjan van de Ven Cc: OGAWA Hirofumi Cc: Mike Galbraith Cc: Tom Zanussi Cc: Anton Blanchard Cc: John Kacur Cc: Li Zefan Cc: Steven Rostedt LKML-Reference: <1271147857-11604-1-git-send-email-imunsie@au.ibm.com> Signed-off-by: Ingo Molnar commit a8d3782f9ea7574b8648e69bbb05a0b1d93e437e Author: Christoph Hellwig Date: Tue Apr 13 14:11:25 2010 -0400 vhost: fix sparse warnings Signed-off-by: Christoph Hellwig Signed-off-by: Michael S. Tsirkin commit 422dee56b8155e4627f657ee67e962066ca7aff3 Author: Adam Bennett Date: Mon Apr 12 19:54:38 2010 -0700 Input: add driver for hampshire serial touchscreens Adds support for Hampshire TSHARC serial touchscreens. Implements Hampshire's 4-byte communication protocol. Signed-off-by: Adam Bennett Signed-off-by: Dmitry Torokhov commit 6c04d7b3cf50a393f07f22a661d05d15db5dc6f6 Author: Barry Song Date: Sun Mar 21 23:23:29 2010 -0700 Input: ad714x - add support for the AD7143/8/7A parts Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit 31a6296333b94964e9a073649840bb34d4603369 Author: Bryan Wu Date: Sun Mar 21 23:23:24 2010 -0700 Input: add Analog Devices AD714x captouch input driver AD7142 and AD7147 are integrated capacitance-to-digital converters (CDCs) with on-chip environmental calibration for use in systems requiring a novel user input method. The AD7142 and AD7147 can interface to external capacitance sensors implementing functions such as buttons, scrollwheels, sliders, touchpads and so on. The chips don't restrict the specific usage. Depending on the hardware connection, one special target board can include one or several these components. The platform_data for the device's "struct device" holds these information. The data-struct defined in head file descript the hardware feature of button/scrollwheel/slider/touchpad components on target boards, which need be filled in the arch/mach-/. As the result, the driver is independent of boards. It gets the components layout from the platform_data, registers related devices, fullfills the algorithms and state machines for these components and report related input events to up level. Signed-off-by: Bryan Wu Signed-off-by: Michael Hennerich Signed-off-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit a5b33e6a207d75120ad9dad0b5401b561991dcce Author: Wolfram Sang Date: Sun Mar 21 22:31:26 2010 -0700 Input: lm8323 - do not leave dangling client data pointer Do not leave dangling client data pointers when unbinding device from the driver or when binding fails for some reason. Signed-off-by: Wolfram Sang Signed-off-by: Dmitry Torokhov commit d6372b706e83817dfa6c9326d1054b9b95a7de2a Author: Wolfram Sang Date: Sun Mar 21 22:31:26 2010 -0700 Input: tsc2007 - do not leave dangling clientdata pointer Do not leave dangling client data pointers when unbinding device from the driver. Signed-off-by: Wolfram Sang Signed-off-by: Dmitry Torokhov commit e0785572ce8620beb117530645e6989d2217d3b7 Author: Dmitry Torokhov Date: Sun Mar 21 22:31:26 2010 -0700 Input: keyboard - fix formatting issues Also convert few variables to 'bool'. Signed-off-by: Dmitry Torokhov commit 9272e9a2f8872a0f9fb15aaa10f2a993524343e0 Author: Dmitry Torokhov Date: Sun Mar 21 22:31:26 2010 -0700 Input: keyboard - switch to using pr_err() and friends Signed-off-by: Dmitry Torokhov commit 97f5f0cd8cd0a05449cbb77d1e6f02e026875802 Author: Dmitry Torokhov Date: Sun Mar 21 22:31:26 2010 -0700 Input: implement SysRq as a separate input handler Instead of keeping SysRq support inside of legacy keyboard driver split it out into a separate input handler (filter). This stops most SysRq input events from leaking into evdev clients (some events, such as first SysRq scancode - not keycode - event, are still leaked into both legacy keyboard and evdev). [martinez.javier@gmail.com: fix compile error when CONFIG_MAGIC_SYSRQ is not defined] Signed-off-by: Dmitry Torokhov commit b91c4be730668e801aa6a2ea95f467cd9a1e0983 Author: Bryan Wu Date: Fri Mar 19 22:18:15 2010 -0700 Input: add PCF8574 I2C keypad input device driver Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit 2adaabd47164a0f89364f46172c35613c4d1fbdd Author: Eric Miao Date: Fri Mar 19 22:33:46 2010 -0700 Input: remove now deprecated corgi_ts.c touchscreen driver The corgi touchscreen is now deprecated in favour of the generic ads7846.c driver. The noise reduction technique used in corgi_ts.c, which is to wait till vsync before ADC sampling, is also integrated into ads7846 driver now. Provided that the original driver is not generic and is difficult to maintain, it will be removed now. Signed-off-by: Eric Miao Cc: Richard Purdie Cc: Pavel Machek Cc: Dmitry Torokhov Signed-off-by: Dmitry Torokhov commit ab687b18aa77aeda5472d9ea054bf92c45c49c0c Author: Ping Cheng Date: Mon Apr 5 23:07:41 2010 -0700 Input: wacom - streamline 2-finger touch support Clean up 2-finger touch support. This still needs to be converted to proper multi-touch protocol. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 252f77698fe37bdd784e514820852a3ea9827fd0 Author: Dmitry Torokhov Date: Fri Mar 19 22:33:38 2010 -0700 Input: wacom - use get_unaligned to access unaligned data Also get rid of wacom_le16_to_cpu() and wacom_be16_to_cpu() helpers and ise le16_to_cpup() and be16_to_cpup() directly. Signed-off-by: Dmitry Torokhov commit 95dd3b30ced3ee740e5dd92fc44515a5a6a350d4 Author: Dmitry Torokhov Date: Fri Mar 19 22:18:15 2010 -0700 Input: wacom - get rid of wacom_combo structure Now that we moved input device from struct wacom to struct wacom_wac, presence of wacom_combo just complicats things for no good reason. Let's get rid of it and simply pass URB length to wacom_wac_irq(). Signed-off-by: Dmitry Torokhov commit 8da23fc113e8bdaf813545ec935a6c60254ac439 Author: Dmitry Torokhov Date: Fri Mar 19 22:18:15 2010 -0700 Input: wacom - get rid of input event wrappers Input event interface is pretty stable so let's get rig of wrappers for input_event() and fiends and call them directly. This will simplify and speed up code a bit. Signed-off-by: Dmitry Torokhov commit 73a97f4f6e53545b71f5c14ae2cb70a4b8d3cf63 Author: Dmitry Torokhov Date: Fri Mar 19 22:18:15 2010 -0700 Input: wacom - fix some formatting issues Fix identation of switch/case statements so they follow style used by the rest of the kernel. Signed-off-by: Dmitry Torokhov commit 51269fe86c263ec4fafbafe82970e6d7f6f79102 Author: Dmitry Torokhov Date: Fri Mar 19 22:18:15 2010 -0700 Input: wacom - do not allocate wacom_wac separately There is no reason for allocating struct wacom_wac separately from struct wacom since both have the same lifetime rules and are not shared. Also make 'open' field a boolean. Signed-off-by: Dmitry Torokhov commit 4492efffffeb88d87e7aa74765f3c53b3a7dd40f Author: Ping Cheng Date: Fri Mar 19 22:18:15 2010 -0700 Input: wacom - share pen info with touch of the same ID Touch enbaled devices share the same product ID with pen. However, we do not want to post touch events while pen is in prox. To do so, we used to keep a local static variable to keep track of if pen is in prox or not. This works fine for Tablet PC devices since there is only one device attached. With the newer touch enabled regular tablets, we can not make this assumption any more, i.e, one system may have more than one identical tablet plugged in. This patch adds an new entry, shared, into the struct wacom_wac so touch data can access pen data to locally. This solution assumes the two tools (touch and pen) of the same ID will be probed one after the other without interruption in between by another Wacom device of the same ID. commit 3b57ca0f80c5c8994b5b1e3d3f904cfe727951f2 Author: Ping Cheng Date: Thu Mar 4 21:50:59 2010 -0800 Input: wacom - merge out and in prox events Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. [re-applying after revert since other patches are based on this one] Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 56f3e1c0579cd06196d51ebd1ccad9298c5426b3 Merge: 0d0fb0f 3810147 Author: Dmitry Torokhov Date: Tue Apr 13 23:21:38 2010 -0700 Merge branch 'for-linus' into next commit 38101475f937c5dc0baf43a9e0c7613dbeb94d5a Author: Ping Cheng Date: Tue Apr 13 23:07:52 2010 -0700 Input: wacom - switch mode upon system resume When Wacom devices wake up from a sleep, the switch mode command (wacom_query_tablet_data) is needed before wacom_open is called. wacom_query_tablet_data should not be executed inside wacom_open since wacom_open is called more than once during probe. wacom_retrieve_hid_descriptor is removed from wacom_resume due to the fact that the required descriptors are stored properly upon system resume. Signed-off-by: Ping Cheng Reported-and-tested-by: Anton Anikin Signed-off-by: Dmitry Torokhov commit f0ad0860d01e47a3ffd220564c5c653b3afbe962 Author: Patrick McHardy Date: Tue Apr 13 05:03:23 2010 +0000 ipv4: ipmr: support multiple tables This patch adds support for multiple independant multicast routing instances, named "tables". Userspace multicast routing daemons can bind to a specific table instance by issuing a setsockopt call using a new option MRT_TABLE. The table number is stored in the raw socket data and affects all following ipmr setsockopt(), getsockopt() and ioctl() calls. By default, a single table (RT_TABLE_DEFAULT) is created with a default routing rule pointing to it. Newly created pimreg devices have the table number appended ("pimregX"), with the exception of devices created in the default table, which are named just "pimreg" for compatibility reasons. Packets are directed to a specific table instance using routing rules, similar to how regular routing rules work. Currently iif, oif and mark are supported as keys, source and destination addresses could be supported additionally. Example usage: - bind pimd/xorp/... to a specific table: uint32_t table = 123; setsockopt(fd, IPPROTO_IP, MRT_TABLE, &table, sizeof(table)); - create routing rules directing packets to the new table: # ip mrule add iif eth0 lookup 123 # ip mrule add oif eth0 lookup 123 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0c12295a741d3186987f96f518cfbdaf01abb087 Author: Patrick McHardy Date: Tue Apr 13 05:03:22 2010 +0000 ipv4: ipmr: move mroute data into seperate structure Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 862465f2e7e90975e7bf0ecfbb171dd3adedd950 Author: Patrick McHardy Date: Tue Apr 13 05:03:21 2010 +0000 ipv4: ipmr: convert struct mfc_cache to struct list_head Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d658f8a0e63b6476148162aa7a3ffffc58dcad52 Author: Patrick McHardy Date: Tue Apr 13 05:03:20 2010 +0000 ipv4: ipmr: remove net pointer from struct mfc_cache Now that cache entries in unres_queue don't need to be distinguished by their network namespace pointer anymore, we can remove it from struct mfc_cache add pass the namespace as function argument to the functions that need it. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e258beb22f4d3ea3dc88586ffc9c990d0eb03380 Author: Patrick McHardy Date: Tue Apr 13 05:03:19 2010 +0000 ipv4: ipmr: move unres_queue and timer to per-namespace data The unres_queue is currently shared between all namespaces. Following patches will additionally allow to create multiple multicast routing tables in each namespace. Having a single shared queue for all these users seems to excessive, move the queue and the cleanup timer to the per-namespace data to unshare it. As a side-effect, this fixes a bug in the seq file iteration functions: the first entry returned is always from the current namespace, entries returned after that may belong to any namespace. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f74e49b5613206fb18468bdc9509a1db746aa01b Author: Patrick McHardy Date: Tue Apr 13 05:03:18 2010 +0000 ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h A following patch will use struct raw_sock to store state for ipmr, so having the definitions in icmp.h doesn't fit very well anymore. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0f87b1dd01b51dc3c789f7a212656a4a87eee1bd Author: Patrick McHardy Date: Tue Apr 13 05:03:17 2010 +0000 net: fib_rules: decouple address families from real address families Decouple the address family values used for fib_rules from the real address families in socket.h. This allows to use fib_rules for code that is not a real address family without increasing AF_MAX/NPROTO. Values up to 127 are reserved for real address families and map directly to the corresponding AF value, values starting from 128 are for other uses. rtnetlink is changed to invoke the AF_UNSPEC dumpit/doit handlers for these families. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 28bb17268b92b0c568f2496e5e631008f9108409 Author: Patrick McHardy Date: Tue Apr 13 05:03:16 2010 +0000 net: fib_rules: set family in fib_rule_hdr centrally All fib_rules implementations need to set the family in their ->fill() functions. Since the value is available to the generic fib_nl_fill_rule() function, set it there. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit d8a566beaa75c6ad5e38cdccf0ea5294323e7866 Author: Patrick McHardy Date: Tue Apr 13 05:03:15 2010 +0000 net: fib_rules: consolidate IPv4 and DECnet ->default_pref() functions. Both functions are equivalent, consolidate them since a following patch needs a third implementation for multicast routing. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6932bf37bed45ce8ed531928b1b0f98162fe6df6 Author: Thomas Gleixner Date: Fri Mar 26 00:06:55 2010 +0000 genirq: Remove IRQF_DISABLED from core code Remove all code which is related to IRQF_DISABLED from the core kernel code. IRQF_DISABLED still exists as a flag, but becomes a NOOP and will be removed after a grace period. That way we can easily revert to the previous behaviour by just restoring the core code. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Alan Cox Cc: Andi Kleen Cc: David Miller Cc: Greg Kroah-Hartman Cc: Arnaldo Carvalho de Melo Cc: Linus Torvalds LKML-Reference: <20100326000405.991244690@linutronix.de> commit e58aa3d2d0cc01ad8d6f7f640a0670433f794922 Author: Ingo Molnar Date: Fri Mar 26 00:06:51 2010 +0000 genirq: Run irq handlers with interrupts disabled Running interrupt handlers with interrupts enabled can cause stack overflows. That has been observed with multiqueue NICs delivering all their interrupts to a single core. We might band aid that somehow by checking the interrupt stacks, but the real safe fix is to run the irq handlers with interrupts disabled. Drivers for whacky hardware still can reenable them in the handler itself, if the need arises. (They do already due to lockdep) The risk of doing this is rather low: - lockdep already enforces this - CONFIG_NOHZ has shaken out the drivers which relied on jiffies updates - time keeping is not longer sensitive to the timer interrupt being delayed Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Alan Cox Cc: Andi Kleen Cc: David Miller Cc: Greg Kroah-Hartman Cc: Arnaldo Carvalho de Melo Cc: Linus Torvalds LKML-Reference: <20100326000405.758579387@linutronix.de> commit ae731f8d0785ccd3380f511bae888933b6562e45 Author: Marc Zyngier Date: Mon Mar 15 22:56:33 2010 +0000 genirq: Introduce request_any_context_irq() Now that we enjoy threaded interrupts, we're starting to see irq_chip implementations (wm831x, pca953x) that make use of threaded interrupts for the controller, and nested interrupts for the client interrupt. It all works very well, with one drawback: Drivers requesting an IRQ must now know whether the handler will run in a thread context or not, and call request_threaded_irq() or request_irq() accordingly. The problem is that the requesting driver sometimes doesn't know about the nature of the interrupt, specially when the interrupt controller is a discrete chip (typically a GPIO expander connected over I2C) that can be connected to a wide variety of otherwise perfectly supported hardware. This patch introduces the request_any_context_irq() function that mostly mimics the usual request_irq(), except that it checks whether the irq level is configured as nested or not, and calls the right backend. On success, it also returns either IRQC_IS_HARDIRQ or IRQC_IS_NESTED. [ tglx: Made return value an enum, simplified code and made the export of request_any_context_irq GPL ] Signed-off-by: Marc Zyngier Cc: LKML-Reference: <927ea285bd0c68934ddae1a47e44a9ba@localhost> Signed-off-by: Thomas Gleixner commit 9c6eb28aca52d562f3ffbaebaa56385df9972a43 Author: Jan Engelhardt Date: Tue Apr 13 15:32:16 2010 +0200 netfilter: ipv6: add IPSKB_REROUTED exclusion to NF_HOOK/POSTROUTING invocation Similar to how IPv4's ip_output.c works, have ip6_output also check the IPSKB_REROUTED flag. It will be set from xt_TEE for cloned packets since Xtables can currently only deal with a single packet in flight at a time. Signed-off-by: Jan Engelhardt Acked-by: David S. Miller [Patrick: changed to use an IP6SKB value instead of IPSKB] Signed-off-by: Patrick McHardy commit 9e50849054a4824f06c66d2b449de21b98e03770 Author: Jan Engelhardt Date: Tue Apr 13 15:28:11 2010 +0200 netfilter: ipv6: move POSTROUTING invocation before fragmentation Patrick McHardy notes: "We used to invoke IPv4 POST_ROUTING after fragmentation as well just to defragment the packets in conntrack immediately afterwards, but that got changed during the netfilter-ipsec integration. Ideally IPv6 would behave like IPv4." This patch makes it so. Sending an oversized frame (e.g. `ping6 -s64000 -c1 ::1`) will now show up in POSTROUTING as a single skb rather than multiple ones. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy commit 7c7145f6acc68100dbdc5d3c5c64fe3af1c99c89 Merge: 92d6b71 0d0fb0f Author: Thomas Gleixner Date: Tue Apr 13 14:12:17 2010 +0200 Merge branch 'linus' into irq/core Reason: Get the upstream IRQF_DISABLED related changes. Signed-off-by: Thomas Gleixner commit 9f93ff5be54108066372d1c4100c515d9d9acc1b Author: Alexey Dobriyan Date: Tue Apr 13 14:09:15 2010 +0200 Restore __ALIGN_MASK() Fix lib/bitmap.c compile failure due to __ALIGN_KERNEL changes. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit c56a3b18475b0f93b484c25162c1379f5aee367a Author: Takashi Iwai Date: Tue Apr 13 12:55:09 2010 +0200 ALSA: Update the documentation for changes of proc files Signed-off-by: Takashi Iwai commit 6a867a395558a7f882d041783e4cdea6744ca2bf Author: John Stultz Date: Tue Apr 6 14:30:51 2010 -0700 time: Remove xtime_cache With the earlier logarithmic time accumulation patch, xtime will now always be within one "tick" of the current time, instead of possibly half a second off. This removes the need for the xtime_cache value, which always stored the time at the last interrupt, so this patch cleans that up removing the xtime_cache related code. This patch also addresses an issue with an earlier version of this change, where xtime_cache was normalizing xtime, which could in some cases be not valid (ie: tv_nsec == NSEC_PER_SEC). This is fixed by handling the edge case in update_wall_time(). Signed-off-by: John Stultz Cc: Petr Titěra LKML-Reference: <1270589451-30773-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 561155110307ad304226a23272244398fa46cbae Author: stephen hemminger Date: Mon Apr 12 07:38:05 2010 +0000 dst: don't inline dst_ifdown The function dst_ifdown is called only two places but in a non- performance critical code path, there is no reason to inline it. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 69d7ce72b926d4ceeacd2b7b9ffcbc37ae4b1c58 Author: Sathya Perla Date: Sun Apr 11 22:35:27 2010 +0000 be2net: clarify promiscuous cmd with a comment The promiscous cmd config code gives an impression that setting a port to promisc mode will unset the other port. This is not the case and is clarified with a comment. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 127aa0e14b3e1f8476c4781facdfac11d5546872 Author: Eric Dumazet Date: Sat Apr 10 22:48:14 2010 +0000 drivers: net: last_rx elimination Network drivers do not have to update last_rx, unless they need it for their private use. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit acbbc07145b919248c410e1852b953d385be5c97 Author: Eric Dumazet Date: Sun Apr 11 06:56:11 2010 +0000 net: uninline skb_bond_should_drop() skb_bond_should_drop() is too big to be inlined. This patch reduces kernel text size, and its compilation time as well (shrinking include/linux/netdevice.h) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 829e0015431537176e38812f88fffe1d3250083e Author: Hans J. Koch Date: Tue Apr 13 00:03:25 2010 +0000 Fix some #includes in CAN drivers (rebased for net-next-2.6) In the current implementation, CAN drivers need to #include _before_ they #include , which is both ugly and unnecessary. Fix this by including in and remove the #include lines from drivers. Signed-off-by: Hans J. Koch Signed-off-by: David S. Miller commit 5e10d4a7fc80e4ef310c07a6a547406fef50534a Author: Florian Fainelli Date: Fri Apr 9 01:04:52 2010 +0000 bcm63xx_enet: do not overwrite ENET_CTL_REG value bcm_enet_hw_preinit will correctly set values in ENET_CTL_REG for internal or external MII operations, however, bcm_enet_open will blindly overwrite the ENET_CTL_REG register value and thus we will loose any changes to it that were made in bcm_enet_hw_preinit, rendering external MII operations non-working. This would lead to the driver not being able to check for link availability on external PHY setups, and thus we would never get to sending packets because link was down from the driver side. This was completely un-noticed because all boards out there but BCM6338-based ones use internal phy on their enet0 interface. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 0de8655ab9181cbaca82aa60402b14118e06d030 Author: Florian Fainelli Date: Fri Apr 9 01:04:45 2010 +0000 PHY: fix typo in bcm63xx PHY driver table Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 18d777a5bcf31491021f527d32b72dd16f911fe0 Author: David S. Miller Date: Tue Apr 13 03:07:17 2010 -0700 chelsio: Fix build warning. GCC warns that: drivers/net/chelsio/sge.c:463:11: warning: operation on 's->port' may be undefined Better to eliminate the side effects in the calculation and express what was intended here. Signed-off-by: David S. Miller commit 02f4865fa415a87de28cc8c2e4d798ff46be1cf8 Author: Takashi Iwai Date: Tue Apr 13 11:49:04 2010 +0200 ALSA: core - Define llseek fops Set no_llseek to llseek file ops of each sound component (but for hwdep). This avoids the implicit BKL invocation via generic_file_llseek() used as default when fops.llseek is NULL. Also call nonseekable_open() at each open ops to ensure the file flags have no seek bit. Signed-off-by: Takashi Iwai commit 73029e0ff18dfac8a1aab1dc188e1e150bbe3adc Author: Takashi Iwai Date: Tue Apr 13 11:39:47 2010 +0200 ALSA: info - Implement common llseek for binary mode The llseek implementation is identical for existing driver implementations, so let's merge to the common layer. The same code for the text proc file can be used even for the binary proc file. The driver can provide its own llseek method if needed. Then the common code will be skipped. Signed-off-by: Takashi Iwai commit d97e1b78239c7e7e441088e0b644bd3b076002e6 Author: Takashi Iwai Date: Tue Apr 13 11:33:54 2010 +0200 ALSA: info - Check file position validity in common layer Check the validity of the file position in the common info layer before calling read or write callbacks in assumption that entry->size is set up properly to indicate the max file size. Removed the redundant checks from the callbacks as well. Signed-off-by: Takashi Iwai commit 6f59d6604d9361ef53a7721fb8aa1687ad6f8448 Author: Jesse Brandeburg Date: Fri Apr 9 10:51:09 2010 +0000 e1000e: use static params to save stack space used a modified checkstack to get the 56 number (normally checkstack wouldn't show this low a value) checkstack before: 0x0000012f e1000e_check_options [e1000e]: 272 after: 0x0000012f e1000e_check_options [e1000e]: 56 Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit cd58950a5345f006a318f178705b9250aa54425c Author: Alexander Duyck Date: Fri Apr 9 10:01:37 2010 +0000 skbuff: remove unused dev_consume_skb macro definition dev_consume_skb and kfree_skb_clean have no users and in the case of kfree_skb_clean could cause potential build issues since I cannot find where it is defined. Based on the patch in which it was introduced it appears to have been a bit of leftover code from an earlier version of the patch in which kfree_skb_clean was dropped in favor of consume_skb. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1b6e66182dab42c42bdac72633dbe35b3dba8f69 Author: Alexander Duyck Date: Fri Apr 9 09:53:08 2010 +0000 igb: modify register test for i350 to reflect read only bits in RDLEN/TDLEN The registers for RDLEN/TDLEN on i350 have the first 7 bits as read only. This is a change from previous hardware in which it was only the first 4 bits that were read only. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 24e4a1211f691fc671de44685430dbad757d8487 Author: Takashi Iwai Date: Tue Apr 13 11:22:01 2010 +0200 ALSA: info - Use standard types for info callbacks Use loff_t, size_t and ssize_t for arguments of info callbacks to follow the standard procfs. Signed-off-by: Takashi Iwai commit c755b4b625b183d3cfc3f3ab0b2d5b7e659efaf3 Author: FUJITA Tomonori Date: Mon Apr 12 14:32:10 2010 +0000 myri10ge: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Cc: Andrew Gallatin Cc: Brice Goglin Signed-off-by: David S. Miller commit 64b9b41de87e86129d055a584ee9e16bce97573a Author: FUJITA Tomonori Date: Mon Apr 12 14:32:14 2010 +0000 qlge: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Cc: Ron Mercer Signed-off-by: David S. Miller commit 56e3b9df1376fa865ae929909b02f6840207520f Author: FUJITA Tomonori Date: Mon Apr 12 14:32:12 2010 +0000 cxgb3: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Cc: Divy Le Ray Signed-off-by: David S. Miller commit 094f92a61aa044142c231e04c35c00a9cc70adbc Author: FUJITA Tomonori Date: Mon Apr 12 14:32:11 2010 +0000 chelsio: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Cc: Divy Le Ray Signed-off-by: David S. Miller commit 87196eb740f3f73105a5c13bbf7651b4b60daec1 Author: FUJITA Tomonori Date: Mon Apr 12 14:32:13 2010 +0000 qla3xxx: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Cc: Ron Mercer Signed-off-by: David S. Miller commit 4e5e4f0d65975ce092202cce48b42571bf84591e Author: FUJITA Tomonori Date: Mon Apr 12 14:32:09 2010 +0000 tg3: use the DMA state API instead of the pci equivalents This replace the PCI DMA state API (include/linux/pci-dma.h) with the DMA equivalents since the PCI DMA state API will be obsolete. No functional change. For further information about the background: http://marc.info/?l=linux-netdev&m=127037540020276&w=2 Signed-off-by: FUJITA Tomonori Cc: Matt Carlson Cc: Michael Chan Signed-off-by: David S. Miller commit e26c28e8bffe12b27df5b828404afed9e1949191 Author: Bart De Schuymer Date: Tue Apr 13 11:41:39 2010 +0200 netfilter: bridge-netfilter: update a comment in br_forward.c about ip_fragment() ip_refrag isn't used anymore in the bridge-netfilter code Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit 8237908e145b84d4b020790df0f9315d2f71e980 Author: Bart De Schuymer Date: Tue Apr 13 11:40:41 2010 +0200 netfilter: bridge-netfilter: cleanup br_netfilter.c bridge-netfilter: cleanup br_netfilter.c - remove some of the graffiti at the head of br_netfilter.c - remove __br_dnat_complain() - remove KERN_INFO messages when CONFIG_NETFILTER_DEBUG is defined Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit 8595805aafc8b077e01804c9a3668e9aa3510e89 Author: stephen hemminger Date: Mon Apr 12 05:41:34 2010 +0000 IPv6: only notify protocols if address is compeletely gone The notifier for address down should only be called if address is completely gone, not just being marked as tentative on link transistion. The code in net-next would case bonding/sctp/s390 to see address disappear on link down, but they would never see it reappear on link up. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d1f84c63a465d6ba16955930519b7f68c550cae1 Author: stephen hemminger Date: Mon Apr 12 05:41:33 2010 +0000 ipv6: additional ref count for hash list unnecessary Since an address in hash list has to already have a ref count, no additional ref count is needed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 27bdb2abcc5edb3526e25407b74bf17d1872c329 Author: stephen hemminger Date: Mon Apr 12 05:41:32 2010 +0000 IPv6: keep tentative addresses in hash table When link goes down, want address to be preserved but in a tentative state, therefore it has to stay in hash list. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 93fa159abe50d3c55c7f83622d3f5c09b6e06f4b Author: stephen hemminger Date: Mon Apr 12 05:41:31 2010 +0000 IPv6: keep route for tentative address Recent changes preserve IPv6 address when link goes down (good). But would cause address to point to dead dst entry (bad). The simplest fix is to just not delete route if address is being held for later use. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3941f1885bbf5b9f5e45cdd5a82efc794cc3823f Author: Matt Carlson Date: Mon Apr 12 06:58:31 2010 +0000 tg3: Update version to 3.110 This patch updates the tg3 version to 3.110. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit de6f31eb9a467cfd0f1f8c5e6ca842563f7f2870 Author: Matt Carlson Date: Mon Apr 12 06:58:30 2010 +0000 tg3: Remove function errors flagged by checkpatch This patch removes the following checkpatch errors: * return is not a function, parentheses are not required * space prohibited between function name and open parenthesis '(' Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 04380d401ebd02ec68bb0fc170f21a93690ebc80 Author: Matt Carlson Date: Mon Apr 12 06:58:29 2010 +0000 tg3: Unify max pkt size preprocessor constants The maximum packet size that gets programmed into the standard producer ring control block is directly related to the packet size used to allocate packet buffers. This patch removes the redundant preprocessor constant. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 9dc7a1134919bda8951bf5909fb79c14defb8317 Author: Matt Carlson Date: Mon Apr 12 06:58:28 2010 +0000 tg3: Re-inline VLAN tags when appropriate The tg3 driver is written so that VLAN tagged packets can be accepted, even if CONFIG_VLAN_8021Q or CONFIG_VLAN_8021Q_MODULE is not defined. (Think raw interfaces.) If the device has ASF support enabled, the firmware requires the driver to enable VLAN tag stripping. If VLAN tagging is not explicitly supported by the kernel and ASF is enabled, the driver will have to reinject the VLAN tag back into the packet stream. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit d2757fc4076118e13180e91f02c3c52659be3d9d Author: Matt Carlson Date: Mon Apr 12 06:58:27 2010 +0000 tg3: Optimize rx double copy test On a PCIX bus, the 5701 has a bug which requires the driver to double copy all rx packets. The rx code uses the rx_offset device member as a flag to determine if this workaround should take effect. The following patch will modify the rx_offset member such that this test will become less clear. The patch starts by integrating the workaround check into the packet length check. It rounds out the implementation by relaxing the workaround restrictions if the platform has efficient unaligned accesses. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit a977dbe8445b8a81d6127c4aa9112a2c29a1a008 Author: Matt Carlson Date: Mon Apr 12 06:58:26 2010 +0000 tg3: Reduce 57765 core clock when link at 10Mbps This patch reduces the core clock to 6.25MHz when operating at 10Mbps link speed. This is needed to prevent a bug that will ultimately cause transmits to cease. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 1a3190254c0d1d1951e1d7e93542387c6ec82384 Author: Matt Carlson Date: Mon Apr 12 06:58:25 2010 +0000 tg3: Set card 57765 card reader MRRS to 1024B This patch sets the Maximum Read Request Size for the card reader function to 1024 bytes to prevent an SD controller lockup. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit cea46462681d61a65a208d17206d38739c1ea1b1 Author: Matt Carlson Date: Mon Apr 12 06:58:24 2010 +0000 tg3: Disable CLKREQ in L2 This patch disables CLKREQ in L2 to workaround a chipset bug. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 22068311b62858ea7eb71653a07564fd73d7a9b0 Author: Zhitong Wang Date: Tue Apr 13 11:25:41 2010 +0200 netfilter: fix some coding styles and remove moduleparam.h Fix some coding styles and remove moduleparam.h Signed-off-by: Zhitong Wang Signed-off-by: Patrick McHardy commit 067e4a5d23422c9e9a0787b7e18fa2457226d999 Merge: 0d0fb0f 4cf19b8 Author: Takashi Iwai Date: Tue Apr 13 11:24:34 2010 +0200 Merge branch 'topic/bkl' into topic/core-cleanup commit a79ff731a1b277d0e92d9453bdf374e04cec717a Author: Alexey Dobriyan Date: Tue Apr 13 11:21:46 2010 +0200 netfilter: xtables: make XT_ALIGN() usable in exported headers by exporting __ALIGN_KERNEL() XT_ALIGN() was rewritten through ALIGN() by commit 42107f5009da223daa800d6da6904d77297ae829 "netfilter: xtables: symmetric COMPAT_XT_ALIGN definition". ALIGN() is not exported in userspace headers, which created compile problem for tc(8) and will create problem for iptables(8). We can't export generic looking name ALIGN() but we can export less generic __ALIGN_KERNEL() (suggested by Ben Hutchings). Google knows nothing about __ALIGN_KERNEL(). COMPAT_XT_ALIGN() changed for symmetry. Reported-by: Andreas Henriksson Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy commit 96d9e9c039cf94280ba80b8d64714279cb6d26dd Merge: 68c7ccb b68b58f Author: Takashi Iwai Date: Tue Apr 13 11:14:43 2010 +0200 Merge branch 'fix/misc' into topic/misc commit b6c6712a42ca3f9fa7f4a3d7c40e3a9dd1fd9e03 Author: Eric Dumazet Date: Thu Apr 8 23:03:29 2010 +0000 net: sk_dst_cache RCUification With latest CONFIG_PROVE_RCU stuff, I felt more comfortable to make this work. sk->sk_dst_cache is currently protected by a rwlock (sk_dst_lock) This rwlock is readlocked for a very small amount of time, and dst entries are already freed after RCU grace period. This calls for RCU again :) This patch converts sk_dst_lock to a spinlock, and use RCU for readers. __sk_dst_get() is supposed to be called with rcu_read_lock() or if socket locked by user, so use appropriate rcu_dereference_check() condition (rcu_read_lock_held() || sock_owned_by_user(sk)) This patch avoids two atomic ops per tx packet on UDP connected sockets, for example, and permits sk_dst_lock to be much less dirtied. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7a161ea92471087a1579239d7a58dd06eaa5601c Author: Eric Dumazet Date: Thu Apr 8 21:26:13 2010 +0000 net: Dont use netdev_warn() Dont use netdev_warn() in dev_cap_txqueue() and get_rps_cpu() so that we can catch following warnings without crash. bond0.2240 received packet on queue 6, but number of RX queues is 1 bond0.2240 received packet on queue 11, but number of RX queues is 1 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f0ee7acfcdd4169cee2fefc630de72deb5bc34b9 Author: Manfred Rudigier Date: Thu Apr 8 23:10:35 2010 +0000 gianfar: Add hardware TX timestamping support If a packet has the skb_shared_tx->hardware flag set the device is instructed to generate a TX timestamp and write it back to memory after the frame is transmitted. During the clean_tx_ring operation the timestamp will be extracted and copied into the skb_shared_hwtstamps struct of the skb. TX timestamping is enabled by setting the tx_type to something else than HWTSTAMP_TX_OFF with the SIOCSHWTSTAMP ioctl command. It is only supported by eTSEC devices. Signed-off-by: Manfred Rudigier Signed-off-by: David S. Miller commit cc772ab7cdcaa24d1fae332d92a1602788644f7a Author: Manfred Rudigier Date: Thu Apr 8 23:10:03 2010 +0000 gianfar: Add hardware RX timestamping support The device is configured to insert hardware timestamps into all received packets. The RX timestamps are extracted from the padding alingment bytes during the clean_rx_ring operation and copied into the skb_shared_hwtstamps struct of the skb. This extraction only happens if the rx_filter was set to something else than HWTSTAMP_FILTER_NONE with the SIOCSHWTSTAMP ioctl command. Hardware timestamping is only supported for eTSEC devices. To indicate device support the new FSL_GIANFAR_DEV_HAS_TIMER flag was introduced. Signed-off-by: Manfred Rudigier Signed-off-by: David S. Miller commit e44171f115de3dedf34064646206deb91549865f Author: John Linn Date: Thu Apr 8 07:08:02 2010 +0000 Add non-Virtex5 support for LL TEMAC driver This patch adds support for using the LL TEMAC Ethernet driver on non-Virtex 5 platforms by adding support for accessing the Soft DMA registers as if they were memory mapped instead of solely through the DCR's (available on the Virtex 5). The patch also updates the driver so that it runs on the MicroBlaze. The changes were tested on the PowerPC 440, PowerPC 405, and the MicroBlaze platforms. Signed-off-by: John Tyner Signed-off-by: John Linn Acked-by: Grant Likely Signed-off-by: David S. Miller commit 33646d7ff5f47225cbbf3a06597ded649bf34e8d Author: John Linn Date: Thu Apr 8 07:08:01 2010 +0000 net: ll_temac: remove virt_to_bus call The virt_to_bus call should not be used any longer as it's considered illegal. The driver has the physical address of the buffer in the descriptor such that it's not necessary anyway. Signed-off-by: John Linn Acked-by: Grant Likely Signed-off-by: David S. Miller commit ed85b565b825566da34e55eee9ad150ed93fdda0 Author: Richard Cochran Date: Wed Apr 7 22:41:28 2010 +0000 packet: support for TX time stamps on RAW sockets Enable the SO_TIMESTAMPING socket infrastructure for raw packet sockets. We introduce PACKET_TX_TIMESTAMP for the control message cmsg_type. Similar support for UDP and CAN sockets was added in commit 51f31cabe3ce5345b51e4a4f82138b38c4d5dc91 Signed-off-by: Richard Cochran Signed-off-by: David S. Miller commit 7d53b80980a598836c56517290b29aa7b0766ef8 Author: Florian Fainelli Date: Wed Apr 7 21:39:27 2010 +0000 r6040: use (dev|netdev)_ macros helpers Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 82e381775f6da6b29ae625e73a2ea18844eb4825 Author: Matthias Fuchs Date: Wed Apr 7 01:09:56 2010 +0000 can: Add esd board support to plx_pci CAN driver This patch adds support for SJA1000 based PCI CAN interface cards from electronic system design gmbh. Some changes have been done on the common code: - esd boards must not have the 2nd local interupt enabled (PLX9030/9050) - a new path for PLX9056/PEX8311 chips has been added - new plx9056 reset function has been implemented - struct plx_card_info got a reset function entry In detail the following additional boards are now supported: CAN-PCI/200 (PCI) CAN-PCI/266 (PCI) CAN-PMC266 (PMC module) CAN-PCIe/2000 (PCI Express) CAN-CPCI/200 (Compact PCI, 3U) CAN-PCI104 (PCI104) Signed-off-by: Matthias Fuchs Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 43b8774dc409ea5d9369b978e2e7bc79289f0522 Author: Paul Mundt Date: Tue Apr 13 14:43:03 2010 +0900 sh: intc: userimask support. This adds support for hardware-assisted userspace irq masking for special priority levels. Due to the SR.IMASK interactivity, only some platforms implement this in hardware (including but not limited to SH-4A interrupt controllers, and ARM-based SH-Mobile CPUs). Each CPU needs to wire this up on its own, for now only SH7786 is wired up as an example. Signed-off-by: Paul Mundt commit 12129fea50edcd696a9556523b058d6c445f21d8 Author: Paul Mundt Date: Tue Apr 13 13:49:54 2010 +0900 sh: intc: Tidy up loglevel mismatches. The printk loglevels are all over the place, make them a bit more coherent, and add some registration notification while we're at it. Signed-off-by: Paul Mundt commit 0ded75428605213641897d6b8d8e9cf9fdb6eb8d Author: Paul Mundt Date: Tue Apr 13 10:16:34 2010 +0900 sh: intc: Provide sysdev name for intc controllers. Presently the sysdevs are simply numbered based on the list position, without having any direct way of figuring out which controller these are actually mapping to. This provides a name attr for mapping out the chip name. Signed-off-by: Paul Mundt commit 050d4cc7029b73997d6821d89487b1f777d4873c Author: Paul Mundt Date: Tue Apr 13 10:15:56 2010 +0900 sh: dmaengine support for SH7786 DMAC0. Hook up DMAC0 on SH7786. Signed-off-by: Paul Mundt commit cc78e904bd960196233e2cd6a49068bba8787527 Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:15 2010 +0200 rt2x00: Add rt3390 support in rt2800 register initialization. Add RT3390 specific register initializations to rt2x00, based on the latest Ralink rt3390 vendor driver. Untested as I don't actually own an RT3390 based device, but given experiences on rt3070/rt3071 very hopeful that this will actually work.. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 64522957ce35df995dfd73bee548304f2a39cc3e Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:14 2010 +0200 rt2x00: Add rt3090 support in rt2800 register initialization. Add RT3090 specific register initializations to rt2x00, based on the latest Ralink rt3090 vendor driver. Untested as I don't actually own an RT3090 based device, but given experiences on rt3070/rt3071 very hopeful that this will actually work.. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit d5385bfc59c737d1eae77cc48d662daf4ddddae8 Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:13 2010 +0200 rt2x00: Add rt3071 support in rt2800 register initialization. Add RT3071 specific register initializations to rt2x00, based on the latest Ralink rt3070 vendor driver. With this patch my RT3071 based devices start showing a sign of life. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8cdd15e0063edbe002945ba93faf80e79c947610 Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:12 2010 +0200 rt2x00: Finish rt3070 support in rt2800 register initialization. rt2x00 had preliminary support for RT3070 based devices, but the support was incomplete. Update the RT3070 register initialization to be similar to the latest Ralink vendor driver. With this patch my rt3070 based devices start showing a sign of life. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit a9dce1494af33534867b8c7fab7351274fd651ca Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:11 2010 +0200 rt2x00: Align rt2800 register initialization with vendor driver. Align the rt2800 register initializations with the latest versions of the Ralink vendor driver. This patch is also preparation for the addition of support for RT3070 / RT3071 / RT3090 / RT3390 based devices. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8d0c9b65c904c6943566ccd2919c6a5ee6292c6b Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:10 2010 +0200 rt2x00: Refactor rt2800 version constants. The rt2800 version constants are inconsistent, and the version number don't mean a lot of things anyway. Refactor the constants to have some more meaningful names, and introduce and use some new helpers to check these chipset revisions. At the same time rename to revision, as they are more revision numbers rather than version numbers. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit e148b4c82a6269aa19476e4865afe8aa84360c8f Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:09 2010 +0200 rt2x00: Align RT chipset definitions with vendor driver. Only include definitions for RT chipsets that are also used inside the Ralink vendor drivers. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit fab799c3b275a207215dfef91c0ac716f12c8727 Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:08 2010 +0200 rt2x00: Update rt2800 register definitions towards latest definitions. Definitions taken from the latest rt2860 / rt2870 / rt3070 / rt3090 Ralink vendor drivers. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 06855ef4c8cf3d86d831c6317ca6a3563d271350 Author: Gertjan van Wingerde Date: Sun Apr 11 14:31:07 2010 +0200 rt2x00: Let RF chipset decide the RF channel switch method to use in rt2800. It seems that the distinction between RF channel switch method is solely based on the RF chipset that is used. Refactor the channel switch decision to just take the RF chipset into account, thereby greatly simplifying the check. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5988f385b4cffa9ca72c5be0188e5f4c9ef46d82 Author: Quintin Pitts Date: Fri Apr 9 21:37:38 2010 +0200 p54pci: prevent stuck rx-ring on slow system This patch fixes an old problem, which - under certain circumstances - could cause the device to become unresponsive. most of p54pci's rx-ring management is implemented in just two distinct standalone functions. p54p_check_rx_ring takes care of processing incoming data, while p54p_refill_rx_ring tries to replenish all depleted communication buffers. This has always worked fine on my fast machine, but now I know there is a hidden race... The most likely candidate here is ring_control->device_idx. Quintin Pitts had already analyzed the culprit and posted a patch back in Oct 2009. But sadly, no one's picked up on this. ( https://patchwork.kernel.org/patch/53079/ [2 & 3] ). This patch does the same way, except that it also prioritize rx data processing, simply because tx routines *can* wait. Reported-by: Sean Young Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=11386 Reported-by: Quintin Pitts Signed-off-by: Quintin Pitts Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit b1f90866fb3a329b1c4ebfff93ae9c110943e50a Merge: 68dd5b7 470058e Author: John W. Linville Date: Mon Apr 12 15:20:53 2010 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit d21e0f4cd16656f71207683ee27465600ad21625 Author: Marek Vasut Date: Mon Apr 5 06:13:38 2010 +0200 ASoC: Zipit Z2 WM8750 ASoC driver This patch adds support for sound through the WM8750 codec on Zipit Z2. Also, this patch incorporates support for detecting headset jack insertion through the jack detection API. Signed-off-by: Marek Vasut Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e135443e2133473f44aa439ad333554dad14c21a Author: Bill Gatliff Date: Fri Apr 9 18:08:08 2010 +0100 ASoC: Use SNDRV_PCM_RATE_8000_96000 macro for WM8731 Signed-off-by: Bill Gatliff Acked-by: Richard Purdie Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 05b90496f2f366b9d3eea468351888ddf010782a Author: Eric Paris Date: Wed Apr 7 15:15:25 2010 -0400 security: remove dead hook acct Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 3011a344cdcda34cdbcb40c3fb3d1a6e89954abb Author: Eric Paris Date: Wed Apr 7 15:15:19 2010 -0400 security: remove dead hook key_session_to_parent Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 6307f8fee295b364716d28686df6e69c2fee751a Author: Eric Paris Date: Wed Apr 7 15:15:13 2010 -0400 security: remove dead hook task_setgroups Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 06ad187e280e725e356c62c3a30ddcd01564f8be Author: Eric Paris Date: Wed Apr 7 15:15:08 2010 -0400 security: remove dead hook task_setgid Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 43ed8c3b4573d5f5cd314937fee63b4ab046ac5f Author: Eric Paris Date: Wed Apr 7 15:15:02 2010 -0400 security: remove dead hook task_setuid Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 0968d0060a3c885e53d453380266c7792a55d302 Author: Eric Paris Date: Wed Apr 7 15:14:56 2010 -0400 security: remove dead hook cred_commit Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 9d5ed77dadc66a72b40419c91df942adfa55a102 Author: Eric Paris Date: Wed Apr 7 15:14:50 2010 -0400 security: remove dead hook inode_delete Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 91a9420f5826db482030c21eca8c507271bbc441 Author: Eric Paris Date: Wed Apr 7 15:14:45 2010 -0400 security: remove dead hook sb_post_pivotroot Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 3db291017753e539af64c8bab373785f34e43ed2 Author: Eric Paris Date: Wed Apr 7 15:14:39 2010 -0400 security: remove dead hook sb_post_addmount Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 82dab10453d65ad9ca551de5b8925673ca05c7e9 Author: Eric Paris Date: Wed Apr 7 15:14:33 2010 -0400 security: remove dead hook sb_post_remount Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 4b61d12c84293ac061909f27f567c1905e4d90e3 Author: Eric Paris Date: Wed Apr 7 15:14:27 2010 -0400 security: remove dead hook sb_umount_busy Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 231923bd0e06cba69f7c2028f4a68602b8d22160 Author: Eric Paris Date: Wed Apr 7 15:14:21 2010 -0400 security: remove dead hook sb_umount_close Unused hook. Remove. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 353633100d8d684ac0acae4ce93fb833f92881f4 Author: Eric Paris Date: Wed Apr 7 15:14:15 2010 -0400 security: remove sb_check_sb hooks Unused hook. Remove it. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 2e8e18ef52e7dd1af0a3bd1f7d990a1d0b249586 Author: David S. Miller Date: Thu Apr 8 11:32:30 2010 -0700 tcp: Set CHECKSUM_UNNECESSARY in tcp_init_nondata_skb Back in commit 04a0551c87363f100b04d28d7a15a632b70e18e7 ("loopback: Drop obsolete ip_summed setting") we stopped setting CHECKSUM_UNNECESSARY in the loopback xmit. This is because such a setting was a lie since it implies that the checksum field of the packet is properly filled in. Instead what happens normally is that CHECKSUM_PARTIAL is set and skb->csum is calculated as needed. But this was only happening for TCP data packets (via the skb->ip_summed assignment done in tcp_sendmsg()). It doesn't happen for non-data packets like ACKs etc. Fix this by setting skb->ip_summed in the common non-data packet constructor. It already is setting skb->csum to zero. But this reminds us that we still have things like ip_output.c's ip_dev_loopback_xmit() which sets skb->ip_summed to the value CHECKSUM_UNNECESSARY, which Herbert's patch teaches us is not valid. So we'll have to address that at some point too. Signed-off-by: David S. Miller commit bb29624614c2afe2873ee8ee97cf09df42701694 Author: Herbert Xu Date: Sun Apr 11 02:15:55 2010 +0000 inet: Remove unused send_check length argument inet: Remove unused send_check length argument This patch removes the unused length argument from the send_check function in struct inet_connection_sock_af_ops. Signed-off-by: Herbert Xu Tested-by: Yinghai Signed-off-by: David S. Miller commit 8ad50d96db58c58ba67ec1c6f9d3dae0db52338a Author: Herbert Xu Date: Sun Apr 11 02:15:54 2010 +0000 tcp: Handle CHECKSUM_PARTIAL for SYNACK packets for IPv6 tcp: Handle CHECKSUM_PARTIAL for SYNACK packets for IPv6 This patch moves the common code between tcp_v6_send_check and tcp_v6_gso_send_check into a new function __tcp_v6_send_check. It then uses the new function in tcp_v6_send_synack as well as tcp_v6_send_response so that they handle CHECKSUM_PARTIAL properly. Signed-off-by: Herbert Xu Tested-by: Yinghai Signed-off-by: David S. Miller commit 419f9f896074ce8b21e88066e6f3515f18e5641c Author: Herbert Xu Date: Sun Apr 11 02:15:53 2010 +0000 tcp: Handle CHECKSUM_PARTIAL for SYNACK packets for IPv4 tcp: Handle CHECKSUM_PARTIAL for SYNACK packets for IPv4 This patch moves the common code between tcp_v4_send_check and tcp_v4_gso_send_check into a new function __tcp_v4_send_check. It then uses the new function in tcp_v4_send_synack so that it handles CHECKSUM_PARTIAL properly. Signed-off-by: Herbert Xu Tested-by: Yinghai Signed-off-by: David S. Miller commit 871039f02f8ec4ab2e5e9010718caa8e085786f1 Merge: e4077e0 4a1032f Author: David S. Miller Date: Sun Apr 11 14:53:53 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c commit 27762b2ce16d5c6f7bc8ab1aad1b9179076f997a Merge: 7b7b904 29aac00 Author: Takashi Iwai Date: Sat Apr 10 21:34:56 2010 +0200 Merge branch 'fix/misc' into topic/usb commit 5534ecb2dda04345e8243901e0e49599228b4273 Author: Arnd Bergmann Date: Sat Feb 27 19:49:37 2010 +0100 ptrace: kill BKL in ptrace syscall The comment suggests that this usage is stale. There is no bkl in the exec path so if there is a race lurking there, the bkl in ptrace is not going to help in this regard. Overview of the possibility of "accidental" races this bkl might protect: - ptrace_traceme() is protected against task removal and concurrent read/write on current->ptrace as it locks write tasklist_lock. - arch_ptrace_attach() is serialized by ptrace_traceme() against concurrent PTRACE_TRACEME or PTRACE_ATTACH - ptrace_attach() is protected the same way ptrace_traceme() and in turn serializes arch_ptrace_attach() - ptrace_check_attach() does its own well described serializing too. There is no obvious race here. Signed-off-by: Arnd Bergmann Signed-off-by: Frederic Weisbecker Acked-by: Oleg Nesterov Acked-by: Roland McGrath Cc: Andrew Morton Cc: Roland McGrath commit 6dad2a29646ce3792c40cfc52d77e9b65a7bb143 Author: Borislav Petkov Date: Wed Mar 31 21:56:46 2010 +0200 cpufreq: Unify sysfs attribute definition macros Multiple modules used to define those which are with identical functionality and were needlessly replicated among the different cpufreq drivers. Push them into the header and remove duplication. Signed-off-by: Borislav Petkov LKML-Reference: <1270065406-1814-7-git-send-email-bp@amd64.org> Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit 679370641e3675633cad222449262abbe93a4a2a Author: Mark Langsdorf Date: Wed Mar 31 21:56:45 2010 +0200 powernow-k8: Fix frequency reporting With F10, model 10, all valid frequencies are in the ACPI _PST table. Cc: # 33.x 32.x Signed-off-by: Mark Langsdorf LKML-Reference: <1270065406-1814-6-git-send-email-bp@amd64.org> Signed-off-by: Borislav Petkov Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit a2fed573f065e526bfd5cbf26e5491973d9e9aaa Author: Mark Langsdorf Date: Thu Mar 18 18:41:46 2010 +0100 x86, cpufreq: Add APERF/MPERF support for AMD processors Starting with model 10 of Family 0x10, AMD processors may have support for APERF/MPERF. Add support for identifying it and using it within cpufreq. Move the APERF/MPERF functions out of the acpi-cpufreq code and into their own file so they can easily be shared. Signed-off-by: Mark Langsdorf LKML-Reference: <20100401141956.GA1930@aftab> Signed-off-by: Borislav Petkov Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit d65ad45cd82a0db9544469b8c54f5dc5cafbb2d8 Author: Borislav Petkov Date: Wed Mar 31 21:56:43 2010 +0200 x86: Unify APERF/MPERF support Initialize this CPUID flag feature in common code. It could be made a standalone function later, maybe, if more functionality is duplicated. Signed-off-by: Borislav Petkov LKML-Reference: <1270065406-1814-4-git-send-email-bp@amd64.org> Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit 73860c6b2fd159a35637e233d735e36887c266ad Author: Borislav Petkov Date: Wed Mar 31 21:56:42 2010 +0200 powernow-k8: Add core performance boost support Starting with F10h, revE, AMD processors add support for a dynamic core boosting feature called Core Performance Boost. When a specific condition is present, a subset of the cores on a system are boosted beyond their P0 operating frequency to speed up the performance of single-threaded applications. In the normal case, the system comes out of reset with core boosting enabled. This patch adds a sysfs knob with which core boosting can be switched on or off for benchmarking purposes. While at it, make the CPB code hotplug-aware so that taking cores offline wouldn't interfere with boosting the remaining online cores. Furthermore, add cpu_online_mask hotplug protection as suggested by Andrew. Finally, cleanup the driver init codepath and update copyrights. Signed-off-by: Borislav Petkov LKML-Reference: <1270065406-1814-3-git-send-email-bp@amd64.org> Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit 5958f1d5d722df7a9e5d129676614a8e5219bacd Author: Borislav Petkov Date: Wed Mar 31 21:56:41 2010 +0200 x86, cpu: Add AMD core boosting feature flag to /proc/cpuinfo By semi-popular demand, this adds the Core Performance Boost feature flag to /proc/cpuinfo. Possible use case for this is userspace tools like cpufreq-aperf, for example, so that they don't have to jump through hoops of accessing "/dev/cpu/%d/cpuid" in order to check for CPB hw support, or call cpuid from userspace. Signed-off-by: Borislav Petkov LKML-Reference: <1270065406-1814-2-git-send-email-bp@amd64.org> Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin commit 470058e0ad82fcfaaffd57307d8bf8c094e8e9d7 Author: Zhu Yi Date: Fri Apr 2 13:38:54 2010 -0700 iwlwifi: avoid Tx queue memory allocation in interface down We used to free all the Tx queues memory when interface is brought down and reallocate them again in interface up. This requires order-4 allocation for txq->cmd[]. In situations like s2ram, this usually leads to allocation failure in the memory subsystem. The patch fixed this problem by allocating the Tx queues memory only at the first time. Later iwl_down/iwl_up only initialize but don't free and reallocate them. The memory is freed at the device removal time. BTW, we have already done this for the Rx queue. This fixed bug https://bugzilla.kernel.org/show_bug.cgi?id=15551 Signed-off-by: Zhu Yi Acked-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 57e40d36e59f828f43d60b2662041991dcd78044 Author: Wey-Yi Guy Date: Tue Mar 9 15:36:10 2010 -0800 iwlwifi: fix compiler warning Check return code on iwl_send_cmd_pdu() to get rid of compiler warning. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit f875f5183b8f511161eddcbb4e9a1aada33d4aaf Author: Reinette Chatre Date: Mon Apr 5 10:43:10 2010 -0700 iwlwifi: fix compile warnings when compiling without debug Fixes: CC [M] drivers/net/wireless/iwlwifi/iwl-agn-rs.o drivers/net/wireless/iwlwifi/iwl-agn-rs.c: In function ‘rs_get_rate’: drivers/net/wireless/iwlwifi/iwl-agn-rs.c:2419: warning: unused variable ‘priv’ CC [M] drivers/net/wireless/iwlwifi/iwl-sta.o drivers/net/wireless/iwlwifi/iwl-sta.c: In function ‘iwl_send_add_sta’: drivers/net/wireless/iwlwifi/iwl-sta.c:197: warning: unused variable ‘sta_id’ drivers/net/wireless/iwlwifi/iwl-3945.c: In function ‘iwl3945_rx_reply_rx’: drivers/net/wireless/iwlwifi/iwl-3945.c:601: warning: unused variable ‘rx_stats_noise_diff’ drivers/net/wireless/iwlwifi/iwl-3945.c:600: warning: unused variable ‘rx_stats_sig_avg’ drivers/net/wireless/iwlwifi/iwl-3945-rs.c: In function ‘rs_get_rate’: drivers/net/wireless/iwlwifi/iwl-3945-rs.c:650: warning: unused variable ‘priv’ Reported-by: Luis R. Rodriguez Signed-off-by: Reinette Chatre commit 4c8d1913ac1baab64080c1030cb94e24cbd9a0f8 Author: Wey-Yi Guy Date: Wed Mar 31 18:16:52 2010 -0700 iwlwifi: small changes in comments REPLY_TX_LINK_QUALITY_CMD was used by 4965, 5000 series and up Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 04569cbe7653fe0057acc46afc07f2c2fd2508b3 Author: Wey-Yi Guy Date: Wed Mar 31 17:57:28 2010 -0700 iwlwifi: update tx command response status Update to include additional tx command response status for "_agn" devices. The following status indicate the transmission was postponed: TX_STATUS_POSTPONE_DELAY TX_STATUS_POSTPONE_FEW_BYTES TX_STATUS_POSTPONE_BT_PRIO TX_STATUS_POSTPONE_QUIET_PERIOD TX_STATUS_POSTPONE_CALC_TTAK Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 461ef382fd68f02b7bac8f94f7f2b85162bad896 Author: Wey-Yi Guy Date: Tue Mar 30 17:57:53 2010 -0700 iwlwifi: add more debug info in error event dump When sys assert happen, driver will dump the error table information provided by uCode. There are more information available but is not being display by the driver; adding program counter and last host command the to log to help uCode debugging. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 05d5752027d02ca9204d1ece5074d41000fee23d Author: Johannes Berg Date: Wed Mar 31 08:59:17 2010 -0700 iwlwifi: clean up last_phy_res The last_phy_res[100] variable is used in an odd way. The first byte of it is used as a flag, and the rest as the data. Thus, the array need only be 61 bytes, since it is just the flag and a struct iwl_rx_phy_res (which is 60 bytes). Clean this up by splitting the variable into two: last_phy_res and last_phy_res_valid, using correct types for both (struct and bool). While doing all this also move the variables to the _agn part of the hw-specific union since they only apply to A-MPDUs. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 76c3c698bf47927fb31044fa2f4321c99ed7411d Author: Johannes Berg Date: Tue Mar 30 02:46:29 2010 -0700 iwlwifi: remove pointless sta_id invalid check lq->sta_id cannot be invalid here since this function will only be called after the station has been added properly. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit a90178fa1dce52816ae9fa4a3ba031886b79c5ae Author: Johannes Berg Date: Tue Mar 30 02:44:16 2010 -0700 iwlagn: simplify WEP key check Simplify the WEP group key check by checking the sta pointer instead of the sta_id we calculate with it; also clean up the comment formatting. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 43a61261d7f571f760611711cd4e6b64ef661ad1 Author: Johannes Berg Date: Tue Mar 30 02:43:05 2010 -0700 iwlwifi: remove wrong key use check Default WEP keys and regular keys are not allocated from the same space in the firmware, so we shouldn't use the same bits to indicate in use. For default WEP keys, however, mac80211 won't allow using the same key index twice, so the check is not necessary at all -- add/remove are perfectly nested due to those checks. Other keys are allocated in the device in a global array that only has a certain number of slots, so for that we need to keep the allocation bitmap; but the 802.11 key index isn't relevant there. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 335348b1702cf78c9e79987a3d66e85a05c98b5c Author: Johannes Berg Date: Tue Mar 30 10:11:46 2010 -0700 iwlwifi: make WEP key restoring explicit The firmware clears default WEP keys on transitions to !associated, so we need to restore them just like stations. This is rather implicit as part of sending a station right now, which is odd. Make it explicit instead and only for agn since 3945 doesn't use hw crypto for WEP. Due to that, iwl_send_static_wepkey_cmd is now only used in iwl-sta.c and can be static. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 678b385d07835c6c21371c12eaaa3fba4de05168 Author: Wey-Yi Guy Date: Fri Mar 26 12:54:37 2010 -0700 iwlwifi: default max event log size Size of event log is determined by uCode which is different per NICs. Set the maximum event log size per device to better match uCode configuration. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 68dd5b7a45d1935fcd32b786e8d3d3f7bb4bbfe7 Author: Teemu Paasikivi Date: Fri Apr 9 13:07:55 2010 +0300 mac80211: check whether scan is in progress before queueing scan_work As scan_work is queued from work_work it needs to be checked if scan has been started during execution of work_work. Otherwise, when hw scan is used, the stack gets error about hw being busy with ongoing scan. This causes the stack to abort scan without notifying the driver about it. This leads to a situation where the hw is scanning and the stack thinks it's not. Then when the scan finishes, the stack will complain by warnings. Signed-off-by: Teemu Paasikivi Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 00236aedf1d2c49a18ae9ea00698d97705ff7289 Author: Juuso Oikarinen Date: Fri Apr 9 11:07:30 2010 +0300 wl1271: Add support for connection quality monitoring This patch will add support for connection quality monitoring by configuring rssi triggers to the firmware, and enabling the firmware rssi trigger functionality. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit e19728181ca7187fa0ecb7076ce681311cf785e7 Author: Juuso Oikarinen Date: Fri Apr 9 11:07:29 2010 +0300 wl1271: Go to ELP in idle Allow the wl1271 go to ELP mode also in idle. This will reduce current consumption remarkably in idle mode (~12mA -> ~0.2mA) Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit aecb0565e3e331d4dd23b4d35180519532015f22 Author: Saravanan Dhanabal Date: Fri Apr 9 11:07:28 2010 +0300 wl1271: Fix mac80211 RTS threshold requests during WL1271_STATE_OFF mac80211 sends RTS threshold configuration request even if the wl1271 interface state is WL1271_STATE_OFF. This leads to failures during pm tests. This patch leaves the configuration function, if the interface is going down. Signed-off-by: Saravanan Dhanabal Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 2c10bb9cb3f9cecb71bd2cbb771778136433ebe2 Author: Saravanan Dhanabal Date: Fri Apr 9 11:07:27 2010 +0300 wl1271: Fix mac80211 configuration requests during WL1271_STATE_OFF mac80211 sends configuration requests even if the wl1271 interface state is WL1271_STATE_OFF. This creates warnings from mac80211. This patch leaves the configuration functions, if the interface is going down. Signed-off-by: Saravanan Dhanabal Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit bd9dc49cd565aeb20d4f6eb2f6af4c16acce2ef5 Author: Juuso Oikarinen Date: Fri Apr 9 11:07:26 2010 +0300 wl1271: Fix memory leaks on driver initialization This patch fixes some memory leaks occurring during driver init/de-init. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit c15cf5fcf9ea0a7749536c201965370d99c86c7f Author: Luis R. Rodriguez Date: Thu Apr 8 16:08:46 2010 -0400 mac80211: fix typo for LDPC capability Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 39184b151cbe5ce9f1487190ac4244f69bf6a04b Author: Zhu Yi Date: Thu Apr 8 15:35:10 2010 +0800 mac80211: delay skb linearising in rx decryption We delay the skb linearising in ieee80211_rx_h_decrypt so that frames do not require software decryption are not linearized. We are safe to do this because ieee80211_get_mmie_keyidx() only requires to touch nonlinear data for management frames, which are already linearized before getting here. Cc: Johannes Berg Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 1805a34fa33b6284ab8139dd43779b94de58669a Merge: ace5d5d ece6444 Author: John W. Linville Date: Fri Apr 9 13:42:26 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-4965.c commit 53e5b5c215ce8372250e227f2c9acf9892de8434 Author: Arnaldo Carvalho de Melo Date: Fri Apr 9 13:33:54 2010 -0300 perf tools: Fix perl support installation when O= is used We need to create the $O/scripts/perl/Perf-Trace-Util/ directory too. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 60508abe9b3d812affb2d70a35cd151fee766737 Merge: 25e8d9b 7f311a4 Author: Takashi Iwai Date: Fri Apr 9 17:36:19 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 73296bc611cee009f3be6b451e827d1425b9c10f Author: Frederic Weisbecker Date: Tue Mar 30 02:33:36 2010 +0200 procfs: Use generic_file_llseek in /proc/vmcore /proc/vmcore has no llseek and then falls down to use default_llseek. This is racy against read_vmcore() that directly manipulates fpos but it doesn't hold the bkl there so using it in llseek doesn't protect anything. Let's use generic_file_llseek() instead. Signed-off-by: Frederic Weisbecker Acked-by: Arnd Bergmann Cc: Thomas Gleixner Cc: Andrew Morton Cc: Ingo Molnar Cc: John Kacur Cc: KAMEZAWA Hiroyuki Cc: Al Viro commit b660d0485efeff743c72f1be2185832de8477a24 Author: Adam Nielsen Date: Fri Apr 9 16:51:40 2010 +0200 netfilter: xt_LED: add refcounts to LED target Add reference counting to the netfilter LED target, to fix errors when multiple rules point to the same target ("LED trigger already exists"). Signed-off-by: Adam Nielsen Signed-off-by: Patrick McHardy commit ed86308f6179d8fa6151c2d0f652aad0091548e2 Author: Patrick McHardy Date: Fri Apr 9 16:42:15 2010 +0200 netfilter: remove invalid rcu_dereference() calls The CONFIG_PROVE_RCU option discovered a few invalid uses of rcu_dereference() in netfilter. In all these cases, the code code intends to check whether a pointer is already assigned when performing registration or whether the assigned pointer matches when performing unregistration. The entire registration/ unregistration is protected by a mutex, so we don't need the rcu_dereference() calls. Reported-by: Valdis Kletnieks Tested-by: Valdis Kletnieks Signed-off-by: Patrick McHardy commit 41775e29a74ed825496c975ba19c7661e15f0523 Author: Frederic Weisbecker Date: Tue Mar 30 02:24:54 2010 +0200 procfs: Use generic_file_llseek in /proc/kmsg No need to hold the bkl to seek here, none of the other fops callbacks use it. Use generic_file_llseek explicitly. Signed-off-by: Frederic Weisbecker Acked-by: Arnd Bergmann Cc: Thomas Gleixner Cc: Andrew Morton Cc: Ingo Molnar Cc: John Kacur Cc: KAMEZAWA Hiroyuki Cc: Al Viro commit 34aacb2920667d405a8df15968b7f71ba46c8f18 Author: Frederic Weisbecker Date: Tue Mar 30 02:14:26 2010 +0200 procfs: Use generic_file_llseek in /proc/kcore /proc/kcore has no llseek and then falls down to use default_llseek. This is racy against read_kcore() that directly manipulates fpos but it doesn't hold the bkl there so using it in llseek doesn't protect anything. Let's use generic_file_llseek() instead. Signed-off-by: Frederic Weisbecker Acked-by: Arnd Bergmann Cc: Thomas Gleixner Cc: Andrew Morton Cc: Ingo Molnar Cc: John Kacur Cc: KAMEZAWA Hiroyuki Cc: Al Viro commit 87df842410ce5a86fdca9fbec0dba80d2aa88b6f Author: Arnd Bergmann Date: Wed Mar 17 23:06:02 2010 +0100 procfs: Kill BKL in llseek on proc base We don't use the BKL elsewhere, so use generic_file_llseek so we can avoid default_llseek taking the BKL. Signed-off-by: Arnd Bergmann [restore proc_fdinfo_file_operations as non-seekable] Signed-off-by: Frederic Weisbecker Cc: Thomas Gleixner Cc: Andrew Morton Cc: Ingo Molnar Cc: John Kacur Cc: KAMEZAWA Hiroyuki Cc: Al Viro commit 6ca0c22ef8a4e988e2487d25964d55e6c37c5785 Author: Marek Vasut Date: Thu Apr 8 20:48:51 2010 +0200 ASoC: WM8750: Convert to new API Register the WM8750 as a SPI or I2C device. This patch mostly shuffles code around. Hugely inspired by WM8753 which was already converted. Also, this patch fixes the Jive and Spitz machine. Signed-off-by: Marek Vasut Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4cf19b848f92641eeb2585949a09eedec57fb53a Author: Takashi Iwai Date: Wed Apr 7 18:52:08 2010 +0200 ALSA: Remove BKL from open multiplexer Use a local mutex instead of BKL. This should suffice since each device type has also its open_mutex. Also, a bit of clean-up of the legacy device auto-loading code. Signed-off-by: Takashi Iwai commit c1a7368a6f0b18b10fdec87972da680ebdf03794 Author: wzt.wzt@gmail.com Date: Fri Apr 9 19:30:29 2010 +0800 Security: Fix coding style in security/ Fix coding style in security/ Signed-off-by: Zhitong Wang Signed-off-by: James Morris commit ace5d5de6bbaff00d3b5dd7ea8f160b570fdb726 Author: John W. Linville Date: Thu Apr 8 16:34:49 2010 -0400 ath5k: fixup some merge damage for AR5211 IQ calibration Resolution of a merge conflict upstream accidentally removed a hunk of "ath5k: IQ calibration for AR5211 is slightly different", so restore it. Signed-off-by: John W. Linville commit f74cb0f7b1d8d6e4c11c6679a7d012be641225e3 Author: Luis R. Rodriguez Date: Thu Apr 8 11:50:47 2010 -0400 mac80211_hwsim: add sw_scan sw_scan_complete Simple pre-scan and scan complete callbacks, this at least shows to me that mac80211 will issue two scans at the same time on the same wiphy. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4f59fce9e099fb6ba3c8361e5094163a3efce5be Author: Bob Copeland Date: Wed Apr 7 23:55:59 2010 -0400 ath5k: add bounds check to pdadc table We check the bounds on pdadc once when correcting for negative curves but not when we later copy values from from the pdadc_tmp array, leading to a potential overrun. Although we shouldn't hit this case in practice, let's be consistent. Reported-by: Dan Carpenter Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit a05988bbbef5ac2391fe696646f0b80708f33f2e Author: Bob Copeland Date: Wed Apr 7 23:55:58 2010 -0400 ath5k: fix race condition in tx desc processing As pointed out by Benoit Papillault, there is a potential race condition between the host and the hardware in reading the next link in the transmit descriptor list: cpu0 hw tx for buf completed raise tx_ok interrupt process buf buf->ds_link = 0 read buf->ds_link This change checks txdp before processing a descriptor (if there are any subsequent descriptors) to see if hardware moved on. We'll then process this descriptor on the next tasklet. Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 6b5d117eddc09cd976ad8030d715f4350f598a22 Author: Bob Copeland Date: Wed Apr 7 23:55:57 2010 -0400 ath5k: clean up queue manipulation Review spotted a couple of strange invocations to ieee80211_wake_queues that could potentially cause problems: - queues are awakened in the calibration tasklet before phy calibration, and then again after calibration - queues are awakened inside reset when we're trying to drain the ath5k transmit queues, and again after reset is completed (in callers to ath5k_reset_wake). In both cases the first wake is unnecessary, so remove it. Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 1968cc78d91c79857089713bf3f3cceb5e9c63ae Author: Bob Copeland Date: Wed Apr 7 23:55:56 2010 -0400 ath5k: correct channel setting for 2.5 mhz spacing These channels aren't selectable anyway, but our calculations for 2.5 mhz frequencies are incorrect. The value is supposed to be: (frequency - reference) * (10/25) i.e., divide by 2.5, but we were instead doing: (10 * frequency - reference) / 25. Additionally, the check for (frequency % 5 == 2) had an extra subtraction that wasn't in madwifi HAL. Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit b5878a2dc5e7e7f031a52c3e15b571224cb6b540 Author: Johannes Berg Date: Wed Apr 7 16:48:40 2010 +0200 mac80211: enhance tracing Enhance tracing by adding tracing for a variety of callbacks that the drivers call, and also for internal calls (currently limited to queue status). This can aid debugging what is going on in mac80211 in interaction with drivers, since we can now see what drivers call and not just what mac80211 calls in the driver. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 403820edc4ba1f2fb2514c022f2662c498ce0d11 Author: Helmut Schaa Date: Wed Apr 7 09:06:34 2010 +0200 rt2x00: use rt2800_config_channel_rt3x for rt2872 rt2872 needs the same rf register setup as rt3070 and rt3090, hence use rt2800_config_channel_rt3x instead of rt2800_config_channel_rt2x. This change allows me to actually switch channels and hence scan all configured channels on the RT305x SoC platform (which uses a rt2872) here. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Tested-by: Luis Correia Signed-off-by: John W. Linville commit 2eb46d9bda44b3f85727fee6865d9b25725e6bf9 Author: Pavel Roskin Date: Wed Apr 7 01:33:33 2010 -0400 ath9k: simplify AR9220 fixup code for AR_AN_TOP2 register Don't modify ah->iniModes, it's supposed to be constant. Instead, apply the fixup when the data is written to the registers. Change ath9k_hw_init_eeprom_fix() to only determine whether the fixup is needed. This allows similteneous support for AR9220 cards that need AR_AN_TOP2 fixup (such as Ubiquiti SR71-12) and those that don't need it (D-Link DWA-552 rev A2). Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit f984d94c500c79048b33ab14923dfcec336d9968 Author: Sujith Date: Tue Apr 6 15:28:19 2010 +0530 ath9k_htc: Fix HTC layer memleak Messages that are generated by the HTC layer don't have any TX callback endpoints assigned to them. Consequently, the allocated SKBs are never freed. Fix this issue by handling this case in the HTC layer itself. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 6f0f2669f508fb239a0f589a8b453dbe22112bf9 Author: Sujith Date: Tue Apr 6 15:28:17 2010 +0530 ath9k_htc: Use anchors for REGOUT pipe hif_usb_regout_cb() frees the given URB, which is borked by design. Use an anchor to simplify URB management. Signed-off-by: Sujith Signed-off-by: John W. Linville commit c503269a0f77e9b2d6de9e8a5f66ace53dde6e04 Author: Sujith Date: Tue Apr 6 15:28:15 2010 +0530 ath9k_htc: Fix module unloading issue The maximum number of packets in a single buffer in stream mode is 10. The driver currently uses 8 - which caused stack corruption, in the absence of any kind of OOB checking. Fixing this to the correct value of 10 fixes the module unload issue. Signed-off-by: Sujith Tested-by: Ming Lei Signed-off-by: John W. Linville commit 66b10e33f742bb45a29b7dbbc8dc85583d4c9ef6 Author: Sujith Date: Tue Apr 6 15:28:13 2010 +0530 ath9k_htc: Fix RX URB reference count RX URBs are automatically freed when the reference count drops to zero - this currently doesn't happen when usb_kill_anchored_urbs() is called during unload. Fix this by dropping the reference count by one during initial submission. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 46baa1a24945b5813097af5a632db721f9c9d03b Author: Sujith Date: Tue Apr 6 15:28:11 2010 +0530 ath9k_htc: Protect RX stream variables Use a spin lock to prevent concurrent access to variables dealing with RX stream mode handling. Currently, no protection is implemented - which causes problems in RX. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 62c33447fa720d71b05bbc626b01351a4889c2d7 Author: Gertjan van Wingerde Date: Tue Mar 30 23:50:24 2010 +0200 rt2x00: Enable powersaving by default again on rt2500usb. Now that the powersave issues on rt2500usb have been tackled, powersave can be enabled by default again. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 97ad9139fd68b5c71f44d28d3f9788d89cfd4916 Author: Javier Cardona Date: Mon Mar 29 11:00:21 2010 -0700 mac80211: Moved mesh action codes to a more visible location Grouped mesh action codes together with the other action codes in ieee80211.h. Signed-off-by: Javier Cardona Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 60ece4047e4870c7be28dcf661162d8312c161e7 Author: Frans Pop Date: Wed Mar 24 19:46:30 2010 +0100 wireless/ath: remove trailing space in messages Signed-off-by: Frans Pop Cc: Luis R. Rodriguez Signed-off-by: John W. Linville commit e4077e018b5ead3de9951fc01d8bf12eeeeeefed Author: Timo Teräs Date: Thu Apr 8 11:27:42 2010 -0700 xfrm: Fix crashes in xfrm_lookup() From: Timo Teräs Happens because CONFIG_XFRM_SUB_POLICY is not enabled, and one of the helper functions I used did unexpected things in that case. Signed-off-by: David S. Miller commit 0f2df9eac70423838a1f8d410fd3899ddd88317b Merge: 8c11e4a 1144601 Author: John W. Linville Date: Thu Apr 8 13:34:54 2010 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/iwlwifi/iwl-tx.c commit 231c91f53e448ebe5c2d3c8ea88115bb49529674 Author: Dan Carpenter Date: Thu Apr 1 18:55:16 2010 +0300 wd7000: typo spin_unlock_irq() => spin_lock_irq() This was introduced back in 2005 at the very start of the git era by: df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 [SCSI] allow sleeping in ->eh_host_reset_handler() Signed-off-by: Dan Carpenter Signed-off-by: Jiri Kosina commit e9e94e3bd862d31777335722e747e97d9821bc1d Author: Arnaldo Carvalho de Melo Date: Mon Apr 5 18:01:10 2010 -0300 perf trace: Ignore "overwrite" field if present in /events/header_page That is not used in perf where we have the LOST events. Without this patch we get: [root@doppio ~]# perf lock report | head -3 Warning: Error: expected 'data' but read 'overwrite' So, to make the same perf command work with kernels with and without this field, introduce variants for the parsing routines to not warn the user in such case. Discussed-with: Steven Rostedt Cc: Frédéric Weisbecker Cc: Hitoshi Mitake Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 854c5548dfad017920a36201d40449fdbad90bfb Author: Randy Dunlap Date: Wed Mar 31 11:31:00 2010 -0700 perf: cleanup some Documentation Correct typos in perf bench & perf sched help text. Cc: Peter Zijlstra , Cc: Paul Mackerras LKML-Reference: <20100331113100.cc898487.randy.dunlap@oracle.com> Signed-off-by: Randy Dunlap commit f0e9c4fcefa42b5d28b915768dab81a7fdbbc00c Author: Randy Dunlap Date: Wed Mar 31 11:30:56 2010 -0700 perf bench: fix spello Fix spello in user message. Cc: Peter Zijlstra , Cc: Paul Mackerra s LKML-Reference: <20100331113056.2c7df509.randy.dunlap@oracle.com> Signed-off-by: Randy Dunlap commit eed05fe70f96b04ebeb218b07ae8898e605f9b23 Author: Arnaldo Carvalho de Melo Date: Mon Apr 5 12:53:45 2010 -0300 perf tools: Reorganize some structs to save space Using 'pahole --packable' I found some structs that could be reorganized to eliminate alignment holes, in some cases getting them to be cacheline multiples. [acme@doppio linux-2.6-tip]$ codiff perf.old ~/bin/perf builtin-annotate.c: struct perf_session | -8 struct perf_header | -8 2 structs changed builtin-diff.c: struct sample_data | -8 1 struct changed diff__process_sample_event | -8 1 function changed, 8 bytes removed, diff: -8 builtin-sched.c: struct sched_atom | -8 1 struct changed builtin-timechart.c: struct per_pid | -8 1 struct changed cmd_timechart | -16 1 function changed, 16 bytes removed, diff: -16 builtin-probe.c: struct perf_probe_point | -8 struct perf_probe_event | -8 2 structs changed opt_add_probe_event | -3 1 function changed, 3 bytes removed, diff: -3 util/probe-finder.c: struct probe_finder | -8 1 struct changed find_kprobe_trace_events | -16 1 function changed, 16 bytes removed, diff: -16 /home/acme/bin/perf: 4 functions changed, 43 bytes removed, diff: -43 [acme@doppio linux-2.6-tip]$ Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c0ed55d2e4f600335193612725c0d7c8211a7a4a Author: Arnaldo Carvalho de Melo Date: Mon Apr 5 12:04:23 2010 -0300 perf TUI: Move "Yes" button to before "No" Esc + Enter should be enough warning to avoid accidentaly exiting from the browser. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6e7ab4c649eb7ed403d970b8eda32ca3745e8024 Author: Arnaldo Carvalho de Melo Date: Mon Apr 5 12:02:18 2010 -0300 perf TUI: Show filters on the title and add help line about how to zoom out Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e9f13cab49f7f28b65a6f63201fca56480b2e059 Author: Herbert Xu Date: Thu Apr 8 14:54:35 2010 +0200 netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in nfnetlink_queue As we will set ip_summed to CHECKSUM_NONE when necessary in nfqnl_mangle, there is no need to zap CHECKSUM_COMPLETE in nfqnl_build_packet_message. Signed-off-by: Herbert Xu Signed-off-by: Patrick McHardy commit 5dd59cc99131fb4a2775c00928b0f24b9e192a76 Author: Herbert Xu Date: Thu Apr 8 14:53:40 2010 +0200 netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in ip6_queue As we will set ip_summed to CHECKSUM_NONE when necessary in ipq_mangle_ipv6, there is no need to zap CHECKSUM_COMPLETE in ipq_build_packet_message. Signed-off-by: Herbert Xu Signed-off-by: Patrick McHardy commit 9e56c21486f2a64473f36fa49475fd253422fbf6 Author: Herbert Xu Date: Thu Apr 8 14:52:28 2010 +0200 netfilter: only do skb_checksum_help on CHECKSUM_PARTIAL in ip_queue While doing yet another audit on ip_summed I noticed ip_queue calling skb_checksum_help unnecessarily. As we will set ip_summed to CHECKSUM_NONE when necessary in ipq_mangle_ipv4, there is no need to zap CHECKSUM_COMPLETE in ipq_build_packet_message. Signed-off-by: Herbert Xu Signed-off-by: Patrick McHardy commit ca7e0c612005937a4a5a75d3fed90459993de65c Merge: 8141d00 f5284e7 Author: Ingo Molnar Date: Thu Apr 8 13:36:36 2010 +0200 Merge branch 'linus' into perf/core Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c Merge reason: pick up latest fixes, fix the conflict Signed-off-by: Ingo Molnar commit 3d91c1a848c812e0e66e7e57f076667822cb460e Author: Patrick McHardy Date: Thu Apr 8 13:35:47 2010 +0200 IPVS: fix potential stack overflow with overly long protocol names When protocols use very long names, the sprintf calls might overflow the on-stack buffer. No protocol in the kernel does this however. Print the protocol name in the pr_debug statement directly to avoid this. Based on patch by Zhitong Wang Acked-by: Simon Horman Signed-off-by: Patrick McHardy commit 0a5bff744a6263d397f88671ed2f772da9c64989 Author: Sreenivasa Honnur Date: Thu Apr 8 01:49:19 2010 -0700 vxge: Version update. - Version update. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa commit cb27ec60640b3d3b40412c57a3fa92a0ae88dd2f Author: Sreenivasa Honnur Date: Thu Apr 8 01:48:57 2010 -0700 vxge: Pass correct number of VFs value to pci_sriov_enable(). - max_config_dev loadable parameter is set to 0xFF by default. Pass correct number of VFs value to pci_sriov_enable() if max_config_dev is set to its default value. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 9002397e2999b53a0d673cd89892c4cda58e1416 Author: Sreenivasa Honnur Date: Thu Apr 8 01:48:30 2010 -0700 vxge: Allow driver load for all enumerated pci functions. - Allow all instances of the driver be loaded when multiple pci functions are enumerated. The max_config_dev driver loadable option limits the driver load instances if required. The X3100's function configuration of single/multi function, SR and MR IOV allows the user to select the number of pci functions. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit aaffbd9f7734721bf42d246eb31fc79d7adb2cb9 Author: Sreenivasa Honnur Date: Thu Apr 8 01:44:39 2010 -0700 vxge: Fix a possible memory leak in vxge_hw_device_initialize(). - Fix a possible memory leak in vxge_hw_device_initialize(). Free hldev if vxge_hw_device_reg_addr_get() fails. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit c1ab9cab75098924fa8226a8a371de66977439df Merge: ff0ff84 f5284e7 Author: Ingo Molnar Date: Thu Apr 8 09:06:12 2010 +0200 Merge branch 'linus' into tracing/core Conflicts: include/linux/module.h kernel/module.c Semantic conflict: include/trace/events/module.h Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up possibly racy module refcounting") Signed-off-by: Ingo Molnar commit 4d8dc679084d8dd7b81b2ae245844246deb0759c Author: David S. Miller Date: Wed Apr 7 23:28:28 2010 -0700 Revert "Add non-Virtex5 support for LL TEMAC driver" This reverts commit 459569145516f7967b916c57445feb02c600668c. Uses virt_to_bus() and breaks the build. Signed-off-by: David S. Miller commit 97f8aefbbfb5aa5c9944e5fa8149f1fdaf71c7b6 Author: chavey Date: Wed Apr 7 21:54:42 2010 -0700 net: fix ethtool coding style errors and warnings Fix coding style errors and warnings output while running checkpatch.pl on the files net/core/ethtool.c and include/linux/ethtool.h Signed-off-by: chavey Signed-off-by: David S. Miller commit 8dd4bd002a32e787978fcb2be1e6ab09a3eb04ae Author: Peter Korsgaard Date: Wed Apr 7 21:53:41 2010 -0700 macb: allow reception of large (>1518 bytes) frames Enable BIG bit in the network configuration register, so the MAC doesn't reject big frames (E.G. when vlans are used). Signed-off-by: Peter Korsgaard Signed-off-by: David S. Miller commit 1a98314273ad6a3dc048925cf71d9a8cee3560d8 Author: FUJITA Tomonori Date: Sun Apr 4 01:51:03 2010 +0000 bnx2x: use the DMA API instead of the pci equivalents The DMA API is preferred. Signed-off-by: FUJITA Tomonori Acked-by: Vladislav Zolotarov Acked-by: Eilon Greenstein Signed-off-by: David S. Miller commit 1a4ccc2d460f252853dfa2fb38b4ea881916713d Author: FUJITA Tomonori Date: Thu Apr 1 16:56:57 2010 +0000 bnx2: use the dma state API instead of the pci equivalents The DMA API is preferred. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit 5e01d2f91df62be4d6f282149bc2a8858992ceca Author: Michael S. Tsirkin Date: Wed Apr 7 21:01:41 2010 -0700 virtio-net: move sg off stack Move sg structure off stack and into virtnet_info structure. This helps remove extra sg_init_table calls as well as reduce stack usage. Signed-off-by: Michael S. Tsirkin Tested-by: Michael S. Tsirkin Signed-off-by: David S. Miller commit b681ee77f8ad248b0fdcec2e5e8c4df6e757eba3 Author: FUJITA Tomonori Date: Sun Apr 4 21:40:18 2010 +0000 benet: fix the misusage of zero dma address benet driver wrongly assumes that zero is an invalid dma address (calls dma_unmap_page for only non zero dma addresses). Zero is a valid dma address on some architectures. The dma length can be used here. Signed-off-by: FUJITA Tomonori Acked-by: Sathya Perla Signed-off-by: David S. Miller commit fac6da5b7a1b9779ba124ce92314d02378892855 Author: FUJITA Tomonori Date: Thu Apr 1 16:53:22 2010 +0000 benet: use the dma state API instead of the pci equivalents The DMA API is preferred. Signed-off-by: FUJITA Tomonori Acked-by: Sathya Perla Signed-off-by: David S. Miller commit b0cf4dfb7cd21556efd9a6a67edcba0840b4d98d Author: Ben Hutchings Date: Wed Apr 7 20:55:47 2010 -0700 3c503: Fix IRQ probing The driver attempts to select an IRQ for the NIC automatically by testing which of the supported IRQs are available and then probing each available IRQ with probe_irq_{on,off}(). There are obvious race conditions here, besides which: 1. The test for availability is done by passing a NULL handler, which now always returns -EINVAL, thus the device cannot be opened: 2. probe_irq_off() will report only the first ISA IRQ handled, potentially leading to a false negative. There was another bug that meant it ignored all error codes from request_irq() except -EBUSY, so it would 'succeed' despite this (possibly causing conflicts with other ISA devices). This was fixed by ab08999d6029bb2c79c16be5405d63d2bedbdfea 'WARNING: some request_irq() failures ignored in el2_open()', which exposed bug 1. This patch: 1. Replaces the use of probe_irq_{on,off}() with a real interrupt handler 2. Adds a delay before checking the interrupt-seen flag 3. Disables interrupts on all failure paths 4. Distinguishes error codes from the second request_irq() call, consistently with the first Compile-tested only. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit e31d5a05948e4478ba8396063d1e1f39880928e2 Author: Alan Cox Date: Wed Apr 7 16:50:00 2010 -0700 caif: tty's are kref objects so take a reference I don't think this can be abused in this case but do things properly. Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit c93f09402106f22601838ee2bb0d02bae934b5e5 Author: Alan Cox Date: Wed Apr 7 16:49:31 2010 -0700 caif: check write operations write is optional for a tty device. Check that we have a write op rather than calling NULL. Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit 298b9e44be9592e94c0e69a5d3893cd11f5484fa Author: Eric Dumazet Date: Wed Apr 7 16:46:36 2010 -0700 net: include linux/proc_fs.h in dev_addr_lists.c As pointed by Randy Dunlap, we must include linux/proc_fs.h in net/core/dev_addr_lists.c, regardless of CONFIG_PROC_FS Reported-by: Randy Dunlap , Signed-off-by: Eric Dumazet Acked-by: Randy Dunlap Signed-off-by: David S. Miller commit 18e225f257663c59ff9d4482f07ffd06361fc2ec Author: Pavel Roskin Date: Wed Apr 7 16:40:09 2010 -0700 net: fix definition of netdev_for_each_mc_addr() The first argument should be called ha, not mclist. All callers use the name "ha", but if they used a different name, there would be a compile error. Signed-off-by: Pavel Roskin Signed-off-by: David S. Miller commit e2902eb79fdea3c3bf679a8f15f3432b393cb2c0 Author: Eric Paris Date: Wed Apr 7 15:10:35 2010 -0400 SMACK: remove dead cred_commit hook This is an unused hook in SMACK so remove it. Signed-off-by: Eric Paris Acked-by: Casey Schaufler Signed-off-by: James Morris commit dd3e7836bfe093fc611f715c323cf53be9252b27 Author: Eric Paris Date: Wed Apr 7 15:08:46 2010 -0400 selinux: always call sk_security_struct sksec trying to grep everything that messes with a sk_security_struct isn't easy since we don't always call it sksec. Just rename everything sksec. Signed-off-by: Eric Paris Signed-off-by: James Morris commit 8c11e4ab09ffb975a89802dde0e9aa52a53b8aa5 Author: Johannes Berg Date: Wed Apr 7 11:26:56 2010 +0200 mac80211: fix paged RX crypto WEP crypto was broken, but upon finding the problem it is evident that other things were broken by the paged RX patch as well. To fix it, for now move the linearising in front. This means that we linearise all frames, which is not at all what we want, but at least it fixes the problem for now. Signed-off-by: Johannes Berg Acked-by: Zhu Yi Signed-off-by: John W. Linville commit 54297e4d60b74e602138594c131097347d128b5a Author: Johannes Berg Date: Tue Apr 6 11:18:48 2010 +0200 mac80211: fix some RX aggregation locking A few places in mac80211 do not currently acquire the sta lock for RX aggregation, but they should. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 098a607091426e79178b9a6c318d993fea131791 Author: Johannes Berg Date: Tue Apr 6 11:18:47 2010 +0200 mac80211: clean up/fix aggregation code The aggregation code has a number of quirks, like inventing an unneeded WLAN_BACK_TIMER value and leaking memory under certain circumstances during station destruction. Fix these issues by using the regular aggregation session teardown code and blocking new aggregation sessions, all before the station is really destructed. As a side effect, this gets rid of the long code block to destroy aggregation safely. Additionally, rename tid_state_rx which can only have the values IDLE and OPERATIONAL to tid_active_rx to make it easier to understand that there is no bitwise stuff going on on the RX side -- the TX side remains because it needs to keep track of the driver and peer states. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 618f356b95e37ca0c30b3b513898fda54abd52a6 Author: Johannes Berg Date: Tue Apr 6 11:18:46 2010 +0200 mac80211: rename WLAN_STA_SUSPEND to WLAN_STA_BLOCK_BA I want to use it during station destruction as well so rename it to WLAN_STA_BLOCK_BA which is also the only use of it now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 66b0470aeef10a3b0f9a6a1c60d908b5a06c62ae Author: Johannes Berg Date: Tue Apr 6 11:18:45 2010 +0200 mac80211: remove ieee80211_sta_stop_rx_ba_session All callers of ieee80211_sta_stop_rx_ba_session can just call __ieee80211_stop_rx_ba_session instead because they already have the station struct, so do that and remove ieee80211_sta_stop_rx_ba_session. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2b43ae6daf26f29cec49fa3a3f18025355495500 Author: Johannes Berg Date: Tue Apr 6 11:18:44 2010 +0200 mac80211: remove irq disabling for sta lock All other places except one in the TX path, which has BHs disabled, and it also cannot be locked from interrupts so disabling IRQs is not necessary. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e64b379574d6c92c15b4239ee0a5173317176547 Author: Johannes Berg Date: Tue Apr 6 11:18:43 2010 +0200 mac80211: fix station destruction problem When a station w/o a key is destroyed, or when a driver submits work for a station and thereby references it again, it seems like potentially we could reference the station structure while it is being destroyed. Wait for an RCU grace period to elapse before finishing destroying the station after we have removed the station from the driver and from the hash table etc., even in the case where no key is associated with the station. Also, there's no point in deleting the plink timer here since it'll be properly deleted just a bit later. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 1c3652a5732879263aeebe606ca7af9e66fe0b2f Author: Vivek Natarajan Date: Mon Apr 5 14:48:06 2010 +0530 ath9k_htc: Configure the beacon timers once the scan is completed. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit bde748a40d4d5a9915def6772e208848c105e616 Author: Vivek Natarajan Date: Mon Apr 5 14:48:05 2010 +0530 ath9k_htc: Add support for power save. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit 53bc7aa08b48e5cd745f986731cc7dc24eef2a9f Author: Vivek Natarajan Date: Mon Apr 5 14:48:04 2010 +0530 ath9k: Add support for newer AR9285 chipsets. This patch adds support for a modified newer version of AR9285 chipsets. Signed-off-by: Vivek Natarajan Signed-off-by: John W. Linville commit d5cdfacb35ed886271d1ccfffbded98d3447da17 Author: Jouni Malinen Date: Sun Apr 4 09:37:19 2010 +0300 cfg80211: Add local-state-change-only auth/deauth/disassoc cfg80211 is quite strict on allowing authentication and association commands only in certain states. In order to meet these requirements, user space applications may need to clear authentication or association state in some cases. Currently, this can be done with deauth/disassoc command, but that ends up sending out Deauthentication or Disassociation frame unnecessarily. Add a new nl80211 attribute to allow this sending of the frame be skipped, but with all other deauth/disassoc operations being completed. Similar state change is also needed for IEEE 802.11r FT protocol in the FT-over-DS case which does not use Authentication frame exchange in a transition to another BSS. For this to work with cfg80211, an authentication entry needs to be created for the target BSS without sending out an Authentication frame. The nl80211 authentication command can be used for this purpose, too, with the new attribute to indicate that the command is only for changing local state. This enables wpa_supplicant to complete FT-over-DS transition successfully. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 7590a550b88b8c3cb025f0a8ed58e279ad62e4c1 Author: Kalle Valo Date: Fri Apr 2 15:31:46 2010 +0300 wl1251: use DRIVER_NAME macro in wl1251_spi_driver Better use the macro for consistency, the content is the same anyway. Signed-off-by: Kalle Valo Signed-off-by: John W. Linville commit 2111ac0d888767999c7dd6d1309dcc1fb8012022 Author: Bruno Randolf Date: Fri Apr 2 18:44:08 2010 +0900 ath5k: Adaptive Noise Immunity (ANI) Implementation This is an Adaptive Noise Imunity (ANI) implementation for ath5k. I have looked at both ath9k and HAL sources (they are nearly the same), and even though i have implemented some things differently, the basic algorithm is practically the same, for now. I hope that this can serve as a clean start to improve the algorithm later. This also adds a possibility to manually control ANI settings, right now only thru a debugfs file: * set lowest sensitivity (=highest noise immunity): echo sens-low > /sys/kernel/debug/ath5k/phy0/ani * set highest sensitivity (=lowest noise immunity): echo sens-high > /sys/kernel/debug/ath5k/phy0/ani * automatically control immunity (default): echo ani-on > /sys/kernel/debug/ath5k/phy0/ani * to see the parameters in use and watch them change: cat /sys/kernel/debug/ath5k/phy0/ani Manually setting sensitivity will turn the automatic control off. You can also control each of the five immunity parameters (noise immunity, spur immunity, firstep, ofdm weak signal detection, cck weak signal detection) manually thru the debugfs file. This is tested on AR5414 and nearly doubles the thruput in a noisy 2GHz band. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 5b5cd553e3ac49e6a9bac148f07ab94d3d96dae5 Author: Takashi Iwai Date: Wed Apr 7 18:33:57 2010 +0200 ALSA: info - Remove BKL Use the fine-grained mutex for the assigned info object, instead. Signed-off-by: Takashi Iwai commit d05468b72a32ec45aefb48caa00bd99350b9cf86 Author: Takashi Iwai Date: Wed Apr 7 18:29:46 2010 +0200 ALSA: pcm - Remove BKL from async callback It's simply calling fasync_helper(). Signed-off-by: Takashi Iwai commit 25e8d9b67b206b8bf9bf11699d1a7e67c87c1a2e Author: Takashi Iwai Date: Wed Apr 7 14:53:00 2010 +0200 ALSA: hda - Remove left-over debug printk in patch_realtek.c Signed-off-by: Takashi Iwai commit 8e4795605d1e1b39113818ad7c147b8a867a1f6a Author: Timo Teräs Date: Wed Apr 7 00:30:07 2010 +0000 flow: delayed deletion of flow cache entries Speed up lookups by freeing flow cache entries later. After virtualizing flow cache entry operations, the flow cache may now end up calling policy or bundle destructor which can be slowish. As gc_list is more effective with double linked list, the flow cache is converted to use common hlist and list macroes where appropriate. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit 285ead175c5dd5075cab5b6c94f35a3e6c0a3ae6 Author: Timo Teräs Date: Wed Apr 7 00:30:06 2010 +0000 xfrm: remove policy garbage collection Policies are now properly reference counted and destroyed from all code paths. The delayed gc is just an overhead now and can be removed. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit 80c802f3073e84c956846e921e8a0b02dfa3755f Author: Timo Teräs Date: Wed Apr 7 00:30:05 2010 +0000 xfrm: cache bundles instead of policies for outgoing flows __xfrm_lookup() is called for each packet transmitted out of system. The xfrm_find_bundle() does a linear search which can kill system performance depending on how many bundles are required per policy. This modifies __xfrm_lookup() to store bundles directly in the flow cache. If we did not get a hit, we just create a new bundle instead of doing slow search. This means that we can now get multiple xfrm_dst's for same flow (on per-cpu basis). Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit fe1a5f031e76bd8761a7803d75b95ee96e84a574 Author: Timo Teräs Date: Wed Apr 7 00:30:04 2010 +0000 flow: virtualize flow cache entry methods This allows to validate the cached object before returning it. It also allows to destruct object properly, if the last reference was held in flow cache. This is also a prepartion for caching bundles in the flow cache. In return for virtualizing the methods, we save on: - not having to regenerate the whole flow cache on policy removal: each flow matching a killed policy gets refreshed as the getter function notices it smartly. - we do not have to call flow_cache_flush from policy gc, since the flow cache now properly deletes the object if it had any references Signed-off-by: Timo Teras Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 8020eb82d4c37d21dade0abeb8feed265a01819e Author: Florian Fainelli Date: Tue Apr 6 22:09:20 2010 +0000 au1000-eth: bump to 1.7 Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 5368c726b6a52e6778e59f362dfcaa5ae5cb6cd3 Author: Florian Fainelli Date: Tue Apr 6 22:09:17 2010 +0000 au1000-eth: Use (dev|netdev|netif)_ macro helpers Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 7cd2e6e38cd4402e09a286368f7a349e267aeb58 Author: Florian Fainelli Date: Tue Apr 6 22:09:09 2010 +0000 au1000-eth: implement set/get_msglevel {set,get}_msglevel is required to use netif_{err,dbg} macros. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 2cc3c6b1bc2d68ddb003a94f7313999f7984735f Author: Florian Fainelli Date: Tue Apr 6 22:09:06 2010 +0000 au1000-eth: fix checkpatch errors. This patch fixes multiple errors reported by checkpatch: - else not on the ending brace of an if { } - multiple occurences of for( instead of for ( - c99 comments - assignment and tests on the same line - test and statements on the same line - macro with complex value not between parenthesis - static variable with initialization value No functionnal change. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit eb0496308f22093d5b3ce6c9d591233047f41d39 Author: Florian Fainelli Date: Tue Apr 6 22:09:01 2010 +0000 au1000-eth: prefix all functions with au1000_ In order to avoid namespace clashes, prefix all internal driver functions with au1000_. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 13130c7a9909df0f675623d73cafe595f93ce617 Author: Florian Fainelli Date: Tue Apr 6 22:08:57 2010 +0000 au1000-eth: set MODULE_VERSION Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit b233fc6b10e66d7d58ab56c7897b82e64c13b68d Author: Florian Fainelli Date: Tue Apr 6 22:08:53 2010 +0000 au1000-eth: allow driver to be compiled as a module This patch allows the au1000-eth driver to be compiled as a module. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 99dc5c0ca953fb154a3c75ebc6801e0a3c2fe3fe Author: Paul Mundt Date: Wed Apr 7 17:08:32 2010 +0900 sh: Disable MMUCR_AT for SH-4 nommu. Presently address translation is default-enabled regardless of whether CONFIG_MMU is set or not in the SH-4 case, this fixes it up, and also makes the control init word a bit more readable in the process. Signed-off-by: Paul Mundt commit 489008cd58740fe3842822681d33bf87c07c3412 Author: Takashi Iwai Date: Wed Apr 7 09:06:00 2010 +0200 ALSA: hda - Fix ALC882 DAC connections in auto mode Assign DACs properly to each output. Currently, the front output is bound to HP/speaker outputs blindly, but they should be assigned to individual DACs. Signed-off-by: Takashi Iwai commit 4a35ecf8bf1c4b039503fa554100fe85c761de76 Merge: b4d562e fb9e2d8 Author: David S. Miller Date: Tue Apr 6 23:53:30 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bonding/bond_main.c drivers/net/via-velocity.c drivers/net/wireless/iwlwifi/iwl-agn.c commit 92ab7b8f38db35db05bd9c44412fff08ad594ad4 Merge: c125ba3 f9700d5 Author: Takashi Iwai Date: Wed Apr 7 08:38:47 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 68c7ccb8f85801655aa681391dc0ee037a2b66d4 Author: Takashi Iwai Date: Wed Apr 7 07:45:46 2010 +0200 ALSA: powermac - Fix obsoleted machine_is_compatible() machine_is_compatible() was renamed to of_machine_is_compatible(). Signed-off-by: Takashi Iwai commit b4d562e3c3553ac58c7120555c4e4aefbb090a2a Author: Elina Pasheva Date: Tue Apr 6 14:23:07 2010 +0000 NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c This patch adds setting of the urb transfer flag URB_ZERO_PACKET before submitting an urb for drivers that have requested it (by advertising flag FLAG_SEND_ZLP). The modification is in usbnet.c function usbnet_start_xmit(). This patch only adds the zero length flag. A subsequent patch will address the buggy code we found when devices do not advertise FLAG_SEND_ZLP in which case there is a possibility of transferring packets with non-deterministic length. This patch has been tested on kernel-2.6.34-rc3. This patch has been checked against net-2.6 tree. Signed-off-by: Elina Pasheva Signed-off-by: Rory Filer Signed-off-by: David S. Miller commit 17a328ca8c04cf88be9a9ef1cb74f359c59f1802 Author: Kuninori Morimoto Date: Mon Apr 5 18:46:12 2010 +0000 net/irda: Add SuperH IrDA driver support This is very simple driver for SuperH Mobile IrDA which support SIR/MIR/FIR. This patch add only SIR support for now. Signed-off-by: Kuninori Morimoto Signed-off-by: David S. Miller commit 33d8212c4db350652d3991d60405826373fbfd60 Author: Kuninori Morimoto Date: Mon Apr 5 18:43:18 2010 +0000 net/irda: sh_sir: Modify iounmap wrong execution On sh_sir_probe function, there was a possibility that iounmap is executed even though self->membase was NULL when error case. This patch modify it. Signed-off-by: Kuninori Morimoto Signed-off-by: David S. Miller commit ba5d47cf4313e86afe046d402b8cfe7b2bca911d Author: Kuninori Morimoto Date: Mon Apr 5 18:43:09 2010 +0000 net/irda: sh_sir: fixup err return value on sh_sir_open On sh_sir_open function, there was a possibility that err variable didn't have value even though it is return value. This patch modify it. Signed-off-by: Kuninori Morimoto Signed-off-by: David S. Miller commit 842509b8591fd9a40f5532a5f049bd29804af6d6 Author: Hagen Paul Pfeifer Date: Tue Apr 6 05:39:52 2010 +0000 socket: remove duplicate declaration of struct timespec struct timespec ts was alreay defined. Reuse the previously defined one and reduce the memory footprint on the stack by 16 bytes. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit c6537d6742985da1fbf12ae26cde6a096fd35b5c Author: Jon Paul Maloy Date: Tue Apr 6 11:40:52 2010 +0000 TIPC: Updated topology subscription protocol according to latest spec This patch makes it explicit in the API that all fields in subscriptions and events exchanged with the Topology Server must be in network byte order. It also ensures that all fields of a subscription are compared when cancelling a subscription, in order to avoid inadvertent cancelling of the wrong subscription. Finally, the tipc module version is updated to 2.0.0, to reflect the API change. Signed-off-by: Jon Maloy Signed-off-by: David S. Miller commit 459569145516f7967b916c57445feb02c600668c Author: John Linn Date: Tue Apr 6 11:43:28 2010 +0000 Add non-Virtex5 support for LL TEMAC driver This patch adds support for using the LL TEMAC Ethernet driver on non-Virtex 5 platforms by adding support for accessing the Soft DMA registers as if they were memory mapped instead of solely through the DCR's (available on the Virtex 5). The patch also updates the driver so that it runs on the MicroBlaze. The changes were tested on the PowerPC 440, PowerPC 405, and the MicroBlaze platforms. Signed-off-by: John Tyner Signed-off-by: John Linn Signed-off-by: David S. Miller commit d61931d89be506372d01a90d1755f6d0a9fafe2d Author: Borislav Petkov Date: Fri Mar 5 17:34:46 2010 +0100 x86: Add optimized popcnt variants Add support for the hardware version of the Hamming weight function, popcnt, present in CPUs which advertize it under CPUID, Function 0x0000_0001_ECX[23]. On CPUs which don't support it, we fallback to the default lib/hweight.c sw versions. A synthetic benchmark comparing popcnt with __sw_hweight64 showed almost a 3x speedup on a F10h machine. Signed-off-by: Borislav Petkov LKML-Reference: <20100318112015.GC11152@aftab> Signed-off-by: H. Peter Anvin commit 1527bc8b928dd1399c3d3467dd47d9ede210978a Author: Peter Zijlstra Date: Mon Feb 1 15:03:07 2010 +0100 bitops: Optimize hweight() by making use of compile-time evaluation Rename the extisting runtime hweight() implementations to __arch_hweight(), rename the compile-time versions to __const_hweight() and then have hweight() pick between them. Suggested-by: H. Peter Anvin Signed-off-by: Peter Zijlstra LKML-Reference: <20100318111929.GB11152@aftab> Acked-by: H. Peter Anvin LKML-Reference: <1265028224.24455.154.camel@laptop> Signed-off-by: H. Peter Anvin commit 3a7f8681ffb27bcc540fb74cda15e39c9395737b Author: Francois Romieu Date: Tue Apr 6 14:24:53 2010 -0700 via-velocity: remove private #define Registers and their bits from mii.h. Courtesy from ed. Signed-off-by: Francois Romieu Signed-off-by: David S. Miller commit bc53e5129ce879ba024b7d21981871ea63a37b42 Author: Rafał Miłecki Date: Thu Apr 1 23:11:10 2010 +0200 b43: N-PHY: fix copy&paste typo Reported-by: Myhailo Danylenko Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 6bbe89de24ffe0f849e67edba7def3f39f1f80d8 Author: Juuso Oikarinen Date: Thu Apr 1 11:38:24 2010 +0300 wl1271: Fix tx queue flushing This patch modifies tx-queue flushing to correspond with tx-path - i.e. also frames for which no ack was requested are forwarded to the mac80211 for disposal. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 1a186a515a1e4446cdde2b4341dc361ba6bc76ed Author: Juuso Oikarinen Date: Thu Apr 1 11:38:23 2010 +0300 wl1271: Fix debug prints for beacon-loss and psm-entry-fail scenarios Remove ERROR print from psm-entry-fail scenario, instead use an INFO print. Also, add INFO print to the beacon-loss scenario. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 50c500ad3da49f866628d60d49645f4f8f4ff92c Author: Juuso Oikarinen Date: Thu Apr 1 11:38:22 2010 +0300 wl1271: Configure a higher listen interval to AP upon association Increase the fixed listen-interval max value configured to the mac80211 on driver init. This value will allow a larger value to be configured to the AP, which means the AP will buffer our frames longer. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 606c1487ac894798121bc2c64d27c1953c5a6210 Author: Juuso Oikarinen Date: Thu Apr 1 11:38:21 2010 +0300 wl1271: Configure rates for templates Configure meaningful rates to be used with the templates. For control frames, use the determined basic rates (currently the lowest rate for the band) and for data-frames (null-funcs) let the firmware use the current rate policy to determine the rate. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit ebba60c66b3aa321a84c9a90a343c91fde972066 Author: Juuso Oikarinen Date: Thu Apr 1 11:38:20 2010 +0300 wl1271: Use minimum rate for each band for control messages Currently the mac80211 is not telling a hardware rate controlled driver a rate to use for association frames etc. So to be safe, use the lowest rate of each band for communication. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 40b359c61dc496508b77d1242726e40238e62128 Author: Juuso Oikarinen Date: Thu Apr 1 11:38:19 2010 +0300 wl1271: Fix keep-alive related command error The firmware does not like the host configuring the keep-alive after it has been once configured after a join-operation. Instead, it will complain about invalid parameters, which do not break functionality, but do not look nice in the syslog either. This patch prevents the complaints by only configuring the keep-alive once for an association, after the first time join is performed with the correct bssid. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 1ed95388caf0ae41f905817e39cd7b5093bf8d7f Author: Luciano Coelho Date: Thu Apr 1 11:38:18 2010 +0300 wl1271: added missing command header in wl1271_cmd_disconnect The command header was missing in the wl1271_cmd_disconnect structure. It was working fine by sheer luck, because the parameters are not critical and because our wl1271_cmd_send() function was overwriting the rx_config_options with the actual header. This patch adds the header to the command structure. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit f4b5d8d874b245ec3bf1ed356476e74a346705a2 Author: Luciano Coelho Date: Thu Apr 1 11:38:17 2010 +0300 wl1271: fix sdio driver name in wl1271_sdio_driver Our SPI driver is called "wl1271_spi" in the driver information structure. Let's use the same for SDIO so that things are aligned. Signed-off-by: Luciano Coelho Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit e92119ca88691ac2239916d31c3dcecd10867521 Author: Sujith Date: Thu Apr 1 10:28:24 2010 +0530 ath9k_htc: Add TL-WN422G v2 product ID Signed-off-by: Sujith Signed-off-by: John W. Linville commit ffa49f8209ef77ebf2cce0bbc129ca40064b8fb6 Author: Sujith Date: Thu Apr 1 10:28:23 2010 +0530 ath9k_hw: Don't check devid for ath9k_htc For USB devices, this check is invalid. Remove the check so that new product IDs can be added. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 497ad9adf44013dc9054f80c627acc44d4c90d37 Author: Sujith Date: Thu Apr 1 10:28:20 2010 +0530 ath: Add a bus type field This can be used to store the bus types ( AHB/PCI/USB ). Signed-off-by: Sujith Signed-off-by: John W. Linville commit 32ffb1f4488b0727bcfc67a025becc0db3df7a17 Author: Felix Fietkau Date: Wed Mar 31 15:41:36 2010 -0700 ath9k: fix compile error without debug enabled commits 8e6f5aa250d6013ec0d66f9f45f376678d3fc4ab and db1a052b73f7c97f9e8b21f3f19a92313ed2acb1 accidentally introduced compile errors that happens when ath9k debug is not enabled. This patch fixes the declaration of the inline stubs to resolve this. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 152d530d9edbb08424dc1b6561252597a7932c49 Author: Pavel Roskin Date: Wed Mar 31 18:05:37 2010 -0400 ath9k: remove ah->mask_reg, it's never used properly ah->mask_reg was used to hold different data throughout the driver. ath9k_hw_init_interrupt_masks() used it to save the value written to AR_IMR. ath9k_hw_set_interrupts() used it to hold the interrupt mask as defined in enum ath9k_int. Those masks differ in many bits. Use ah->imask instead of ah->mask_reg in ath9k_hw_set_interrupts() and ath9k_hw_updatetxtriglevel(). That's what the code was meant to do. ah->imask is initialized in ath9k_start(), so we don't need to initialize it from ah->mask_reg. Once it's done, ah->mask_reg becomes write-only, so it's replaced with a local variable in ath9k_hw_init_interrupt_masks(). Signed-off-by: Pavel Roskin Reported-by: Julia Lawall Signed-off-by: John W. Linville commit 3069168c82d65f88e4ac76eda09baff02adfd743 Author: Pavel Roskin Date: Wed Mar 31 18:05:31 2010 -0400 ath9k: move imask from sc to ah Add ah variable in the functions that didn't have it and used sc->imask. Replace sc->sc_ah with ah in those functions. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit c81494d548d0735f13c04dd2c336cde470d1a5ae Author: Pavel Roskin Date: Wed Mar 31 18:05:25 2010 -0400 ath9k: rename symbols in enum ath9k_internal_frame_type to avoid confusion Symbols starting with "ATH9K_INT" are also used for interrupt mask. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b409894f9d6961bd5feffb86ba1d8dbbebfb5b72 Author: Luis de Bethencourt Date: Wed Mar 31 15:07:48 2010 +0100 ath: fix coding style/readability in ath/ar9170 This is a patch to files in ath/ar9170 that fixes a set of warnings found by checkpatch.pl tool. A line over 80 characters, a few empty spaces before tab and a few empty characters before a new line. Signed-off-by: Luis de Bethencourt Signed-off-by: John W. Linville commit 4d66edc8b6c0622ed6df74709de65f70d1ca222f Author: Gertjan van Wingerde Date: Tue Mar 30 23:50:26 2010 +0200 rt2x00: Add wakeup interrupt handler to rt2800pci. This is needed to wake up the device automatically for receiving beacons, and is required for proper powersave handling. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 9e18944601856c04c07dc569b87e9b98e8a9da5f Author: Gertjan van Wingerde Date: Tue Mar 30 23:50:25 2010 +0200 rt2x00: Add wakeup interrupt handler to rt61pci. This is needed to wake up the device automatically for receiving beacons, and is required for proper powersave handling. Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 5731858d0047cad309d334c4cd6ccb6199bf28fe Author: Gertjan van Wingerde Date: Tue Mar 30 23:50:23 2010 +0200 rt2x00: Disable auto wakeup before waking up device. In all drivers ensure that auto wakeup is disabled before waking up the device. This is needed to prevent connection stability issues and problems in waking up the device. Based upon a patch from Ondrej Zary Signed-off-by: Gertjan van Wingerde Cc: Ondrej Zary Signed-off-by: John W. Linville commit 8a64c0f6b7ec7f758c4ef445e49f479e27fa2236 Author: Daniel Mack Date: Tue Apr 6 10:52:44 2010 +0200 libertas/sdio: 8686: set ECSI bit for 1-bit transfers When operating in 1-bit mode, SDAT1 is used as dedicated interrupt line. However, the 8686 will only drive this line when the ECSI bit is set in the CCCR_IF register. Thanks to Alagu Sankar for pointing me in the right direction. Signed-off-by: Daniel Mack Cc: Alagu Sankar Cc: Volker Ernst Cc: Dan Williams Cc: John W. Linville Cc: Holger Schurig Cc: Bing Zhao Cc: libertas-dev@lists.infradead.org Cc: linux-wireless@vger.kernel.org Cc: linux-mmc@vger.kernel.org Acked-by: Dan Williams Signed-off-by: John W. Linville commit cfcfe4469cc39625cb8257355c00dd8f35f900aa Author: Luis de Bethencourt Date: Tue Mar 30 16:44:33 2010 +0100 ath: fix code readability in regd.c This is a patch to the ath/regd.c file that fixes two code readability issues. A space between to separate two defines and the indentation inside the ath_redg_is_eeprom_valid function. Signed-off-by: Luis de Bethencourt Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 0a4528e2ae290104f2c343031976542f93ae229d Author: Luis de Bethencourt Date: Mon Mar 29 21:34:39 2010 +0100 Net: wireless: ath: fix macros coding style issue in hw.c This is a patch to the ath/hw.c file that fixes up a warning about macros found by the checkpatch.pl tool, that said that complex values should be enclosed in parenthesis. Signed-off-by: Luis de Bethencourt Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d211e90e28a074447584729018a39910d691d1a8 Author: Jouni Malinen Date: Sun Mar 28 22:29:52 2010 -0700 mac80211: Fix robust management frame handling (MFP) Commit e34e09401ee9888dd662b2fca5d607794a56daf2 incorrectly removed use of ieee80211_has_protected() from the management frame case and in practice, made this validation drop all Action frames when MFP is enabled. This should have only been done for frames with Protected field set to zero. Signed-off-by: Jouni Malinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit a124f3bed79d5fd5f87b09a7569ae6b7da4171d2 Merge: f18d446 91dd6c2 Author: John W. Linville Date: Tue Apr 6 16:37:10 2010 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 9ca7d8e6834c40a99622bbe4a88aaf64313ae43c Author: Carsten Emde Date: Fri Apr 2 22:40:20 2010 +0200 mqueue: Convert message queue timeout to use hrtimers The message queue functions mq_timedsend() and mq_timedreceive() have not yet been converted to use the hrtimer interface. This patch replaces the call to schedule_timeout() by a call to schedule_hrtimeout() and transforms the expiration time from timespec to ktime as required. [ tglx: Fixed whitespace wreckage ] Signed-off-by: Carsten Emde Tested-by: Pradyumna Sampath Cc: Arjan van de Veen Cc: Andrew Morton LKML-Reference: <20100402204331.715783034@osadl.org> Signed-off-by: Thomas Gleixner commit 351b3f7a21e413a9b14d0393171497d2373bd702 Author: Carsten Emde Date: Fri Apr 2 22:40:19 2010 +0200 hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIME The current version of schedule_hrtimeout() always uses the monotonic clock. Some system calls such as mq_timedsend() and mq_timedreceive(), however, require the use of the wall clock due to the definition of the system call. This patch provides the infrastructure to use schedule_hrtimeout() with a CLOCK_REALTIME timer. Signed-off-by: Carsten Emde Tested-by: Pradyumna Sampath Cc: Andrew Morton Cc: Arjan van de Veen LKML-Reference: <20100402204331.167439615@osadl.org> Signed-off-by: Thomas Gleixner commit 3bbb9ec946428b96657126768f65487a48dd090c Author: Arjan van de Ven Date: Thu Mar 11 14:04:36 2010 -0800 timers: Introduce the concept of timer slack for legacy timers While HR timers have had the concept of timer slack for quite some time now, the legacy timers lacked this concept, and had to make do with round_jiffies() and friends. Timer slack is important for power management; grouping timers reduces the number of wakeups which in turn reduces power consumption. This patch introduces timer slack to the legacy timers using the following pieces: * A slack field in the timer struct * An api (set_timer_slack) that callers can use to set explicit timer slack * A default slack of 0.4% of the requested delay for callers that do not set any explicit slack * Rounding code that is part of mod_timer() that tries to group timers around jiffies values every 'power of two' (so quick timers will group around every 2, but longer timers will group around every 4, 8, 16, 32 etc) Signed-off-by: Arjan van de Ven Cc: johnstul@us.ibm.com Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 4cf46eaa5e46779d4e0a97f3f5c419cce1446bbe Author: Ralf Baechle Date: Tue Apr 6 04:03:01 2010 -0700 NET: sb1250: Fix compile warning in driver Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 7ae554e5557bc8ee6ced437e5acffba922463a63 Author: Matt Carlson Date: Mon Apr 5 10:19:30 2010 +0000 tg3: Update version to 3.109 This patch updates the tg3 version to 3.109. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 7705736f5fc2e8fd0aa98eb7667e65dbedf50d63 Author: Matt Carlson Date: Mon Apr 5 10:19:29 2010 +0000 tg3: Remove tg3_dump_state() The tg3_dump_state() function is commented out and doesn't get used much when debugging efforts are underway. The chip architecture has also changed enough that any debugging effort that might use it would have to tailor it to the capabilities of the hardware. This patch just removes the function entirely. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 859a58879d7c771e78a373028d719467a2f8feb7 Author: Matt Carlson Date: Mon Apr 5 10:19:28 2010 +0000 tg3: Cleanup if codestyle This patch cleans up the code style as it pertains to if statements. Signed-off-by: Matt Carlson Signed-off-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 33f401aec709e4fea414e5a4cf81b96462bc224f Author: Matt Carlson Date: Mon Apr 5 10:19:27 2010 +0000 tg3: The case of switches This patch fixes checkpatch errors related to switch statements. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit c6cdf43631c4108b38b872136c926691e987880f Author: Matt Carlson Date: Mon Apr 5 10:19:26 2010 +0000 tg3: Whitespace, constant, and comment updates This patch fixes whitespace errors, preprocessor definition placement oddities and updates comments. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 184b89044fb6e2a74611dafa69b1dce0d98612c6 Author: Matt Carlson Date: Mon Apr 5 10:19:25 2010 +0000 tg3: Use VPD fw version when present This patch extracts the firmware version from the VPD area and changes the code to prefer that version version over the manually extracted version. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 75f9936e1150be739a9f6577a9d34de120ea35f1 Author: Matt Carlson Date: Mon Apr 5 10:19:24 2010 +0000 tg3: Prepare FW version code for VPD versioning The code that extracts the firmware version from the device's NVRAM assumes the firmware version member is a clean slate. The following patch will add code to extract the firmware version from the VPD area of NVRAM, so this assumption will no longer be true. This patch adjusts the versioning code to respect the VPD version if it exists. Signed-off-by: Matt Carlson Signed-off-by: Benjamin Li Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 5129c3a3faf8c5f4e6dd6ca581e1c4b06f8e837f Author: Matt Carlson Date: Mon Apr 5 10:19:23 2010 +0000 tg3: Fix message 80 char violations Commit 05dbe005386e7521153dce6c5ad95c98b73b80c7, "Use (pr|netdev)_ macro helpers" extended some of the message lines longer than 80 chars. This patch reels the line lengths back in. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit ab96b241fd82ec8d546684ab6e29b6530976780a Author: Matt Carlson Date: Mon Apr 5 10:19:22 2010 +0000 tg3: netdev_err() => dev_err() Some uses of netdev_err() happen before the device has been registered. This will cause the messages to be prepended with "(unregistered net_device)" strings. We can clean up the message by using dev_err() instead. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 2445e461ce8c5a2316ed4c8a45cd2d0b6a366310 Author: Matt Carlson Date: Mon Apr 5 10:19:21 2010 +0000 tg3: Replace pr_err with sensible alternatives All the instances of pr_err() in the tg3 driver have better alternatives. This patch replaces all pr_err() calls. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 6d40db7beaef823621ff3d340ef53d08445960b4 Author: Matt Carlson Date: Mon Apr 5 10:19:20 2010 +0000 tg3: Restore likely() check in tg3_poll_msix() When creating the new tg3_poll_msix() function, the likely() compiler hint was dropped. This patch reintroduces it. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit c1f614a1214126d7c9f58bf8481070c66b3cc1af Author: Matt Carlson Date: Mon Apr 5 10:19:19 2010 +0000 tg3: Fix MII_TG3_DSP_EXP8 offset The offset to the MII_TG3_DSP_EXP8 register is incorrect. Fix it. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Apr 4 17:59:30 2010 +0000 mac80211: Ensure initializing private mc_list in prepare_multicast(). Fix kernel panic by NULL pointer dereference in the context of ieee80211_ops->prepare_multicast(). This bug was introduced by commit 22bedad3c.. ("net: convert multicast list to list_head"). Call __hw_addr_init() in ieee80211_alloc_hw() to initialize list_head of private device multicast list, like we do in bond_init(). Signed-off-by: YOSHIFUJI Hideaki Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller commit e4008276fddd10445ff06707694a938cb7f35ed4 Author: Eric Dumazet Date: Mon Apr 5 15:42:39 2010 -0700 net: Add a missing local_irq_enable() As noticed by Changli Gao, we must call local_irq_enable() after rps_unlock() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bd6d29c25bb1a24a4c160ec5de43e0004e01f72b Author: Frederic Weisbecker Date: Tue Apr 6 00:10:17 2010 +0200 lockstat: Make lockstat counting per cpu Locking statistics are implemented using global atomic variables. This is usually fine unless some path write them very often. This is the case for the function and function graph tracers that disable irqs for each entry saved (except if the function tracer is in preempt disabled only mode). And calls to local_irq_save/restore() increment hardirqs_on_events and hardirqs_off_events stats (or similar stats for redundant versions). Incrementing these global vars for each function ends up in too much cache bouncing if lockstats are enabled. To solve this, implement the debug_atomic_*() operations using per cpu vars. -v2: Use per_cpu() instead of get_cpu_var() to fetch the desired cpu vars on debug_atomic_read() -v3: Store the stats in a structure. No need for local_t as we are NMI/irq safe. -v4: Fix tons of build errors. I thought I had tested it but I probably forgot to select the relevant config. Suggested-by: Steven Rostedt Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Steven Rostedt LKML-Reference: <1270505417-8144-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar Cc: Peter Zijlstra Cc: Steven Rostedt commit 5a6d234e73d7d021c74e1aa349b3b37b81372c66 Author: Tom Herbert Date: Mon Apr 5 14:37:19 2010 -0700 rps: fixed missed rps_unlock Fix spin_unlock_irq which needs to be rps_unlock. Signed-off-by: Tom Herbert Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 53a61d967a480307db4c8f7950ddb8bb1a0fda9b Merge: 8876698 5f712b2 Author: Mark Brown Date: Mon Apr 5 19:19:32 2010 +0100 Merge branch 'for-2.6.34' into for-2.6.35 Conflicts due to context changes next to the backported DMA data change: include/sound/soc.h commit 8876698406147986a9a7748586a54c4b14514c0e Author: Mark Brown Date: Mon Mar 29 20:57:12 2010 +0100 ASoC: Implement interrupt based WM8994 microphone detection Support interrupt based microphone bias detection. The WM8994 has two microphone bias supplies, with detection supported on both. Detection using GPIOs together with the standard GPIO based jack framework is already supported via the platform data for the WM8994 core driver. Note that as well as the microphone bias itself the system clock and whichever AIF clock is supplying the system clock will need to be enabled for detection to function. Signed-off-by: Mark Brown commit ddf438cf2a6de9aa47783a45907e1188b9437ff7 Author: Mark Brown Date: Fri Apr 2 14:51:59 2010 +0100 gpiolib: Implement gpio_to_irq for WM8994 GPIO controller Signed-off-by: Mark Brown commit c9fbf7e070bbf9cc7adc1420df87706c62cb04ed Author: Mark Brown Date: Fri Mar 26 16:49:15 2010 +0000 mfd: Add WM8994 interrupt controller support The WM8994 has an interrupt controller which supports interrupts for both CODEC and GPIO portions of the chip. Support this using genirq, while allowing for systems that do not have an interrupt hooked up. Wrapper functions are provided for the IRQ request and free to simplify the code in consumer drivers when handling cases where IRQs are not set up. Signed-off-by: Mark Brown Acked-by: Samuel Ortiz commit aa27497c2fb4c7f57706099bd489e683e5cc3e3b Author: Lai Jiangshan Date: Mon Apr 5 17:11:05 2010 +0800 tracing: Fix uninitialized variable of tracing/trace output Because a local variable is not initialized, I got these when I did 'cat tracing/trace'. (not trace_pipe): CPU:0 [LOST 18446744071579453134 EVENTS] ps-3099 [000] 560.770221: lock_acquire: ffff880030865010 &(&dentry->d_lock)->rlock CPU:0 [LOST 18446744071579453134 EVENTS] ps-3099 [000] 560.770221: lock_release: ffff880030865010 &(&dentry->d_lock)->rlock CPU:0 [LOST 18446612133255294080 EVENTS] ps-3099 [000] 560.770221: lock_acquire: ffff880030865010 &(&dentry->d_lock)->rlock CPU:0 [LOST 18446744071579453134 EVENTS] ps-3099 [000] 560.770222: lock_release: ffff880030865010 &(&dentry->d_lock)->rlock CPU:0 [LOST 18446744071579453134 EVENTS] ps-3099 [000] 560.770222: lock_release: ffffffff816cfb98 dcache_lock See peek_next_entry(), it does not set *lost_events when we 'cat tracing/trace' Signed-off-by: Lai Jiangshan LKML-Reference: <4BB9A929.2000303@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 94a46d3cde81fc82eef2105fcb5c9e6e31bac0f7 Merge: 720fcb3 db217de Author: Paul Mundt Date: Mon Apr 5 12:21:09 2010 +0900 Merge branch 'sh/stable-updates' commit 8141d0050d76e5695011b5ab577ec66fb51a998c Author: Hitoshi Mitake Date: Sun Apr 4 17:13:18 2010 +0900 perf: Swap inclusion order of util.h and string.h in util/string.c Currently util/string.c includes headers in this order: string.h, util.h But this causes a build error because __USE_GNU definition is needed for strndup() definition: % make -j touch .perf.dev.null CC util/string.o cc1: warnings being treated as errors util/string.c: In function ‘argv_split’: util/string.c:171: error: implicit declaration of function ‘strndup’ util/string.c:171: error: incompatible implicit declaration of built-in function ‘strndup’ So this patch swaps the headers inclusion order. util.h defines _GNU_SOURCE, and /usr/include/features.h defines __USE_GNU as 1 if _GNU_SOURCE is defined. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1270368798-27232-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Frederic Weisbecker commit 3326c1ceee234e63160852720d48be8a8f7a6d08 Author: Arnd Bergmann Date: Tue Mar 23 19:09:33 2010 +0100 perf_event: Make perf fd non seekable Perf_event does not need seeking, so prevent it in order to get rid of default_llseek, which uses the BKL. Signed-off-by: Arnd Bergmann Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar [drop the nonseekable_open, not needed for anon inodes] Signed-off-by: Frederic Weisbecker commit 6cc8a7c1d8560c042f486b23318a6291569ab96b Author: Frederic Weisbecker Date: Fri Mar 19 01:23:53 2010 +0100 perf: Fetch hot regs from the template caller Trace events can be defined from a template using DECLARE_EVENT_CLASS/DEFINE_EVENT or directly with TRACE_EVENT. In both cases we have a template tracepoint handler, used to record the trace, to which we pass our ftrace event instance. In the function level, if the class is named "foo" and the event is named "blah", we have the following chain of calls: perf_trace_blah() -> perf_trace_templ_foo() In the case we have several events sharing the class "blah", we'll have multiple users of perf_trace_templ_foo(), and it won't be inlined by the compiler. This is usually what happens with the DECLARE_EVENT_CLASS/DEFINE_EVENT based definition. But if perf_trace_blah() is the only caller of perf_trace_templ_foo() there are fair chances that it will be inlined. The problem is that we fetch the regs from perf_trace_templ_foo() after we rewinded the frame pointer to the second caller, we want to reach the caller of perf_trace_blah() to get the right source of the event. And we do this by always assuming that perf_trace_templ_foo() is not inlined. But as shown above this is not always true. And if it is inlined we miss the first caller, losing the most important level of precision. We get: 61.31% ls [kernel.kallsyms] [k] do_softirq | --- do_softirq irq_exit do_IRQ common_interrupt | |--25.00%-- tty_buffer_request_room Instead of: 61.31% ls [kernel.kallsyms] [k] __do_softirq | --- __do_softirq do_softirq irq_exit do_IRQ common_interrupt | |--25.00%-- tty_buffer_request_room To fix this, we fetch the regs from perf_trace_blah() rather than perf_trace_templ_foo() so that we don't have to deal with inlining surprises. That also bring us the advantage of having the true source of the event even if we don't have frame pointers. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar commit 6f4dee06fbf0133917f3d76fa3fb50e18b10c1f5 Author: Frederic Weisbecker Date: Thu Mar 18 23:47:01 2010 +0100 perf: Drop the frame reliablity check It is useless now that we have a pure stack frame walker, as given addr are always reliable. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Ingo Molnar commit f1b1f75e251049281cfe3d3b82d403fc2dc1e235 Author: Risto Suominen Date: Sun Apr 4 08:00:29 2010 +0300 ALSA: powermac - Add debug log Add some debug log in tumbler.c. Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit b6d7335001f331f2d295ff15d67e385615ceff81 Author: Risto Suominen Date: Sun Apr 4 08:00:00 2010 +0300 ALSA: powermac - Lineout detection on G4 DA Lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit 819ef70b135ba66cd1659c913255686bf931e3d4 Author: Risto Suominen Date: Sun Apr 4 07:59:30 2010 +0300 ALSA: powermac - Reverse HP detection on G4 DA Reverse headphone detection bit on PowerMac G4 Digital Audio (Tumbler). Signed-off-by: Risto Suominen Signed-off-by: Takashi Iwai commit 7bddd0db6248d92adb1f547fd45507af4368d6fa Author: Eric Dumazet Date: Sun Apr 4 01:02:46 2010 -0700 l2tp: unmanaged L2TPv3 tunnels fixes Followup to commit 789a4a2c (l2tp: Add support for static unmanaged L2TPv3 tunnels) One missing init in l2tp_tunnel_sock_create() could access random kernel memory, and a bit field should be unsigned. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a5e29aca02fcecd086ac160ea29244cae6b4305e Author: Arnaldo Carvalho de Melo Date: Sat Apr 3 22:44:37 2010 -0300 perf TUI: Add a "Zoom into COMM(PID) thread" and reverse operations Now one can press the right arrow key and in addition to being able to filter by DSO, filter out by thread too, or a combination of both filters. With this one can start collecting events for the whole system, then focus on a subset of the collected data quickly. Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 83753190c136901c916df267703937e60f24b8b8 Author: Arnaldo Carvalho de Melo Date: Sat Apr 3 16:30:44 2010 -0300 perf newt: Add a "Zoom into foo.so DSO" and reverse operations Clicking on -> will bring as one of the popup menu options a "Zoom into CURRENT DSO", i.e. CURRENT will be replaced by the name of the DSO in the current line. Choosing this option will filter out all samples that didn't took place in a symbol in this DSO. After that the option reverts to "Zoom out of CURRENT DSO", to allow going back to the more compreensive view, not filtered by DSO. Future similar operations will include zooming into a particular thread, COMM, CPU, "last minute", "last N usecs", etc. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 486f50ca796a2572c42c34dd4378cdc8eeb0b137 Author: Brian Haley Date: Sat Apr 3 15:10:21 2010 -0700 SCTP: Change to use ipv6_addr_copy() Change SCTP IPv6 code to use ipv6_addr_copy() Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit 1f8438a853667d48055ad38384c63e94b32c6578 Author: Eric Dumazet Date: Sat Apr 3 15:09:04 2010 -0700 icmp: Account for ICMP out errors When ip_append() fails because of socket limit or memory shortage, increment ICMP_MIB_OUTERRORS counter, so that "netstat -s" can report these errors. LANG=C netstat -s | grep "ICMP messages failed" 0 ICMP messages failed For IPV6, implement ICMP6_MIB_OUTERRORS counter as well. # grep Icmp6OutErrors /proc/net/dev_snmp6/* /proc/net/dev_snmp6/eth0:Icmp6OutErrors 0 /proc/net/dev_snmp6/lo:Icmp6OutErrors 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f66ef2d0649b220874532dfb83b6b5b368f83591 Author: David S. Miller Date: Sat Apr 3 15:01:37 2010 -0700 l2tp: Fix L2TP_DEBUGFS ifdef tests. We have to check CONFIG_L2TP_DEBUGFS_MODULE as well as CONFIG_L2TP_DEBUGFS. Signed-off-by: David S. Miller commit f481c0d86227156fb1691b166a11c3f0058e1cb2 Author: David S. Miller Date: Sat Apr 3 14:58:07 2010 -0700 l2tp: Add missing semicolon to MODULE_ALIAS() in l2tp_netlink.c Signed-off-by: David S. Miller commit 2f77a3f50c4336dd5358aec0abb5247ded168515 Author: James Chapman Date: Fri Apr 2 06:19:46 2010 +0000 l2tp: Update documentation This patch adds documentation about the L2TPv3 functionality. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 789a4a2c61d843df67988d69e7c3f3a4bca97e8e Author: James Chapman Date: Fri Apr 2 06:19:40 2010 +0000 l2tp: Add support for static unmanaged L2TPv3 tunnels This patch adds support for static (unmanaged) L2TPv3 tunnels, where the tunnel socket is created by the kernel rather than being created by userspace. This means L2TP tunnels and sessions can be created manually, without needing an L2TP control protocol implemented in userspace. This might be useful where the user wants a simple ethernet over IP tunnel. A patch to iproute2 adds a new command set under "ip l2tp" to make use of this feature. This will be submitted separately. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 0ad6614048cf722e4d27909665b4846805357f1b Author: James Chapman Date: Fri Apr 2 06:19:33 2010 +0000 l2tp: Add debugfs files for dumping l2tp debug info The existing pppol2tp driver exports debug info to /proc/net/pppol2tp. Rather than adding info to that file for the new functionality added in this patch series, we add new files in debugfs, leaving the old /proc file for backwards compatibility (L2TPv2 only). Currently only one file is provided: l2tp/tunnels, which lists internal debug info for all l2tp tunnels and sessions. More files may be added later. The info is for debug and problem analysis only - userspace apps should use netlink to obtain status about l2tp tunnels and sessions. Although debugfs does not support net namespaces, the tunnels and sessions dumped in l2tp/tunnels are only those in the net namespace of the process reading the file. Signed-off-by: James Chapman Signed-off-by: David S. Miller commit d9e31d17ceba5f0736f5a34bbc236239cd42b420 Author: James Chapman Date: Fri Apr 2 06:19:26 2010 +0000 l2tp: Add L2TP ethernet pseudowire support This driver presents a regular net_device for each L2TP ethernet pseudowire instance. These interfaces are named l2tpethN by default, though userspace can specify an alternative name when the L2TP session is created, if preferred. When the pseudowire is established, regular Linux networking utilities may be used to configure the interface, i.e. give it IP address info or add it to a bridge. Any data passed over the interface is carried over an L2TP tunnel. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit e02d494d2c60746ee6583132904ac1791f5bc9a6 Author: James Chapman Date: Fri Apr 2 06:19:16 2010 +0000 l2tp: Convert rwlock to RCU Reader/write locks are discouraged because they are slower than spin locks. So this patch converts the rwlocks used in the per_net structs to rcu. Signed-off-by: James Chapman Signed-off-by: David S. Miller commit 309795f4bec2d69cd507a631f82065c2198a0825 Author: James Chapman Date: Fri Apr 2 06:19:10 2010 +0000 l2tp: Add netlink control API for L2TP In L2TPv3, we need to create/delete/modify/query L2TP tunnel and session contexts. The number of parameters is significant. So let's use netlink. Userspace uses this API to control L2TP tunnel/session contexts in the kernel. The previous pppol2tp driver was managed using [gs]etsockopt(). This API is retained for backwards compatibility. Unlike L2TPv2 which carries only PPP frames, L2TPv3 can carry raw ethernet frames or other frame types and these do not always have an associated socket family. Therefore, we need a way to use L2TP sessions that doesn't require a socket type for each supported frame type. Hence netlink is used. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit f408e0ce40270559ef80f231843c93baa9947bc5 Author: James Chapman Date: Fri Apr 2 06:19:05 2010 +0000 netlink: Export genl_lock() API for use by modules This lets kernel modules which use genl netlink APIs serialize netlink processing. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 0d76751fad7739014485ba5bd388d4f1b4fd4143 Author: James Chapman Date: Fri Apr 2 06:19:00 2010 +0000 l2tp: Add L2TPv3 IP encapsulation (no UDP) support This patch adds a new L2TPIP socket family and modifies the core to handle the case where there is no UDP header in the L2TP packet. L2TP/IP uses IP protocol 115. Since L2TP/UDP and L2TP/IP packets differ in layout, the datapath packet handling code needs changes too. Userspace uses an L2TPIP socket instead of a UDP socket when IP encapsulation is required. We can't use raw sockets for this because the semantics of raw sockets don't lend themselves to the socket-per-tunnel model - we need to Signed-off-by: David S. Miller commit e0d4435f93905f517003cfa7328a36ea19788147 Author: James Chapman Date: Fri Apr 2 06:18:54 2010 +0000 l2tp: Update PPP-over-L2TP driver to work over L2TPv3 This patch makes changes to the L2TP PPP code for L2TPv3. The existing code has some assumptions about the L2TP header which are broken by L2TPv3. Also the sockaddr_pppol2tp structure of the original code is too small to support the increased size of the L2TPv3 tunnel and session id, so a new sockaddr_pppol2tpv3 structure is needed. In the socket calls, the size of this structure is used to tell if the operation is for L2TPv2 or L2TPv3. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit f7faffa3ff8ef6ae712ef16312b8a2aa7a1c95fe Author: James Chapman Date: Fri Apr 2 06:18:49 2010 +0000 l2tp: Add L2TPv3 protocol support The L2TPv3 protocol changes the layout of the L2TP packet header. Tunnel and session ids change from 16-bit to 32-bit values, data sequence numbers change from 16-bit to 24-bit values and PPP-specific fields are moved into protocol-specific subheaders. Although this patch introduces L2TPv3 protocol support, there are no userspace interfaces to create L2TPv3 sessions yet. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 9345471bca96d00d4196b3dcc4a5625f1bfae247 Author: James Chapman Date: Fri Apr 2 06:18:44 2010 +0000 l2tp: Add ppp device name to L2TP ppp session data When dumping L2TP PPP sessions using /proc/net/pppol2tp, get the assigned PPP device name from PPP using ppp_dev_name(). Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 63f96072f9ba430aa348bc987c3d5a4f48bae301 Author: James Chapman Date: Fri Apr 2 06:18:39 2010 +0000 ppp: Add ppp_dev_name() exported function ppp_dev_name() gives PPP users visibility of a ppp channel's device name. This can be used by L2TP drivers to dump the assigned PPP interface name. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit fd558d186df2c13a22455373858bae634a4795af Author: James Chapman Date: Fri Apr 2 06:18:33 2010 +0000 l2tp: Split pppol2tp patch into separate l2tp and ppp parts This patch splits the pppol2tp driver into separate L2TP and PPP parts to prepare for L2TPv3 support. In L2TPv3, protocols other than PPP can be carried, so this split creates a common L2TP core that will handle the common L2TP bits which protocol support modules such as PPP will use. Note that the existing pppol2tp module is split into l2tp_core and l2tp_ppp by this change. There are no feature changes here. Internally, however, there are significant changes, mostly to handle the separation of PPP-specific data from the L2TP session and to provide hooks in the core for modules like PPP to access. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 21b4aaa14329db793832e865f15000c5c0192ac3 Author: James Chapman Date: Fri Apr 2 06:18:28 2010 +0000 l2tp: Relocate pppol2tp driver to new net/l2tp directory This patch moves the existing pppol2tp driver from drivers/net into a new net/l2tp directory, which is where the upcoming L2TPv3 code will live. The existing CONFIG_PPPOL2TP config option is left in its current place to avoid "make oldconfig" issues when an existing pppol2tp user takes this change. (This is the same approach used for the pppoatm driver, which moved to net/atm.) There are no code changes. The existing drivers/net/pppol2tp.c is simply moved to net/l2tp. Signed-off-by: James Chapman Reviewed-by: Randy Dunlap Signed-off-by: David S. Miller commit 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 Author: Jiri Pirko Date: Thu Apr 1 21:22:57 2010 +0000 net: convert multicast list to list_head Converts the list and the core manipulating with it to be the same as uc_list. +uses two functions for adding/removing mc address (normal and "global" variant) instead of a function parameter. +removes dev_mcast.c completely. +exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for manipulation with lists on a sandbox (used in bonding and 80211 drivers) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit a748ee2426817a95b1f03012d8f339c45c722ae1 Author: Jiri Pirko Date: Thu Apr 1 21:22:09 2010 +0000 net: move address list functions to a separate file +little renaming of unicast functions to be smooth with multicast ones Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 9fc4178b149ae8b0a2fbf83f2f4df3cf8789177b Author: Amit Kumar Salecha Date: Thu Apr 1 19:01:36 2010 +0000 qlcnic: update version to 5.0.1 Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 22dfaa86e90235b9e5ea014be4268f457c72a63c Author: Amit Kumar Salecha Date: Thu Apr 1 19:01:35 2010 +0000 qlcnic: fix endianness in fw validation cpu_to_le32 was missing and used improperly. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 34ce36268331719894c4b237a9413fe9e1ab4f75 Author: Amit Kumar Salecha Date: Thu Apr 1 19:01:34 2010 +0000 qlcnic: fix interface attach sequence Interface should be visible even if resource allocation fails. netif_device_attach should be called for every netif_device_detach. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 65b5b420b5974d86ee030b0a15cd9e6f228071f4 Author: Amit Kumar Salecha Date: Thu Apr 1 19:01:33 2010 +0000 qlcnic: add driver debug support Add debug print in driver, can be tuned by ethtool msg level callback. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit aa5e18c04af8706251768e6aba83465e31de7810 Author: Sucheta Chakraborty Date: Thu Apr 1 19:01:32 2010 +0000 qlcnic: use IDC defined timeout value o USE/Read IDC defined timeout value from ROM. o While resetting chip, don't wait for other pci-func to respond, more than reset_ack_timeo seconds, Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 0c39aa4819fab75dcce0b1a9d99dcac0d85274f6 Author: Dhananjay Phadke Date: Thu Apr 1 19:01:31 2010 +0000 qlcnic: fix onchip memory access Fix incorrect offset calculation and remove unnecessary remap of the region in bar 0 to access onchip memory. This was leading to read incorrect values by debug tools. Signed-off-by: Dhananjay Phadke Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b47acacd7c888ef550fb786dd02db69d9eb2faee Author: Dhananjay Phadke Date: Thu Apr 1 19:01:30 2010 +0000 qlcnic: update oncard memory size check All QLogic converged NICs have 128-bit 128MB on card memory. Fix the limit check from 64MB to 128MB and remove unnecessary 64-bit read/write checks. Signed-off-by: Dhananjay Phadke Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 897e8c7c450dac2912b677c6e6bf8b04aa5bdf72 Author: Dhananjay Phadke Date: Thu Apr 1 19:01:29 2010 +0000 qlcnic: handle queue manager access Check the access by tools for hardware queue engine and handle it separately than other block registers, otherwise incorrect data is returned. Signed-off-by: Dhananjay Phadke Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 0bc92b5b4987ab55f2b75ef42251476b2e049e3d Author: Amit Kumar Salecha Date: Thu Apr 1 19:01:28 2010 +0000 qlcnic: fix fw load from file Rarely: Fw file size can be unaligned to 8. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d Merge: 70a7c12 6e03bb5 Author: Ingo Molnar Date: Sat Apr 3 18:17:55 2010 +0200 Merge branch 'perf/urgent' into perf/core Conflicts: tools/perf/Makefile Merge reason: resolve the conflict. Signed-off-by: Ingo Molnar commit 70a7c1271e2bfca8ad2bf71f44c516ea2763b9ed Merge: 40b91cd 533c46c Author: Ingo Molnar Date: Sat Apr 3 18:16:42 2010 +0200 Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 533c46c31c0e82f19dbb087c77d85eaccd6fefdb Author: Arnaldo Carvalho de Melo Date: Sat Apr 3 11:54:35 2010 -0300 perf newt: Pass the input_name to perf_session__browse_hists So that it can use it in the 'perf annotate' command line, otherwise it'll use the default and not the specified -i filename passed to 'perf report'. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit e65713ea1e61e92d28284a55df2aa039ebe10003 Author: Arnaldo Carvalho de Melo Date: Sat Apr 3 11:25:56 2010 -0300 perf newt: Move the hist browser population bits to separare function Next patches will use that when applying filtes to then repopulate the browser with the narrowed vision. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit fb6b893180faec03e1d32149ef5cc412df9714df Author: Arnaldo Carvalho de Melo Date: Sat Apr 3 11:04:55 2010 -0300 perf newt: Remove useless column width calculation Not used in the TUI interface. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f18d4463d092162f34a8bd226505627ceeac3e8a Author: Luis Correia Date: Sat Apr 3 12:49:53 2010 +0100 rt2x00: remove MCU requests for SoC platforms The ralink SoC platforms do not have an MCU. Signed-off-by: Luis Correia Acked-by: Ivo van Doorn Signed-off-by: Gertjan van Wingerde commit 4af8b35db6634dd1e0d616de689582b6c93550af Author: Anton Blanchard Date: Sat Apr 3 22:53:31 2010 +1100 perf symbols: Fill in pgoff in mmap synthesized events When we synthesize mmap events we need to fill in the pgoff field. I wasn't able to test this completely since I couldn't find an executable region with a non 0 offset. We will see it when we start doing data profiling. Signed-off-by: Anton Blanchard Cc: David Miller Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <20100403115331.GK5594@kryten> Signed-off-by: Arnaldo Carvalho de Melo commit e206d556c5793ac5e28c0aaba2e07432e5f9a098 Author: Arnaldo Carvalho de Melo Date: Sat Apr 3 10:19:26 2010 -0300 perf tools: Move the prototypes in util/string.h to util.h So that we avoid conflict with libc's string.h header. Reviewed-by: KOSAKI Motohiro Suggested-by: KOSAKI Motohiro Cc: KOSAKI Motohiro Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 4e4f10f6498bc5038c0a110b5f21682fcb5578d7 Author: David Woodhouse Date: Fri Apr 2 01:05:56 2010 +0000 phylib: Add module table to all existing phy drivers Signed-off-by: David Woodhouse Signed-off-by: David S. Miller commit 8626d3b4328061f5b82b11ae1d6918a0c3602f42 Author: David Woodhouse Date: Fri Apr 2 01:05:27 2010 +0000 phylib: Support phy module autoloading We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away. [bwh: s/phy/mdio/ in module alias, kerneldoc for struct mdio_device_id] Signed-off-by: David Woodhouse Signed-off-by: Ben Hutchings Acked-by: Andy Fleming Signed-off-by: David S. Miller commit 9045b4b9f7f340f43de0cf687b5b52f6feaaa984 Author: J. Bruce Fields Date: Sun Feb 21 17:53:04 2010 -0800 nfsd4: remove probe task's reference on client Any null probe rpc will be synchronously destroyed by the rpc_shutdown_client() in expire_client(), so the rpc task cannot outlast the nfs4 client. Therefore there's no need for that task to hold a reference on the client. Signed-off-by: J. Bruce Fields commit 3df796dbe97a98a6a25e6b7b88e9d326e261f371 Author: J. Bruce Fields Date: Sun Feb 21 17:51:53 2010 -0800 nfsd4: remove dprintk I haven't found this useful. Signed-off-by: J. Bruce Fields commit 147efd0dd702ce2f1ab44449bd70369405ef68fd Author: J. Bruce Fields Date: Sun Feb 21 17:41:19 2010 -0800 nfsd4: shutdown callbacks on expiry Once we've expired the client, there's no further purpose to the callbacks; go ahead and shut down the callback client rather than waiting for the last reference to go. Signed-off-by: J. Bruce Fields commit 9092c658bab215b2752fa59d2a36c05b74d1e9e9 Author: Eric Dumazet Date: Fri Apr 2 13:34:49 2010 -0700 net: illegal_highdma() fix Followup to commit 5acbbd428db47b12f137a8a2aa96b3c0a96b744e (net: change illegal_highdma to use dma_mask) If dev->dev.parent is NULL, we should not try to dereference it. Dont force inline illegal_highdma() as its pretty big now. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 227f98d98d2ed7929f41426adc21f57b927354a6 Author: J. Bruce Fields Date: Thu Feb 18 08:27:24 2010 -0800 nfsd4: preallocate nfs4_rpc_args Instead of allocating this small structure, just include it in the delegation. The nfsd4_callback structure isn't really necessary yet, but we plan to add to it all the information necessary to perform a callback. Signed-off-by: J. Bruce Fields commit 91dd6c27a29f97d81d2f71651d3b6bb55a4c1788 Author: Frans Pop Date: Wed Mar 24 14:19:58 2010 -0700 iwlwifi: remove trailing space in messages Includes minor improvements in debugging messages in iwl-4965.c, function iwl4965_is_temp_calib_needed(). Signed-off-by: Frans Pop Cc: Zhu Yi Cc: Reinette Chatre Cc: Intel Linux Wireless Signed-off-by: Reinette Chatre commit b744cb79aec7d95905943c0bc64699eb02de143b Author: Wey-Yi Guy Date: Tue Mar 23 11:37:59 2010 -0700 iwlwifi: code cleanup for generic defines Some defines used by all agn devices, but the definitions were in iwl-4965-hw.h, move those to iwl-agn-hw.h which is the better place for those. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit d34a5a62da12ffa53b91895d094960b35474f2fc Author: Wey-Yi Guy Date: Tue Mar 23 10:17:03 2010 -0700 iwlwifi: deprecate "iwl4965" alias support Internal alias support has been present in module-init-tools for some time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 6aac74b40d5828c6f6b24974580aa43d7bee905c Author: Zhu Yi Date: Mon Mar 22 19:33:41 2010 -0700 iwlwifi: clear rxq->queue in queue reset In iwl_rx_queue_reset(), we didn't clear the rxq->queue[]. This might cause the same rxb appears on multiple places in rxq->queue. Although this won't cause any problem because of the read and write pointers protection in rxq, we'd better clear it to avoid misleading. Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre commit bed2263feb10ea29b2696030cdec2eea611caf14 Author: Wey-Yi Guy Date: Mon Mar 22 14:42:03 2010 -0700 iwlwifi: remove irrelevant comments Removing irrelevant comments from iwl-agn.c Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 2b068618031a91929c21410069f872178ec00329 Author: Wey-Yi Guy Date: Mon Mar 22 09:17:39 2010 -0700 iwlwifi: merge module parameters into single place Module parameters used to be defined in both iwl-5000.c and iwl-4965.c, after the code re-structure, merge into iwl-agn.c for easy to read and maintenance. Number of module parameters are deprecated after this merge. These are also scheduled for removal by 2.6.40. The current supported parameters are: parm: debug50:50XX debug output mask (deprecated) (uint) parm: debug:debug output mask (uint) parm: swcrypto50:using crypto in software (default 0 [hardware]) (deprecated) (bool) parm: swcrypto:using crypto in software (default 0 [hardware]) (int) parm: queues_num50:number of hw queues in 50xx series (deprecated) (int) parm: queues_num:number of hw queues. (int) parm: 11n_disable50:disable 50XX 11n functionality (deprecated) (int) parm: 11n_disable:disable 11n functionality (int) parm: amsdu_size_8K50:enable 8K amsdu size in 50XX series (deprecated) (int) parm: amsdu_size_8K:enable 8K amsdu size (int) parm: fw_restart50:restart firmware in case of error (deprecated) (int) parm: fw_restart:restart firmware in case of error (int) parm: disable_hw_scan:disable hardware scanning (default 0) (int) Remove "antenna" module parameter, it is not being used in "agn" driver. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 2aefa4f733f2c5ce51dd2316ffecb258463fde71 Author: Arnaldo Carvalho de Melo Date: Fri Apr 2 12:30:57 2010 -0300 perf tools: sort_dimension__add shouldn't die Propagate error instead. LKML-Reference: Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit ad5b217b152d99ca3922153500c619d9758dd87a Author: Arnaldo Carvalho de Melo Date: Fri Apr 2 10:04:18 2010 -0300 perf session: Remove one more exit() call from library code Return NULL instead and make the caller propagate the error. LKML-Reference: Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit b9fb93047756c5e4129dfda7591612de61b0e877 Author: Arnaldo Carvalho de Melo Date: Fri Apr 2 09:50:42 2010 -0300 perf hist: Only allocate callchain_node if processing callchains The struct callchain_node size is 120 bytes, that are never used when there are no callchains or '-g none' is specified, so conditionally allocate it, reducing sizeof(struct hist_entry) from 210 bytes to only 96, greatly speeding the non-callchain processing. LKML-Reference: Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 71cf8b8ff7d6a79af086be9e4c72628da9d62d58 Author: Arnaldo Carvalho de Melo Date: Thu Apr 1 21:24:38 2010 -0300 perf kmem: Fixup the symbol address before using it We get absolute addresses in the events, but relative ones from the symbol subsystem, so calculate the absolute address by asking for the map where the symbol was found, that has the place where the DSO was actually loaded. For the core kernel this poses no problems if the kernel is not relocated by things like kexec, or if we use /proc/kallsyms, but for modules we were getting really large, negative offsets. LKML-Reference: Cc: Frédéric Weisbecker Cc: Li Zefan Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit e727ca73f85d4c5be3547eda674168219d1c22d8 Author: Arnaldo Carvalho de Melo Date: Thu Apr 1 19:12:13 2010 -0300 perf kmem: Resolve kernel symbols again Due to the assumption in perf_session__new that the kernel maps would be created using the fake PERF_RECORD_MMAP event in a perf.data file 'perf kmem --stat caller', that doesn't have such event, ends up not being able to resolve the kernel addresses. Fix it by calling perf_session__create_kernel_maps() in __cmd_kmem(). LKML-Reference: Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit a4e3b956a820162b7c1d616117b4f23b6017f504 Author: Arnaldo Carvalho de Melo Date: Wed Mar 31 11:33:40 2010 -0300 perf hist: Replace ->print() routines by ->snprintf() equivalents Then hist_entry__fprintf will just us the newly introduced hist_entry__snprintf, add the newline and fprintf it to the supplied FILE descriptor. This allows us to remove the use_browser checking in the color_printf routines, that now got color_snprintf variants too. The newt TUI browser (and other GUIs that may come in the future) don't have to worry about stdio specific stuff in the strings they get from the se->snprintf routines and instead use whatever means to do the equivalent. Also the newt TUI browser don't have to use the fmemopen() hack, instead it can use the se->snprintf routines directly. For now tho use the hist_entry__snprintf routine to reduce the patch size. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 70162138c91b040da3162fe1f34fe8aaf6506f10 Author: Arnaldo Carvalho de Melo Date: Tue Mar 30 18:27:39 2010 -0300 perf record: Add a fallback to the reference relocation symbol Usually "_text" is enough, but I received reports that its not always available, so fallback to "_stext" for the symbol we use to check if we need to apply any relocation to all the symbols in the kernel symtab, for when, for instance, kexec is being used. Reported-by: Darren Hart Cc: Darren Hart Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit c29ede615fd35a640e771fbbb1778e915fac43a7 Author: Arnaldo Carvalho de Melo Date: Sat Mar 27 14:30:45 2010 -0300 perf tools: Allow specifying O= to build files in a separate directory Avoiding polluting the source tree with build files. Reported-by: Steven Rostedt Cc: Steven Rostedt Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 8b2c551f9635bf1c5c2d38de300137998915478f Author: Arnaldo Carvalho de Melo Date: Sat Mar 27 11:43:36 2010 -0300 perf tools: Use -o $(BITBUCKET) in one more case As described in 1703f2c some gcc versions has issues using /dev/null, so use the mechanism used elsewhere. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 5f4d3f8816461300ce54505c9117bf85b3044aa0 Author: Arnaldo Carvalho de Melo Date: Fri Mar 26 21:16:22 2010 -0300 perf report: Add progress bars For when we are processing the events and inserting the entries in the browser. Experimentation here: naming "ui_something" we may be treading into creating a TUI/GUI set of routines that can then be implemented in terms of multiple backends. Also the time it takes for adding things to the "browser" takes, visually (I guess I should do some profiling here ;-) ), more time than for processing the events... That means we probably need to create a custom hist_entry browser, so that we reuse the structures we have in place instead of duplicating them in newt. But progress was made and at least we can see something while long files are being loaded, that must be one of UI 101 bullet points :-) Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 7e5e1b1404c30db5f6bc3f5203b6c21c1d244f99 Author: Arnaldo Carvalho de Melo Date: Fri Mar 26 12:30:40 2010 -0300 perf symbols: map_groups__find_symbol must return the map too Tools need to know from which map in the map_group a symbol was resolved to, so that, for isntance, we can annotate kernel modules symbols by getting its precise name, etc. Also add the _by_name variants for completeness. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit c6e718ff8cdcf5e7855077687720b37c4a07650a Author: Arnaldo Carvalho de Melo Date: Fri Mar 26 12:11:06 2010 -0300 perf symbols: Move more map_groups methods to map.c While writing a standalone test app that uses the symbol system to find kernel space symbols I noticed these also need to be moved. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Arnaldo Carvalho de Melo commit 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 Author: Peter Zijlstra Date: Wed Mar 24 16:38:48 2010 +0100 sched: Add enqueue/dequeue flags In order to reduce the dependency on TASK_WAKING rework the enqueue interface to support a proper flags field. Replace the int wakeup, bool head arguments with an int flags argument and create the following flags: ENQUEUE_WAKEUP - the enqueue is a wakeup of a sleeping task, ENQUEUE_WAKING - the enqueue has relative vruntime due to having sched_class::task_waking() called, ENQUEUE_HEAD - the waking task should be places on the head of the priority queue (where appropriate). For symmetry also convert sched_class::dequeue() to a flags scheme. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit cc87f76a601d2d256118f7bab15e35254356ae21 Author: Peter Zijlstra Date: Fri Mar 26 12:22:14 2010 +0100 sched: Fix nr_uninterruptible count The cpuload calculation in calc_load_account_active() assumes rq->nr_uninterruptible will not change on an offline cpu after migrate_nr_uninterruptible(). However the recent migrate on wakeup changes broke that and would result in decrementing the offline cpu's rq->nr_uninterruptible. Fix this by accounting the nr_uninterruptible on the waking cpu. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 65cc8e4859ff29a9ddc989c88557d6059834c2a2 Author: Peter Zijlstra Date: Thu Mar 25 21:05:16 2010 +0100 sched: Optimize task_rq_lock() Now that we hold the rq->lock over set_task_cpu() again, we can do away with most of the TASK_WAKING checks and reduce them again to set_cpus_allowed_ptr(). Removes some conditionals from scheduling hot-paths. Signed-off-by: Peter Zijlstra Cc: Oleg Nesterov LKML-Reference: Signed-off-by: Ingo Molnar commit 0017d735092844118bef006696a750a0e4ef6ebd Author: Peter Zijlstra Date: Wed Mar 24 18:34:10 2010 +0100 sched: Fix TASK_WAKING vs fork deadlock Oleg noticed a few races with the TASK_WAKING usage on fork. - since TASK_WAKING is basically a spinlock, it should be IRQ safe - since we set TASK_WAKING (*) without holding rq->lock it could be there still is a rq->lock holder, thereby not actually providing full serialization. (*) in fact we clear PF_STARTING, which in effect enables TASK_WAKING. Cure the second issue by not setting TASK_WAKING in sched_fork(), but only temporarily in wake_up_new_task() while calling select_task_rq(). Cure the first by holding rq->lock around the select_task_rq() call, this will disable IRQs, this however requires that we push down the rq->lock release into select_task_rq_fair()'s cgroup stuff. Because select_task_rq_fair() still needs to drop the rq->lock we cannot fully get rid of TASK_WAKING. Reported-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 9084bb8246ea935b98320554229e2f371f7f52fa Author: Oleg Nesterov Date: Mon Mar 15 10:10:27 2010 +0100 sched: Make select_fallback_rq() cpuset friendly Introduce cpuset_cpus_allowed_fallback() helper to fix the cpuset problems with select_fallback_rq(). It can be called from any context and can't use any cpuset locks including task_lock(). It is called when the task doesn't have online cpus in ->cpus_allowed but ttwu/etc must be able to find a suitable cpu. I am not proud of this patch. Everything which needs such a fat comment can't be good even if correct. But I'd prefer to not change the locking rules in the code I hardly understand, and in any case I believe this simple change make the code much more correct compared to deadlocks we currently have. Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <20100315091027.GA9155@redhat.com> Signed-off-by: Ingo Molnar commit 6a1bdc1b577ebcb65f6603c57f8347309bc4ab13 Author: Oleg Nesterov Date: Mon Mar 15 10:10:23 2010 +0100 sched: _cpu_down(): Don't play with current->cpus_allowed _cpu_down() changes the current task's affinity and then recovers it at the end. The problems are well known: we can't restore old_allowed if it was bound to the now-dead-cpu, and we can race with the userspace which can change cpu-affinity during unplug. _cpu_down() should not play with current->cpus_allowed at all. Instead, take_cpu_down() can migrate the caller of _cpu_down() after __cpu_disable() removes the dying cpu from cpu_online_mask. Signed-off-by: Oleg Nesterov Acked-by: Rafael J. Wysocki Signed-off-by: Peter Zijlstra LKML-Reference: <20100315091023.GA9148@redhat.com> Signed-off-by: Ingo Molnar commit 30da688ef6b76e01969b00608202fff1eed2accc Author: Oleg Nesterov Date: Mon Mar 15 10:10:19 2010 +0100 sched: sched_exec(): Remove the select_fallback_rq() logic sched_exec()->select_task_rq() reads/updates ->cpus_allowed lockless. This can race with other CPUs updating our ->cpus_allowed, and this looks meaningless to me. The task is current and running, it must have online cpus in ->cpus_allowed, the fallback mode is bogus. And, if ->sched_class returns the "wrong" cpu, this likely means we raced with set_cpus_allowed() which was called for reason, why should sched_exec() retry and call ->select_task_rq() again? Change the code to call sched_class->select_task_rq() directly and do nothing if the returned cpu is wrong after re-checking under rq->lock. From now task_struct->cpus_allowed is always stable under TASK_WAKING, select_fallback_rq() is always called under rq-lock or the caller or the caller owns TASK_WAKING (select_task_rq). Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <20100315091019.GA9141@redhat.com> Signed-off-by: Ingo Molnar commit c1804d547dc098363443667609c272d1e4d15ee8 Author: Oleg Nesterov Date: Mon Mar 15 10:10:14 2010 +0100 sched: move_task_off_dead_cpu(): Remove retry logic The previous patch preserved the retry logic, but it looks unneeded. __migrate_task() can only fail if we raced with migration after we dropped the lock, but in this case the caller of set_cpus_allowed/etc must initiate migration itself if ->on_rq == T. We already fixed p->cpus_allowed, the changes in active/online masks must be visible to racer, it should migrate the task to online cpu correctly. Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <20100315091014.GA9138@redhat.com> Signed-off-by: Ingo Molnar commit 1445c08d06c5594895b4fae952ef8a457e89c390 Author: Oleg Nesterov Date: Mon Mar 15 10:10:10 2010 +0100 sched: move_task_off_dead_cpu(): Take rq->lock around select_fallback_rq() move_task_off_dead_cpu()->select_fallback_rq() reads/updates ->cpus_allowed lockless. We can race with set_cpus_allowed() running in parallel. Change it to take rq->lock around select_fallback_rq(). Note that it is not trivial to move this spin_lock() into select_fallback_rq(), we must recheck the task was not migrated after we take the lock and other callers do not need this lock. To avoid the races with other callers of select_fallback_rq() which rely on TASK_WAKING, we also check p->state != TASK_WAKING and do nothing otherwise. The owner of TASK_WAKING must update ->cpus_allowed and choose the correct CPU anyway, and the subsequent __migrate_task() is just meaningless because p->se.on_rq must be false. Alternatively, we could change select_task_rq() to take rq->lock right after it calls sched_class->select_task_rq(), but this looks a bit ugly. Also, change it to not assume irqs are disabled and absorb __migrate_task_irq(). Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <20100315091010.GA9131@redhat.com> Signed-off-by: Ingo Molnar commit 897f0b3c3ff40b443c84e271bef19bd6ae885195 Author: Oleg Nesterov Date: Mon Mar 15 10:10:03 2010 +0100 sched: Kill the broken and deadlockable cpuset_lock/cpuset_cpus_allowed_locked code This patch just states the fact the cpusets/cpuhotplug interaction is broken and removes the deadlockable code which only pretends to work. - cpuset_lock() doesn't really work. It is needed for cpuset_cpus_allowed_locked() but we can't take this lock in try_to_wake_up()->select_fallback_rq() path. - cpuset_lock() is deadlockable. Suppose that a task T bound to CPU takes callback_mutex. If cpu_down(CPU) happens before T drops callback_mutex stop_machine() preempts T, then migration_call(CPU_DEAD) tries to take cpuset_lock() and hangs forever because CPU is already dead and thus T can't be scheduled. - cpuset_cpus_allowed_locked() is deadlockable too. It takes task_lock() which is not irq-safe, but try_to_wake_up() can be called from irq. Kill them, and change select_fallback_rq() to use cpu_possible_mask, like we currently do without CONFIG_CPUSETS. Also, with or without this patch, with or without CONFIG_CPUSETS, the callers of select_fallback_rq() can race with each other or with set_cpus_allowed() pathes. The subsequent patches try to to fix these problems. Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <20100315091003.GA9123@redhat.com> Signed-off-by: Ingo Molnar commit 25c2d55c00c6097e6792ebf21e31342f23b9b768 Author: Li Zefan Date: Wed Mar 24 13:17:50 2010 +0800 sched: Remove USER_SCHED from documentation USER_SCHED has been removed, so update the documentation accordingly. Signed-off-by: Li Zefan Signed-off-by: Peter Zijlstra Acked-by: Serge E. Hallyn LKML-Reference: <4BA9A07E.8070508@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 32bd7eb5a7f4596c8440dd9440322fe9e686634d Author: Li Zefan Date: Wed Mar 24 13:17:19 2010 +0800 sched: Remove remaining USER_SCHED code This is left over from commit 7c9414385e ("sched: Remove USER_SCHED"") Signed-off-by: Li Zefan Acked-by: Dhaval Giani Signed-off-by: Peter Zijlstra Cc: David Howells LKML-Reference: <4BA9A05F.7010407@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit c9494727cf293ae2ec66af57547a3e79c724fec2 Merge: 6427462 42be79e Author: Ingo Molnar Date: Fri Apr 2 20:02:55 2010 +0200 Merge branch 'linus' into sched/core Merge reason: update to latest upstream Signed-off-by: Ingo Molnar commit 40b91cd10f000b4c4934e48e2e5c0bec66def144 Author: Peter Zijlstra Date: Mon Mar 29 16:37:17 2010 +0200 perf, x86: Add Nehalem programming quirk to Westmere According to the Xeon-5600 errata the Westmere suffers the same PMU programming bug as the original Nehalem did. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit caaa8be3b6707cb9664e573a28b00f845ce9f32e Author: Peter Zijlstra Date: Mon Mar 29 13:09:53 2010 +0200 perf, x86: Fix __initconst vs const All variables that have __initconst should also be const. Suggested-by: Stephen Rothwell Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit b4cdc5c264b35c67007800dec3928e9547a9d70b Author: Peter Zijlstra Date: Tue Mar 30 17:00:06 2010 +0200 perf, x86: Fix up the ANY flag stuff Stephane noticed that the ANY flag was in generic arch code, and Cyrill reported that it broke the P4 code. Solve this by merging x86_pmu::raw_event into x86_pmu::hw_config and provide intel_pmu and amd_pmu specific versions of this callback. The intel_pmu one deals with the ANY flag, the amd_pmu adds the few extra event bits AMD64 has. Reported-by: Stephane Eranian Reported-by: Cyrill Gorcunov Acked-by: Robert Richter Acked-by: Cyrill Gorcunov Acked-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1269968113.5258.442.camel@laptop> Signed-off-by: Ingo Molnar commit a098f4484bc7dae23f5b62360954007b99b64600 Author: Robert Richter Date: Tue Mar 30 11:28:21 2010 +0200 perf, x86: implement ARCH_PERFMON_EVENTSEL bit masks ARCH_PERFMON_EVENTSEL bit masks are often used in the kernel. This patch adds macros for the bit masks and removes local defines. The function intel_pmu_raw_event() becomes x86_pmu_raw_event() which is generic for x86 models and same also for p6. Duplicate code is removed. Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <20100330092821.GH11907@erda.amd.com> Signed-off-by: Ingo Molnar commit 948b1bb89a44561560531394c18da4a99215f772 Author: Robert Richter Date: Mon Mar 29 18:36:50 2010 +0200 perf, x86: Undo some some *_counter* -> *_event* renames The big rename: cdd6c48 perf: Do the big rename: Performance Counters -> Performance Events accidentally renamed some members of stucts that were named after registers in the spec. To avoid confusion this patch reverts some changes. The related specs are MSR descriptions in AMD's BKDGs and the ARCHITECTURAL PERFORMANCE MONITORING section in the Intel 64 and IA-32 Architectures Software Developer's Manuals. This patch does: $ sed -i -e 's:num_events:num_counters:g' \ arch/x86/include/asm/perf_event.h \ arch/x86/kernel/cpu/perf_event_amd.c \ arch/x86/kernel/cpu/perf_event.c \ arch/x86/kernel/cpu/perf_event_intel.c \ arch/x86/kernel/cpu/perf_event_p6.c \ arch/x86/kernel/cpu/perf_event_p4.c \ arch/x86/oprofile/op_model_ppro.c $ sed -i -e 's:event_bits:cntval_bits:g' -e 's:event_mask:cntval_mask:g' \ arch/x86/kernel/cpu/perf_event_amd.c \ arch/x86/kernel/cpu/perf_event.c \ arch/x86/kernel/cpu/perf_event_intel.c \ arch/x86/kernel/cpu/perf_event_p6.c \ arch/x86/kernel/cpu/perf_event_p4.c Signed-off-by: Robert Richter Signed-off-by: Peter Zijlstra LKML-Reference: <1269880612-25800-2-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit ec5e61aabeac58670691bd0613388d16697d0d81 Merge: 75ec5a2 8bb39f9 Author: Ingo Molnar Date: Fri Apr 2 19:37:50 2010 +0200 Merge branch 'perf/urgent' into perf/core Conflicts: arch/x86/kernel/cpu/perf_event.c Merge reason: Resolve the conflict, pick up fixes Signed-off-by: Ingo Molnar commit 75ec5a245c7763c397f31ec8964d0a46c54a7386 Author: Masami Hiramatsu Date: Fri Apr 2 12:50:59 2010 -0400 perf probe: Fix to close dwarf when failing to analyze it Fix to close libdw routine when failing to analyze it in find_perf_probe_point(). Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: systemtap Cc: DLE LKML-Reference: <20100402165059.23551.95587.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 12e5a7ae475ccb2733d740ffb95d9ca0a18392da Author: Masami Hiramatsu Date: Fri Apr 2 12:50:53 2010 -0400 perf probe: Correct error message for non-structure type perf probe outputs incorrect error message when it is called with non-existent field on a non-data structure local variable. # perf probe vfs_read 'count.hoge' Fatal: Structure on a register is not supported yet. # perf probe vfs_read 'count->hoge' Fatal: Semantic error: hoge must be referred by '.' This corrects the messsage. # perf probe vfs_read 'count.hoge' Fatal: count is not a data structure. # perf probe vfs_read 'count->hoge' Fatal: count is not a data structure. Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: systemtap Cc: DLE LKML-Reference: <20100402165052.23551.75866.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit c9e385826d4f1ca5a72005ab8503598f791a8dc0 Author: Masami Hiramatsu Date: Fri Apr 2 12:50:45 2010 -0400 perf probe: Fix not to return non-matched file Fix cu_find_realpath() not to return the last file path if that is not matched to input pattern. Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: systemtap Cc: DLE LKML-Reference: <20100402165045.23551.47780.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 085ea739adf107b5a5d131f3625e517ff4a5181e Author: Masami Hiramatsu Date: Fri Apr 2 12:50:39 2010 -0400 perf probe: Fix --line syntax help and document Just fix typos. --line option accepts ':START-END' syntax, not ':START:END'. Signed-off-by: Masami Hiramatsu Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Frederic Weisbecker Cc: systemtap Cc: DLE LKML-Reference: <20100402165038.23551.62590.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 8c0d8fa26ba5ec1f69e88044c671dab58c51e0e1 Author: Tejun Heo Date: Tue Mar 30 02:52:40 2010 +0900 mfd: 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 Acked-by: Samuel Ortiz Signed-off-by: Mark Brown commit ba343c7736b36d62d276e20383588bcf9403d6c6 Author: Sarveshwar Bandi Date: Wed Mar 31 02:56:12 2010 +0000 be2net: Adding PCI SRIOV support - Patch adds support to enable PCI SRIOV in the driver and changes to handle initialization of PCI virtual functions. - Function handler to change mac addresses for VF from its corresponding PF. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit f64e96973a1fa885ce6e4f7e3fdbae83de98fcab Author: Alexander Kurz Date: Wed Mar 31 02:42:10 2010 +0000 net/pcmcia/3c589_cs: using netdev_info and friends where appropriate Signed-off-by: Alexander Kurz Signed-off-by: David S. Miller commit e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8 Author: Bryan Wu Date: Wed Mar 31 02:10:44 2010 +0000 netdev/fec.c: add phylib supporting to enable carrier detection (v2) BugLink: http://bugs.launchpad.net/bugs/457878 v2: - remove duplicated phy_speed caculation - fix the phy_speed caculation according to the DataSheet v1: - removed old MII phy control code - add phylib supporting - add ethtool interface to make user space NetworkManager works Tested on Freescale i.MX51 Babbage board. This patch is based on a patch from Frederic Rodo Cc: Frederic Rodo Signed-off-by: Bryan Wu Acked-by: Amit Kucheria Acked-by: Sascha Hauer Signed-off-by: David S. Miller commit 5acbbd428db47b12f137a8a2aa96b3c0a96b744e Author: FUJITA Tomonori Date: Tue Mar 30 22:35:50 2010 +0000 net: change illegal_highdma to use dma_mask Robert Hancock pointed out two problems about NETIF_F_HIGHDMA: -Many drivers only set the flag when they detect they can use 64-bit DMA, since otherwise they could receive DMA addresses that they can't handle (which on platforms without IOMMU/SWIOTLB support is fatal). This means that if 64-bit support isn't available, even buffers located below 4GB will get copied unnecessarily. -Some drivers set the flag even though they can't actually handle 64-bit DMA, which would mean that on platforms without IOMMU/SWIOTLB they would get a DMA mapping error if the memory they received happened to be located above 4GB. http://lkml.org/lkml/2010/3/3/530 We can use the dma_mask if we need bouncing or not here. Then we can safely fix drivers that misuse NETIF_F_HIGHDMA. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit 4fd89b7af28292e190650b9b9bc4308658d81dd1 Author: Dmitry Kravkov Date: Thu Apr 1 19:45:34 2010 -0700 bnx2x: Added GRO support Adding GRO support on top of the HW LRO (TPA) support – there is no measurable performance drawback of adding GRO on top of it, and it allows better performance when LRO (TPA) is turned off for virtualization or bridging. Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d7997fe1f4584da12e9c29fb682c18e9bdc13b73 Author: Timo Teräs Date: Wed Mar 31 00:17:06 2010 +0000 flow: structurize flow cache Group all per-cpu data to one structure instead of having many globals. Also prepare the internals so that we can have multiple instances of the flow cache if needed. Only the kmem_cache is left as a global as all flow caches share the same element size, and benefit from using a common cache. Signed-off-by: Timo Teras Acked-by: Herbert Xu Signed-off-by: David S. Miller commit ea2dea9dacc256fe927857feb423872051642ae7 Author: Timo Teräs Date: Wed Mar 31 00:17:05 2010 +0000 xfrm: remove policy lock when accessing policy->walk.dead All of the code considers ->dead as a hint that the cached policy needs to get refreshed. The read side can just drop the read lock without any side effects. The write side needs to make sure that it's written only exactly once. Only possible race is at xfrm_policy_kill(). This is fixed by checking result of __xfrm_policy_unlink() when needed. It will always succeed if the policy object is looked up from the hash list (so some checks are removed), but it needs to be checked if we are trying to unlink policy via a reference (appropriate checks added). Since policy->walk.dead is written exactly once, it no longer needs to be protected with a write lock. Signed-off-by: Timo Teras Acked-by: Herbert Xu Signed-off-by: David S. Miller commit c8bf4d04f970fafb3430d332533e1cf103f2a018 Author: Timo Teräs Date: Wed Mar 31 00:17:04 2010 +0000 xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler Add missing check for policy direction verification. This is especially important since without this xfrm_user may end up deleting per-socket policy which is not allowed. Signed-off-by: Timo Teras Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 34996cb91dd72f0b0456d8fd3fef4aaee62232f2 Author: Herbert Xu Date: Wed Mar 31 01:19:49 2010 +0000 xfrm: Remove xfrm_state_genid The xfrm state genid only needs to be matched against the copy saved in xfrm_dst. So we don't need a global genid at all. In fact, we don't even need to initialise it. Based on observation by Timo Teräs. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bd2c77a0a749589b45f2697ea446a4438d078f9b Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Wed Mar 31 22:24:22 2010 +0000 ipv6 fib: Make rt6_info{} more cache-line aware. The head element of rt6_info{} is dst_entry{}, and IPv6 specific elements follow. Because elements at the end of dst_entry{} are frequently updated, it is not good to put frequently-used static elements, such as rt6i_idev, rt6i_dst or rt6i_flags in the same cache line. On the other hand, fib6_table, rt6i_node or rt6i_gateway are rarely used, so it is okay to stay in the same cache line. Let's rearrange rt6_info{}. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 152102c7f2bf191690f1069bae292ea3925adf14 Author: Changli Gao Date: Tue Mar 30 20:16:22 2010 +0000 rps: keep the old behavior on SMP without rps keep the old behavior on SMP without rps RPS introduces a lock operation to per cpu variable input_pkt_queue on SMP whenever rps is enabled or not. On SMP without RPS, this lock isn't needed at all. Signed-off-by: Changli Gao ---- net/core/dev.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) Signed-off-by: David S. Miller commit 630b943c182d1aed69f244405131902fbcba7ec6 Author: Eric Dumazet Date: Wed Mar 31 02:08:31 2010 +0000 r8169: Fix rtl8169_rx_interrupt() In case a reset is performed, rtl8169_rx_interrupt() is called from process context instead of softirq context. Special care must be taken to call appropriate network core services (netif_rx() instead of netif_receive_skb()). VLAN handling also corrected. Reported-by: Sergey Senozhatsky Tested-by: Sergey Senozhatsky Diagnosed-by: Oleg Nesterov Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 5d944c640b4ae5f37c537acf491c2f0eb89fa0d6 Author: Eric Dumazet Date: Wed Mar 31 07:06:04 2010 +0000 gen_estimator: deadlock fix One of my test machine got a deadlock during "tc" sessions, adding/deleting classes & filters, using traffic estimators. After some analysis, I believe we have a potential use after free case in est_timer() : spin_lock(e->stats_lock); << HERE >> read_lock(&est_lock); if (e->bstats == NULL) << TEST >> goto skip; Test is done a bit late, because after estimator is killed, and before rcu grace period elapsed, we might already have freed/reuse memory where e->stats_locks points to (some qdisc->q.lock) A possible fix is to respect a rcu grace period at Qdisc dismantle time. On 64bit, sizeof(struct Qdisc) is exactly 192 bytes. Adding 16 bytes to it (for struct rcu_head) is a problem because it might change performance, given QDISC_ALIGNTO is 32 bytes. This is why I also change QDISC_ALIGNTO to 64 bytes, to satisfy most current alignment requirements. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d4fc6dbb5ae51430e35b2005f6d68938861f8d8b Author: Hagen Paul Pfeifer Date: Wed Mar 31 14:54:46 2010 +0000 ipv4: remove redundant verification code The check if error signaling is wanted (inet->recverr != 0) is done by the caller: raw.c:raw_err() and udp.c:__udp4_lib_err(), so there is no need to check this condition again. Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 430e55b11e9756bb7648fc1cdf5063e385cd6dec Author: FUJITA Tomonori Date: Wed Mar 31 22:13:06 2010 +0000 acenic: use the dma state API instead of the pci equivalents The DMA API is preferred. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit 07e7de8f7a7146b3ac77c52ebd91c93a8370d9a8 Author: FUJITA Tomonori Date: Wed Mar 31 22:13:05 2010 +0000 acenic: fix the misusage of zero dma address acenic wrongly assumes that zero is an invalid dma address (calls dma_unmap_page for only non zero dma addresses). Zero is a valid dma address on some architectures. The dma length can be used here. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit c125ba3becb3cb93b2207cf06656aead6506de3d Merge: 7a2e38a a68d5a5 Author: Takashi Iwai Date: Thu Apr 1 16:04:28 2010 +0200 Merge branch 'topic/hda-alc-mute' into topic/hda commit 7a2e38a555f2b1a20aaaf30f3d8ecad8faa97ea7 Merge: c35c9d5 b8e80cf Author: Takashi Iwai Date: Thu Apr 1 16:04:13 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 02e4eb75912a5c8babccc1acdc9cc913989be04e Author: Eric Dumazet Date: Thu Apr 1 14:35:56 2010 +0200 netfilter: xt_hashlimit: RCU conversion xt_hashlimit uses a central lock per hash table and suffers from contention on some workloads. (Multiqueue NIC or if RPS is enabled) After RCU conversion, central lock is only used when a writer wants to add or delete an entry. For 'readers', updating an existing entry, they use an individual lock per entry. Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 902a3dd5e6b19048604ec533203d7d38a39505a2 Author: Eric Dumazet Date: Thu Apr 1 12:54:09 2010 +0200 netfilter: CLUSTERIP: clusterip_seq_stop() fix If clusterip_seq_start() memory allocation fails, we crash later in clusterip_seq_start(), trying to kfree(ERR_PTR(-ENOMEM)) Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit d26e6a02835affa8bafe09a51e37f9fbc339e415 Author: Jiri Pirko Date: Thu Apr 1 12:39:19 2010 +0200 netfilter: ctnetlink: compute message size properly Message size should be dependent on the presence of an accounting extension, not on CONFIG_NF_CT_ACCT definition. Signed-off-by: Jiri Pirko Signed-off-by: Patrick McHardy commit 00bc42a11b0be6ce34c403ccc1990a6846a90d37 Author: Justin P. Mattock Date: Wed Mar 31 16:22:54 2010 -0700 Remove empty comment in acpi/power.c Remove an empty comment. Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 6c57990696a16ae43ea9fddb131b2784292068ba Author: Stephen Rothwell Date: Thu Apr 1 00:28:49 2010 -0700 net-caif: using kmalloc/kfree requires the include of slab.h Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit ff0ff84a0767df48d728c36510365344a7e7d582 Author: Steven Rostedt Date: Wed Mar 31 22:11:42 2010 -0400 ring-buffer: Add lost event count to end of sub buffer Currently, binary readers of the ring buffer only know where events were lost, but not how many events were lost at that location. This information is available, but it would require adding another field to the sub buffer header to include it. But when a event can not fit at the end of a sub buffer, it is written to the next sub buffer. This means there is a good chance that the buffer may have room to hold this counter. If it does, write the counter at the end of the sub buffer and set another flag in the data size field that states that this information exists. Signed-off-by: Steven Rostedt commit bc21b478425ac73f66a5ec0b375a5e0d12d609ce Author: Steven Rostedt Date: Wed Mar 31 19:49:26 2010 -0400 tracing: Show the lost events in the trace_pipe output Now that the ring buffer can keep track of where events are lost. Use this information to the output of trace_pipe: hackbench-3588 [001] 1326.701660: lock_acquire: ffffffff816591e0 read rcu_read_lock hackbench-3588 [001] 1326.701661: lock_acquire: ffff88003f4091f0 &(&dentry->d_lock)->rlock hackbench-3588 [001] 1326.701664: lock_release: ffff88003f4091f0 &(&dentry->d_lock)->rlock CPU:1 [LOST 673 EVENTS] hackbench-3588 [001] 1326.702711: kmem_cache_free: call_site=ffffffff81102b85 ptr=ffff880026d96738 hackbench-3588 [001] 1326.702712: lock_release: ffff88003e1480a8 &mm->mmap_sem hackbench-3588 [001] 1326.702713: lock_acquire: ffff88003e1480a8 &mm->mmap_sem Even works with the function graph tracer: 2) ! 170.098 us | } 2) 4.036 us | rcu_irq_exit(); 2) 3.657 us | idle_cpu(); 2) ! 190.301 us | } CPU:2 [LOST 2196 EVENTS] 2) 0.853 us | } /* cancel_dirty_page */ 2) | remove_from_page_cache() { 2) 1.578 us | _raw_spin_lock_irq(); 2) | __remove_from_page_cache() { Note, it does not work with the iterator "trace" file, since it requires the use of consuming the page from the ring buffer to determine how many events were lost, which the iterator does not do. Signed-off-by: Steven Rostedt commit 66a8cb95ed04025664d1db4e952155ee1dccd048 Author: Steven Rostedt Date: Wed Mar 31 13:21:56 2010 -0400 ring-buffer: Add place holder recording of dropped events Currently, when the ring buffer drops events, it does not record the fact that it did so. It does inform the writer that the event was dropped by returning a NULL event, but it does not put in any place holder where the event was dropped. This is not a trivial thing to add because the ring buffer mostly runs in overwrite (flight recorder) mode. That is, when the ring buffer is full, new data will overwrite old data. In a produce/consumer mode, where new data is simply dropped when the ring buffer is full, it is trivial to add the placeholder for dropped events. When there's more room to write new data, then a special event can be added to notify the reader about the dropped events. But in overwrite mode, any new write can overwrite events. A place holder can not be inserted into the ring buffer since there never may be room. A reader could also come in at anytime and miss the placeholder. Luckily, the way the ring buffer works, the read side can find out if events were lost or not, and how many events. Everytime a write takes place, if it overwrites the header page (the next read) it updates a "overrun" variable that keeps track of the number of lost events. When a reader swaps out a page from the ring buffer, it can record this number, perfom the swap, and then check to see if the number changed, and take the diff if it has, which would be the number of events dropped. This can be stored by the reader and returned to callers of the reader. Since the reader page swap will fail if the writer moved the head page since the time the reader page set up the swap, this gives room to record the overruns without worrying about races. If the reader sets up the pages, records the overrun, than performs the swap, if the swap succeeds, then the overrun variable has not been updated since the setup before the swap. For binary readers of the ring buffer, a flag is set in the header of each sub page (sub buffer) of the ring buffer. This flag is embedded in the size field of the data on the sub buffer, in the 31st bit (the size can be 32 or 64 bits depending on the architecture), but only 27 bits needs to be used for the actual size (less actually). We could add a new field in the sub buffer header to also record the number of events dropped since the last read, but this will change the format of the binary ring buffer a bit too much. Perhaps this change can be made if the information on the number of events dropped is considered important enough. Note, the notification of dropped events is only used by consuming reads or peeking at the ring buffer. Iterating over the ring buffer does not keep this information because the necessary data is only available when a page swap is made, and the iterator does not swap out pages. Cc: Robert Richter Cc: Andi Kleen Cc: Li Zefan Cc: Arnaldo Carvalho de Melo Cc: "Luis Claudio R. Goncalves" Cc: Frederic Weisbecker Signed-off-by: Steven Rostedt commit eb0c53771fb2f5f66b0edb3ebce33be4bbf1c285 Author: Steven Rostedt Date: Mon Mar 29 14:25:18 2010 -0400 tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set If modules are configured in the build but unloading of modules is not, then the refcnt is not defined. Place the get/put module tracepoints under CONFIG_MODULE_UNLOAD since it references this field in the module structure. As a side-effect, this patch also reduces the code when MODULE_UNLOAD is not set, because these unused tracepoints are not created. Signed-off-by: Steven Rostedt commit ae832d1e03ac9bf09fb8a07fb37908ab40c7cd0e Author: Li Zefan Date: Wed Mar 24 10:57:43 2010 +0800 tracing: Remove side effect from module tracepoints that caused a GPF Remove the @refcnt argument, because it has side-effects, and arguments with side-effects are not skipped by the jump over disabled instrumentation and are executed even when the tracepoint is disabled. This was also causing a GPF as found by Randy Dunlap: Subject: 2.6.33 GP fault only when built with tracing LKML-Reference: <4BA2B69D.3000309@oracle.com> Note, the current 2.6.34-rc has a fix for the actual cause of the GPF, but this fixes one of its triggers. Tested-by: Randy Dunlap Acked-by: Mathieu Desnoyers Signed-off-by: Li Zefan LKML-Reference: <4BA97FA7.6040406@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 50354a8a28d0c91695a2d6d25b5a821bfe557a07 Author: Li Zefan Date: Wed Mar 24 10:58:24 2010 +0800 tracing: Update comments Make some comments consistent with the code. Signed-off-by: Li Zefan LKML-Reference: <4BA97FD0.7090202@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 4bdde044dc36ac7b01f7502394d52619af9d1927 Author: Li Zefan Date: Wed Mar 24 10:58:05 2010 +0800 tracing: Convert some signal events to DEFINE_TRACE Use DECLARE_EVENT_CLASS to remove duplicate code: text data bss dec hex filename 23639 6084 8 29731 7423 kernel/signal.o.orig 22727 6084 8 28819 7093 kernel/signal.o 2 events are converted: signal_queue_overflow: signal_overflow_fail, signal_lose_info No functional change. Acked-by: Masami Hiramatsu Signed-off-by: Li Zefan LKML-Reference: <4BA97FBD.8070703@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit e3efca0a63b4ac4d8849d37d082a95cf1a75162d Author: Jouni Malinen Date: Sun Mar 28 22:31:15 2010 -0700 mac80211: Fix drop_unencrypted for MFP with hwaccel Commit bef5d1c70d132145c0fc75b3586a19841a9a82e4 split ieee80211_drop_unencrypted() into separate functions that are used for Data and Management frames. However, it did not handle the RX_FLAG_DECRYPTED correctly for Management frames: ieee80211_drop_unencrypted() can only return 0 for Management frames, so there is no point in calling it here. Instead, just check the status->flag directly. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 9fd1ea428590cf6e35e5a7df32ff6bccfd371db2 Author: Frans Pop Date: Wed Mar 24 19:46:31 2010 +0100 wireless/ipw2x00: remove trailing space in messages Signed-off-by: Frans Pop Signed-off-by: John W. Linville commit 879999cec9489f8942ebce3ec1b5f23ef948dda7 Author: Christian Lamparter Date: Tue Mar 23 21:51:14 2010 +0100 ar9170usb: fix panic triggered by undersized rxstream buffer While ar9170's USB transport packet size is currently set to 8KiB, the PHY is capable of receiving AMPDUs with up to 64KiB. Such a large frame will be split over several rx URBs and exceed the previously allocated space for rx stream reconstruction. This patch increases the buffer size to 64KiB which is in fact the phy & rx stream designed size limit. Cc: stable@kernel.org Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=15591 Reported-by: Christian Mehlis Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit f9ea3eb44218b0e12a190f222400f8d56136915f Author: Joe Perches Date: Thu Mar 18 18:29:34 2010 -0700 include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment to match use in IW_IOCTL_IDX macro Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit d5d9de024c157a3dfbab191241c5c51e4d4c069a Author: Marco Porsch Date: Tue Mar 30 10:00:16 2010 +0200 nl80211: reenable station del for mesh iw dev station del is quiet useful in mesh mode and should be possible. Signed-off-by: Marco Porsch Signed-off-by: John W. Linville commit 932d37c094b3c3410b4059f18f3b5c756bff059a Author: Jouni Malinen Date: Mon Mar 29 23:37:36 2010 -0700 ath9k: Do not indicate RX_FLAG_DECRYPTED for unprotected frames mac80211 skips drop_unencrypted checks if the driver/firmware has already taken care of this. In case of ath9k, we must not indicate that the frame was decrypted if no decryption was actually done. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit fa83a2189870cdcd6fb4deeed391e0b988dc9a19 Author: Jouni Malinen Date: Mon Mar 29 23:36:15 2010 -0700 mac80211: Fix dropping of unprotected robust multicast frames When selecting the RX key for group-addressed robust management frames, we do not actually select any BIP key if the frame is unprotected (since we cannot find the key index from MMIE). This results in the drop_unencrypted check in failing to drop the frame. It is enough to verify that we have a STA entry for the transmitter and that MFP is enabled for that STA; we do not need to check rx->key here. This fixes BIP processing for unprotected, group-addressed, robust management frames. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit ecbcd3243651ae8ac2b73a96c320992a4cf01c5b Author: Jouni Malinen Date: Mon Mar 29 23:35:23 2010 -0700 mac80211: Fix BIP to be used only with group-addressed frames BIP (part of IEEE 802.11w) is only supposed to be used with group-addressed frames. We ended up picking it as a default mechanism for every management whenever we did not have a STA entry for the destination (e.g., for Probe Response to a STA that is not associated). While the extra MMIE in the end of management frames should not break frames completed in most cases, there is no point in doing this. Fix key selection to pick the default management key only if the frame is sent to multicast/broadcast address and the frame is a robust management frame. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e69e95dbecfb73f76765cdd16dadc6219a9068e3 Author: Jouni Malinen Date: Mon Mar 29 23:29:31 2010 -0700 mac80211: Send deauth/disassoc prior to dropping STA entry When management frame protection (IEEE 802.11w) is used, the deauthentication and disassociation frames must be protected whenever the encryption keys are configured. We were removing the STA entry and with it, the keys, just before actually sending out these frames which meant that the frames went out unprotected. The AP will drop them in such a case. Fix this by reordering the operations a bit so that sta_info_destroy_addr() gets called only after ieee80211_send_deauth_disassoc(). Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 17e4ec147f4939ca8c81b41b4261ec7974531381 Author: Jouni Malinen Date: Mon Mar 29 23:28:30 2010 -0700 mac80211: Track Beacon signal strength and implement cqm events Calculate a running average of the signal strength reported for Beacon frames and indicate cqm events if the average value moves below or above the configured threshold value (and filter out repetitive events with by using the configured hysteresis). Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 32fbccafed7e935432b601f0453c2b702a385a25 Author: Sujith Date: Tue Mar 30 08:48:27 2010 +0530 ath9k_htc: Fix TKIP encryption Set IEEE80211_HW_RX_INCLUDES_FCS to indicate that the FCS is present in RX frames. Also, remove a redundant assignment of skb length and include the FCS_LEN when checking padding. Fixing this issue makes TKIP work. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 29bffa96e9bef4fb84740a49e93d5bd6ca126bac Author: Felix Fietkau Date: Mon Mar 29 20:14:23 2010 -0700 ath9k: allocate tx and rx status information on stack ath_tx_status and ath_rx_status data are only necessary for a short time, until they have been processed and converted into mac80211 data structures. Because of that, it makes no sense to keep them tied to the DMA descriptor, that only wastes precious memory. This patch allocates the data on stack in the functions that call the conversion functions from ath9k_hw. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8e6f5aa250d6013ec0d66f9f45f376678d3fc4ab Author: Felix Fietkau Date: Mon Mar 29 20:09:27 2010 -0700 ath9k: split out access to rx status information This patch passes in a pointer to the ath_rx_status data structure for functions that need it, instead of letting them grab it directly from the ath_desc struct. This is useful for making it possible to allocate the intermediate rx status data separately. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit db1a052b73f7c97f9e8b21f3f19a92313ed2acb1 Author: Felix Fietkau Date: Mon Mar 29 20:07:11 2010 -0700 ath9k: split out access to tx status information This patch passes in a pointer to the ath_tx_status data structure for functions that need it, instead of letting them grab it directly from the ath_desc struct. This is useful for making it possible to allocate the intermediate tx status data separately. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e65054b64ff6b89380a7f546c9eebf862e679646 Author: Zhu Yi Date: Tue Mar 30 09:36:16 2010 +0800 ipw2200: restart adapter only when abort_scan doesn't work When a scan watchdog is fired, try to send abort scan command first before restarting the adapter. This avoids reconnection for some users when scan hang is detected. This fixed bug https://bugzilla.kernel.org/show_bug.cgi?id=15419 Reported-by: Maurizio Avogadro Tested-by: Maurizio Avogadro Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 9f01a84e81d10e38daa504348217895fe414a24b Author: Sujith Date: Mon Mar 29 16:07:20 2010 +0530 ath9k_htc: Initialize HW opmode Not setting the opmode properly during initialization results in the firmware sending up a bunch of packets before add_interface() has been called, for the first interface. This patch fixes the issue by setting the initial mode to 'managed'. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 7757dfed5809b03aa61c7d7f5ff8092f85df8583 Author: Sujith Date: Mon Mar 29 16:07:17 2010 +0530 ath9k_htc: Handle TX queue overflow Stop/restart TX queues when the internal SKB queue is full. This helps handle TX better under heavy load. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 6335ed0ff8670e6378da41191ab8bda33d1b7ac8 Author: Sujith Date: Mon Mar 29 16:07:15 2010 +0530 ath9k_htc: Simplify RX URB management This patch introduces the usage of URB anchors, thus reducing a large amount of code dealing with URB maintenance within the driver. The RX callback now takes care of freeing the SKB associated with each URB. Signed-off-by: Sujith Signed-off-by: John W. Linville commit d5a4c5e3afb9697c8f627b2563f4b8583ef88498 Author: Sujith Date: Mon Mar 29 16:07:14 2010 +0530 ath9k_htc: Fix watchdog pattern parsing Skip beyond the watchdog pattern properly. This fixes occasional failure of the driver to load. Signed-off-by: Sujith Signed-off-by: John W. Linville commit ef98c3cd9b68ed27eeb94b833f74860fa1a734b7 Author: Sujith Date: Mon Mar 29 16:07:11 2010 +0530 ath9k_htc: Fix bug in aggregation initiation Accessing the sta pointer in TX completion without approprate RCU protection is wrong. Fix this. Also, RCU protection is needed when the station's aggregation state is updated. Handle this properly. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0995d110118b35c0dc5195e3ddddcc0dec263830 Author: Sujith Date: Mon Mar 29 16:07:09 2010 +0530 ath9k_common: Move RX filter code to ath9k_htc The calculation of RX filter is fairly different between ath9k and ath9k_htc, trying to make this common between the two drivers would result in code churn. While at it, remove the handling of PSPOLL filter, it can be added when(if) AP support is added to ath9k_htc. Signed-off-by: Sujith Signed-off-by: John W. Linville commit 0af26b278bc1d747370b451595b7586cb7b3455c Author: Stanislaw Gruszka Date: Mon Mar 29 12:18:36 2010 +0200 mac80211: enable QoS explicitly in AP mode Enable QoS explicitly, when user space AP program will setup a QoS queues. Currently this is not needed as iwlwifi not work in AP mode and no other driver implement enable/disable QoS. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit e61146e36b40fd9d346118c40285913236c329f3 Author: Stanislaw Gruszka Date: Mon Mar 29 12:18:35 2010 +0200 iwlwifi: manage QoS by mac stack We activate/deactivate QoS and setup default queue parameters in iwlwifi driver. Mac stack do the same, so we do not need repeat that work here. Stack also will tell when disable QoS, this will fix driver when working with older APs, that do not have QoS implemented. Patch make "force = true" in iwl_active_qos() assuming we always want to do with QoS what mac stack wish. Patch also remove unused qos_cap bits, do not initialize qos_active = 0, as we have it initialized to zero by kzalloc. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit e1b3ec1a2a336c328c336cfa5485a5f0484cc90d Author: Stanislaw Gruszka Date: Mon Mar 29 12:18:34 2010 +0200 mac80211: explicitly disable/enable QoS Add interface to disable/enable QoS (aka WMM or WME). Currently drivers enable it explicitly when ->conf_tx method is called, and newer disable. Disabling is needed for some APs, which do not support QoS, such we should send QoS frames to them. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit ecdf94b81237d272b1514b76f27a5d22782bcaa6 Author: Zhu Yi Date: Mon Mar 29 16:42:26 2010 +0800 iwlwifi: remove skb_linearize for rx frames Remove skb_linearize() in the iwlwifi drivers since mac80211 supports paged rx SKBs now. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e3cf8b3f7b9eefbe1d39b160726d6e5c2cbb4c5d Author: Zhu Yi Date: Mon Mar 29 17:35:07 2010 +0800 mac80211: support paged rx SKBs Mac80211 drivers can now pass paged SKBs to mac80211 via ieee80211_rx{_irqsafe}. The implementation currently use skb_linearize() in a few places i.e. management frame handling, software decryption, defragmentation and A-MSDU process. We will optimize them one by one later. Signed-off-by: Zhu Yi Cc: Kalle Valo Cc: Johannes Berg Signed-off-by: John W. Linville commit e58b1253f1e850b4469964d7b92cf230196223c0 Author: Rafał Miłecki Date: Mon Mar 29 00:53:16 2010 +0200 b43: N-PHY: fix value written on 2055 radio setup Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f19ebe7d772a3b48743fa798ad979a4ee3cb64e2 Author: Rafał Miłecki Date: Mon Mar 29 00:53:15 2010 +0200 b43: N-PHY: prepare for rev3+ channel tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ffd2d9bdac1a0a5d3184e085ea1bd3060b4166fe Author: Rafał Miłecki Date: Mon Mar 29 00:53:14 2010 +0200 b43: N-PHY: find table entry earlier for setting chanspec We do not want to partially change chanspec just to find out there is not entry in table for given channel. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b15b3039919c7357c2851ec66843ff92f8ff86aa Author: Rafał Miłecki Date: Mon Mar 29 00:53:13 2010 +0200 b43: N-PHY: use b43_phy_n_sfo_cfg rather than duplicating same fields Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d817f4e18cf54ae7d662cf2f33e51685e81ad254 Author: Rafał Miłecki Date: Mon Mar 29 00:53:12 2010 +0200 b43: N-PHY: some dummy PHY rev 3 calls Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f01a0229b0343d56b2e084f1472ff3edc1a2090b Author: Xose Vazquez Perez Date: Sun Mar 28 20:02:41 2010 +0200 wireless: rt2x00: rt2800usb: new ids Taken from latest ralink linux driver(RT3070_LinuxSTA_V2.3.0.1_20100208) All of them are RT3070 devices. Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 6424bf700c1851fc7e86b83959a8578a401d80c1 Author: Xose Vazquez Perez Date: Sun Mar 28 17:48:05 2010 +0200 wireless: rt2x00: rt2800pci: new id Taken from latest ralink linux driver, it's a RT3593 PCI/PCIe. Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 27427013504d98f86f9baebfb8a44db3ce61f65e Author: Xose Vazquez Perez Date: Sun Mar 28 16:57:32 2010 +0200 wireless: rt2x00: rt2800usb: delete id It was removed in the windows inf file by ralink. And it isn't on ralink linux drivers. Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit fc3f14873d38a5c8a280ff4b8c8abde0244fb79b Author: Xose Vazquez Perez Date: Sun Mar 28 15:52:43 2010 +0200 wireless: rt2x00: rt2800usb: identify ids-chips Taken from ralink linux drivers: RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0B05,0x1784)}, /* Asus 3072 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x13D3,0x3305)}, /* AzureWave 3070*/ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x07D1,0x3C16)}, /* D-Link 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x203D,0x14A9)}, /* Encore 3070*/ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x1740,0x9707)}, /* EnGenius 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x1740,0x9708)}, /* EnGenius 3071 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x1740,0x9709)}, /* EnGenius 3072 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x04BB,0x0947)}, /* I-O DATA 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x04BB,0x0948)}, /* I-O DATA 3072 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x3822)}, /* MSI 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x3821)}, /* Ralink 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x3870)}, /* MSI 3070*/ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x3871)}, /* MSI 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x821A)}, /* Ralink 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x822A)}, /* MSI 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x870A)}, /* MSI 3070*/ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x871A)}, /* MSI 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DB0,0x899A)}, /* MSI 3070*/ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x20B8,0x8888)}, /* PARA INDUSTRIAL 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DF6,0x0048)}, /* Sitecom 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x0DF6,0x0047)}, /* Sitecom 3071 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x083A,0xA701)}, /* SMC 3070 */ RT3070_LinuxSTA_V2.3.0.1_20100208/common/rtusb_dev_id.c: {USB_DEVICE(0x083A,0xA702)}, /* SMC 3072 */ Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit bc0f03ea579d78f845a44a0c611806da64057b03 Author: Saravanan Dhanabal Date: Fri Mar 26 12:53:33 2010 +0200 wl1271: Fix msleep() delay while waiting for completion After last transmission, the device goes to sleep earlier than the configured dynamic power save timeout. If timeout is set to 400ms, device enters into sleep mode at around 330ms since from last TX. This patch removes the msleep(1), which causes the delay after ELP wakeup. Replaced with udelay(10), the variation is around 7-10ms. Signed-off-by: Saravanan Dhanabal Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit c18995540cc4d2c84d130581b8b6720b22ca16b5 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:32 2010 +0200 wl1271: Enable hardware keep alive messages This patch will enable the hardware keep-alive mode, configure the required template, configure keep-alive parameters, and re-order JOIN's and ACX_AID in such a way that the keep-alive is activated. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit bfb24c9e16921f0e57fcec5180ffa20929832545 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:31 2010 +0200 wl1271: Add keep-alive frame template support Add support for keep-alive templates, which are indexed. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a9af092b524614dd3fc7b52bde7c87f8b82cd2a6 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:30 2010 +0200 wl1271: Configure HW connection monitor This patch configures the mac80211 to not perform connection monitoring (periodic probe-requests) and instead rely on the hardware to do it. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit d60772f646f70ba0a72c9a300935df8fad256ff9 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:29 2010 +0200 wl1271: Disconnect if PSM entry fails If PSM entry fails despite of retries, assume that the AP has been lost, and indicate connection loss to the mac80211. This is much safer than remaining in active mode. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit c2b2d99bb0b5a9445ff8b845f6acd5046ef5815e Author: Juuso Oikarinen Date: Fri Mar 26 12:53:28 2010 +0200 wl1271: Configure probe-request template when associated Configure a probe-request template to the wl1271 when associated - the wl1271 will use this to attempt to recover a connection when beacon loss is detected. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit cbf7f3058ea17d9413a6889c3a229e8eac7a7c78 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:27 2010 +0200 wl1271: Fix memory leak in firmware crash scenario The driver tx-queue flush operation leaks broadcast-frames. This leak occurs if the driver is shut down while there are frames in TX buffers (such as in a firmware crash scenario.) Fix the leak. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 64e29e447ec01d2130b4c68f3459cfaa94fa138b Author: Teemu Paasikivi Date: Fri Mar 26 12:53:26 2010 +0200 wl1271: Removed checking of PSM from handling BSS_LOST_EVENT Change the driver to call ieee80211_beacon_loss function always when BSS_LOST_EVENT is received. Reason for the change is that entering PSM might fail before driver receives BSS_LOST_EVENT. In such case the driver would disable PSM and the stack would not be notified about beacon loss and connection loss detection would be delayed by tens of seconds. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 60e84c2ebb7b04361cf1ba0d325cc93366bd04a6 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:25 2010 +0200 wl1271: Update beacon interval properly for ad-hoc Configure the hardware beacon interval to whatever requested by the mac80211. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 5da11dcde3d2a91688e02f032062fa26877eacb0 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:24 2010 +0200 wl1271: Fix ad-hoc mode handling Fix the driver to better reflect the ad-hoc related configuration from the mac80211. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 6ccbb92ead9379d7de2cc25cd950d15a8d22e0c9 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:23 2010 +0200 wl1271: Disable connection monitoring while not associated The wl1271 does not support disabling the connection monitor feature. Perform the next best thing by increasing the beacon-loss threshold and BSS_LOSE event timeout to the maximum values. This is needed, because we really don't want any random probe-requests during scanning or especially while in ad-hoc mode and not beaconing. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit e7942235f2496587cb4af86168e54d588ffcbd4f Author: Luciano Coelho Date: Fri Mar 26 12:53:22 2010 +0200 wl1271: remove deprecated usage of RX status noise The noise element in the ieee80211_rx_status struct has been deprecated in commit "mac80211: deprecate RX status noise". Remove the usage of this element from wl1271_rx.c to avoid warnings. Signed-off-by: Luciano Coelho Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 2f826f55404ca43efced94d548356182820e764f Author: Luciano Coelho Date: Fri Mar 26 12:53:21 2010 +0200 wl1271: wait for disconnect command complete event Wait for the DISCONNECT_EVENT_COMPLETE_ID event after sending a disconnect command. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 99d84c1de8fdf5f9b09f07fdbc628857a040bf8b Author: Luciano Coelho Date: Fri Mar 26 12:53:20 2010 +0200 wl1271: wait for join command complete event Poll for join command completion instead of waiting blindly for 10 msecs. There is a timeout of 100 msecs, if the command doesn't complete by then, we return an error code. Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 9560134ff929a037f0c967ae47089586f4b34390 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:19 2010 +0200 wl1271: Remove device MAC-address randomization This patch removes the MAC address randomization from the driver. This removes a nasty Nokia-OUI dependency from the driver. With this patch, unless an address is explicitly configured to the driver by the user, only a zero address will be configured, and the driver will be unable to start. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 259da430b198fc7e6f21e33be3a2d6dd27200953 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:18 2010 +0200 wl1271: Update busyword checking mechanism After the busy-words, if the firmware did not complete by the end of the first (fixed) busy-word, a flip of the CS line is required to enable clocking out the actual read data. This patch changes the mechanism such that the CS line is flipped after each busyword. Also, the busy-word mechanism is finally enabled, and the number of fixed busywords reduced to the minimum. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 1b00f2b560028a68cdbc57a0352163afd79822dd Author: Juuso Oikarinen Date: Fri Mar 26 12:53:17 2010 +0200 wl1271: Fix memory leak in cmd_data_path Fix a trivial memory leak in cmd_data_path. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 99e50314d588673353bf94978938bd1c2437037d Author: Teemu Paasikivi Date: Fri Mar 26 12:53:16 2010 +0200 wl1271: Warnings caused by wrong format specifiers fixed There were wrong format specifiers in wl1271_sdio.c in some debug outputs. This has been causing warnings on some platforms. Signed-off-by: Teemu Paasikivi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 9d4e5bb3dec8c4b9245035bf29628071801041a8 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:15 2010 +0200 wl1271: Configure clock-request drive mode to open-drain This patch configures the wl1271 chipset clock-request line to be driver in open-drain mode instead of push-pull. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 9cea461fb0a37dae9ef0a83714c5fcdc4b2074c8 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:14 2010 +0200 wl1271: Fix memory leak in scan command handling This patch fixes a memory leak in the scan command handling code. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit f83cce3551a6238f6c86495ed949b31303c21a6d Author: Juuso Oikarinen Date: Fri Mar 26 12:53:13 2010 +0200 wl1271: Fix memory leaks in SPI initialization This patch fixes two memory leaks in the SPI initialization code. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 31627dc59b4a87c4198b4245a7de1b8ccf4424fa Author: Juuso Oikarinen Date: Fri Mar 26 12:53:12 2010 +0200 wl1271: Add TX rate reporting Add reporting of the used TX rate to mac80211 in the tx_status. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit f876bb9aafc71d8ea395eec99666faaffec5df49 Author: Juuso Oikarinen Date: Fri Mar 26 12:53:11 2010 +0200 wl1271: Clean up RX rate reporting Clean up the code to convert a firmware rate class index into an index for the rate configuration table. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 7fdd50d07fed198b2c6ccdca96ab5537014597d8 Author: Luciano Coelho Date: Fri Mar 26 12:53:10 2010 +0200 wl1271: fix wl1271_spi driver name When forward porting some patches to upstream, there was a mistake and the wl1271_spi driver name remained, erroneously, as "wl1271". This patch fixes that. Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a8c944f8a00dcc4ac6900efcddab1a0cf300c791 Author: Bruno Randolf Date: Thu Mar 25 14:49:47 2010 +0900 ath5k: add capability flag for phyerror counters Chipsets since revision AR5213A (0x59) have hardware counters for PHY errors which we can read directly from the registers. Older hardware has to use the RX descriptor status to get a count of PHY errors. This will be used in several places in the ANI implementation, so a flag is useful. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit da35111ad970081bdf6e848d1861c7d16e71079b Author: Bruno Randolf Date: Thu Mar 25 14:49:42 2010 +0900 ath5k: update phy errors codes Update PHY error codes from the HAL, and keep them in statistics for debugging via the 'frameerrors' file. This will also be used by ANI. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 495391d715a310a7cbf622850e372d40ac86ef6e Author: Bruno Randolf Date: Thu Mar 25 14:49:36 2010 +0900 ath5k: simplify MIB counters Let's keep MIB counter statistics in our own statistics structure and only convert it to ieee80211_low_level_stats when needed by mac80211. Also we don't need to read profile count registers in the MIB interrupt (they don't trigger MIB interrupts). Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 9d332c82b4cf2e4538450e4af40f073cc5e599ec Author: Bruno Randolf Date: Thu Mar 25 14:49:31 2010 +0900 ath5k: initialize default noise floor Initialize noise floor variable with a default of -95. This was used uninitialized in the signal strength (RSSI -> dBm) conversion until the first noise floor calibration was completed. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit b4ea449df90684035985a77763fd1d2ff0eb9dad Author: Bruno Randolf Date: Thu Mar 25 14:49:25 2010 +0900 ath5k: keep beacon RSSI average Keep an exponentially weighted moving average of the beacon RSSI in our BSS. It will be used by the ANI implementation. The averaging algorithm is copied from rt2x00, Thanks :) Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 6a8a3f6b2ac02fb8542f2b36b0ecd9c48f7d9a7e Author: Bruno Randolf Date: Thu Mar 25 14:49:19 2010 +0900 ath5k: move ath5k_hw_calibration_poll to base.c It's not a phy related funtion; It has more to do with the interrupt handler and tasklet scheduling, so it belongs to base.c. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit a9167f96428b832bf94c89908e000e16c4eb7d5b Author: Bruno Randolf Date: Thu Mar 25 14:49:14 2010 +0900 ath5k: optimize ath5k_hw_calibration_poll Optimize ath5k_hw_calibration_poll() since it is called on every singe interrupt. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit e65e1d7713da89d98f01c3f4267b2c9ecb03c16f Author: Bruno Randolf Date: Thu Mar 25 14:49:09 2010 +0900 ath5k: remove the use of SWI interrupt We don't need to generate a software interrupt (SWI) just to schedule a tasklet - we can just schedule the tasklet directly. Rename constants, names, etc to reflect the fact that we don't use SWI any more. Also move the flag handling into the tasklet and prepare it to behave correctly when there are multiple flags present. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 1063b176c072b936c43d0e6270168b19881ecb72 Author: Bruno Randolf Date: Thu Mar 25 14:49:03 2010 +0900 ath5k: remove static calibration interval variable Remove static variable ath5k_calinterval which was used as a constant. Use a #define instead. Also we don't need ah_cal_intval. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 0e354fd01e4513cea25d66e9c6d9e76f7228accc Author: Frans Pop Date: Wed Mar 24 19:46:35 2010 +0100 wireless/libertas: remove trailing space in debugfs header Signed-off-by: Frans Pop Cc: libertas-dev@lists.infradead.org Signed-off-by: John W. Linville commit cb01b09c6914ab04dc836941dc92a1dd42714e19 Author: Frans Pop Date: Wed Mar 24 19:46:34 2010 +0100 wireless/raylink: remove trailing space in messages Signed-off-by: Frans Pop Cc: Corey Thomas Signed-off-by: John W. Linville commit 4a89852c3533c0190cbe6b04b8b5d7bf4f9beea9 Author: Frans Pop Date: Wed Mar 24 19:46:33 2010 +0100 wireless/prism54: remove trailing space in messages Signed-off-by: Frans Pop Cc: Luis R. Rodriguez Signed-off-by: John W. Linville commit 55f98938b5cea8949077c79813c4f86ef0018858 Author: Frans Pop Date: Wed Mar 24 19:46:29 2010 +0100 wireless: remove trailing space in messages Also correct indentation in net/wireless/reg.c. Signed-off-by: Frans Pop Signed-off-by: John W. Linville commit b68c92460d380c59891ba97531edbe5b01f5ea0b Author: Hagen Paul Pfeifer Date: Tue Mar 30 14:24:57 2010 +0000 sctp: eliminate useless code Remove duplicate declaration of symbol: struct hlist_node *node was already declared, the seconds declaration shadows the first one. CC: Vlad Yasevich Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 8379d07031e59a5d72bc73a6060c4d63aac956ce Author: Hagen Paul Pfeifer Date: Tue Mar 30 14:24:12 2010 +0000 tipc: define needless global scoped variable static struct _zone *tipc_zones has local scope level and should defined with the correct scoping. CC: Per Liden Signed-off-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit b05b7d9563f11bf3d7b7f3f53cd74cbfab107355 Author: Eric Dumazet Date: Tue Mar 30 05:02:15 2010 +0000 net: remove redundant code eth_type_trans(skb, netdev) does the "skb->dev = netdev;" initialization, we can remove it from various network drivers. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e446630c960946b5c1762e4eadb618becef599e7 Author: Marc Zyngier Date: Mon Mar 29 08:57:56 2010 +0000 Add hotplug support to mcp251x driver Chip model can now be selected directly by matching the modalias name (instead of filling the .model field in platform_data), and allows the module to be auto-loaded. Previous behaviour is of course still supported. Convert the two in-tree users to this feature (icontrol & zeus). Tested on an Zeus platform (mcp2515). Signed-off-by: Marc Zyngier Acked-by: Christian Pellegrin Cc: Edwin Peer Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 598ed9367a36ee1fd4ae3271a54a3547a33975a5 Author: laurent chavey Date: Mon Mar 29 10:41:36 2010 +0000 fix net/core/dst.c coding style error and warnings Fix coding style errors and warnings output while running checkpatch.pl on the file net/core/dst.c. Signed-off-by: chavey Signed-off-by: David S. Miller commit b00fabb4020d17bda4bea59507e09fadf573088d Author: stephen hemminger Date: Mon Mar 29 14:47:27 2010 +0000 netdev: ethtool RXHASH flag This adds ethtool and device feature flag to allow control of receive hashing offload. Signed-off-by: Stephen Hemminger Acked-by: Jeff Garzik Signed-off-by: David S. Miller commit 757b77e2b208490868cf21fd22d796eb9bd199c5 Author: Nick Nunley Date: Fri Mar 26 11:36:47 2010 +0000 igb: add per-packet timestamping This patch adds support for per-packet timestamping for the 82580 adapter. The rx timestamp code is also pulled out of the inlined rx hotpath and instead moved to a seperate function. This version adds a comment explaining the per-packet timestamping code added to igb_hwtstamp_ioctl(). Signed-off-by: Nicholas Nunley Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 3365a2934cce29fa9196bc4fd7086f62e799ee84 Author: Joe Perches Date: Sun Mar 28 08:42:16 2010 +0000 MAINTAINERS: ipg: Jesse Huang's email address bounces Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit dd4683daed6be3fd71105a8289257b75e151288c Author: Joe Perches Date: Sun Mar 28 08:35:45 2010 +0000 drivers/net/ipg: Remove invalid IPG_DDEBUG_MSG uses, neaten Some no longer valid IPG_DDEBUG_MSG uses are removed Validate IPG_DDEBUG_MSG arguments when not #defined Neaten #defines marco/macro typo correction Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 02cdce53f3d0d3eee8188944c96150ee8c97100d Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sat Mar 27 01:24:16 2010 +0000 ipv6 fib: Use "Sweezle" to optimize addr_bit_test(). addr_bit_test() is used in various places in IPv6 routing table subsystem. It checks if the given fn_bit is set, where fn_bit counts bits from MSB in words in network-order. fn_bit : 0 .... 31 32 .... 64 65 .... 95 96 ....127 fn_bit >> 5 gives offset of word, and (~fn_bit & 0x1f) gives count from LSB in the network-endian word in question. fn_bit >> 5 : 0 1 2 3 ~fn_bit & 0x1f: 31 .... 0 31 .... 0 31 .... 0 31 .... 0 Thus, the mask was generated as htonl(1 << (~fn_bit & 0x1f)). This can be optimized by "sweezle" (See include/asm-generic/bitops/le.h). In little-endian, htonl(1 << bit) = 1 << (bit ^ BITOP_BE32_SWIZZLE) where BITOP_BE32_SWIZZLE is (0x1f & ~7) So, htonl(1 << (~fn_bit & 0x1f)) = 1 << ((~fn_bit & 0x1f) ^ (0x1f & ~7)) = 1 << ((~fn_bit ^ ~7) & 0x1f) = 1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f) In big-endian, BITOP_BE32_SWIZZLE is equal to 0. 1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f) = 1 << ((~fn_bit) & 0x1f) = htonl(1 << (~fn_bit & 0x1f)) Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit de7737e056d65ad6b0f135f7bb24d86458af0d47 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Fri Mar 26 08:34:30 2010 +0000 sctp: Use ipv6_addr_diff() in sctp_v6_addr_match_len(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit d57b8fb8a8f94bdf467a4435be7d8bbebf87fe2a Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 29 06:00:05 2010 +0000 ipv6: Use __fls() instead of fls() in __ipv6_addr_diff(). Because we have ensured that the argument is non-zero, it is better to use __fls() and generate better code. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 2c73e1fe94b1962ae5df7618519c18526e9d9072 Author: Joe Perches Date: Fri Mar 26 20:16:59 2010 +0000 e1000e: typo corrections Here are the other miscellaneous corrections done by an earlier larger suggested patch now made unnecessary by a less invasive change. Correct a few missing newlines from logging messages and a typo fix. Fix speed/duplex logging message. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c041076a9f79a7cf28e808f73cc76f24cbf97093 Author: Alexander Duyck Date: Thu Mar 25 13:10:08 2010 +0000 igb: update hw_debug macro to make use of netdev_dbg call This change updates the igb driver to make use of the netdev_dbg function macros now provided in netdevice.h This is meant to be provided as an alternative to the patch provided by Joe Perches. It also removes igb_get_time_str since I found that it is unused code that is no longer used even in debug. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 7e5ab157813993356f021757d0b0dcbdca7c55a1 Author: Tom Goff Date: Tue Mar 30 19:44:56 2010 -0700 net_sched: minor netns related cleanup These changes were suggested by Alexey Dobriyan : - psched_show() does not use any private data so just pass NULL to psched_open() - remove unnecessary return statement Signed-off-by: Tom Goff Signed-off-by: David S. Miller commit 9badba2543d165154c540b80e59ff06c1b3e3f76 Author: stephen hemminger Date: Mon Mar 29 07:36:20 2010 +0000 sky2: avoid duplicate link up on Optima chip The Optima version has feature to detect link quickly without PHY interrupt, but it causes duplicate link up events. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4b7c47aa221191b2bd62c653ea851afe5b625162 Author: stephen hemminger Date: Mon Mar 29 07:36:19 2010 +0000 sky2: add XL revisions Add definitions for Yukon XL revisions. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c1cd0a859a01ed0591cb2d8931bdd283542c0252 Author: stephen hemminger Date: Mon Mar 29 07:36:18 2010 +0000 sky2: support Yukon EC_U rev B1 and later Need to change logic to support later versions of Yukon 2 EC_U chip. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9b27105b4a44c54bf91ecd7d0315034ae75684f7 Author: Sjur Braendeland Date: Tue Mar 30 13:56:30 2010 +0000 net-caif-driver: add CAIF serial driver (ldisc) Add CAIF Serial driver. This driver is implemented as a line discipline. caif_serial uses the following module parameters: ser_use_stx - specifies if STart of frame eXtension is in use. ser_loop - sets the interface in loopback mode. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit edc7616c307ad315159a8aa050142237f524e079 Author: Sjur Braendeland Date: Tue Mar 30 13:56:29 2010 +0000 net-caif: add CAIF documentation Documentation of the CAIF Protocol. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 3908c6902372206cc582ecf459af889b09a150c9 Author: Sjur Braendeland Date: Tue Mar 30 13:56:28 2010 +0000 net-caif: add CAIF Kconfig and Makefiles Kconfig and Makefiles with options for: CAIF: Including caif CAIF_DEBUG: CAIF Debug CAIF_NETDEV: CAIF Network Device for GPRS Contexts Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit cc36a070b5901cd54386348b4d79d2daac91ce75 Author: Sjur Braendeland Date: Tue Mar 30 13:56:27 2010 +0000 net-caif: add CAIF netdevice Adding GPRS Net Device for PDP Contexts. The device can be managed by RTNL as defined in if_caif.h. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit e6f95ec8db312491235b4f06343fbd991a82ce20 Author: Sjur Braendeland Date: Tue Mar 30 13:56:26 2010 +0000 net-caif: add CAIF socket implementation Implementation of CAIF sockets for protocol and address family PF_CAIF and AF_CAIF. CAIF socket is connection oriented implementing SOCK_SEQPACKET and SOCK_STREAM interface with supporting blocking and non-blocking mode. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit c72dfae2f77620e5b3fcee1beeee7e536a42b2ad Author: Sjur Braendeland Date: Tue Mar 30 13:56:25 2010 +0000 net-caif: add CAIF device registration functionality Registration and deregistration of CAIF Link Layer. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 15c9ac0c80e390df09ce5730a7b08b13e07a8dd5 Author: Sjur Braendeland Date: Tue Mar 30 13:56:24 2010 +0000 net-caif: add CAIF generic caif support functions Support functions for the caif protocol stack: cfcnfg.c - CAIF Configuration Module used for adding and removing drivers and connection cfpkt_skbuff.c - CAIF Packet layer (SKB helper functions) Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit b482cd2053e3b90a7b33a78c63cdb6badf2ec383 Author: Sjur Braendeland Date: Tue Mar 30 13:56:23 2010 +0000 net-caif: add CAIF core protocol stack CAIF generic protocol implementation. This layer is somewhat generic in order to be able to use and test it outside the Linux Kernel. cfctrl.c - CAIF control protocol layer cfdbgl.c - CAIF debug protocol layer cfdgml.c - CAIF datagram protocol layer cffrml.c - CAIF framing protocol layer cfmuxl.c - CAIF mux protocol layer cfrfml.c - CAIF remote file manager protocol layer cfserl.c - CAIF serial (fragmentation) protocol layer cfsrvl.c - CAIF generic service layer functions cfutill.c - CAIF utility protocol layer cfveil.c - CAIF AT protocol layer cfvidl.c - CAIF video protocol layer Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 2721c5b9dd2a56a9710021c00146bb26ba8dd7b3 Author: Sjur Braendeland Date: Tue Mar 30 13:56:22 2010 +0000 net-caif: add CAIF Link layer device header files Header files for CAIF Link layer net-device, and link-layer registration. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 09009f30de188c847d72039e6250bfea56a0f887 Author: Sjur Braendeland Date: Tue Mar 30 13:56:21 2010 +0000 net-caif: add CAIF core protocol stack header files Add include files for the CAIF Core protocol stack. caif_layer.h - Defines the structure of the CAIF protocol layers cfcnfg.h - CAIF Configuration Module for services and link layers cfctrl.h - CAIF Control Protocol Layer cffrml.h - CAIF Framing Layer cfmuxl.h - CAIF Muxing Layer cfpkt.h - CAIF Packet layer (skb helper functions) cfserl.h - CAIF Serial Layer cfsrvl.h - CAIF Service Layer Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit f671c54207d8a47129f35a84569fdfda614d2439 Author: Sjur Braendeland Date: Tue Mar 30 13:56:20 2010 +0000 net-caif: add CAIF socket and configuration headers Add CAIF types for Socket Address, Socket Options, and configuration parameters for the GPRS IP network interface. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 70596b612c04694806a31dd389bd796c035085fa Author: Sjur Braendeland Date: Tue Mar 30 13:56:19 2010 +0000 net-caif: add CAIF protocol definitions Add CAIF definitions to existing header files. Files: if_arp.h, if_ether.h, socket.h. Types: ARPHRD_CAIF, ETH_P_CAIF, AF_CAIF, PF_CAIF, SOL_CAIF, N_CAIF Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 2c45cd43ff791cc4ab6a6332165ad53d7bcb3673 Author: Shirley Ma Date: Mon Mar 29 15:19:15 2010 +0000 virtio_net: missing sg_init_table Add missing sg_init_table for sg_set_buf in virtio_net which induced in defer skb patch. Reported-by: Thomas Müller Tested-by: Thomas Müller Signed-off-by: Shirley Ma Signed-off-by: David S. Miller commit d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec Merge: 225a9be 2eaa9cf Author: James Morris Date: Wed Mar 31 08:39:27 2010 +1100 Merge branch 'master' into next commit a68d5a5419d2a15161488b20f740115068e7b666 Author: Takashi Iwai Date: Tue Mar 30 18:03:44 2010 +0200 ALSA: hda - introduce snd_hda_codec_update_cache() Add a new helper, snd_hda_codec_update_cache(), for reducing the unneeded verbs. This function checks the cached value and skips if it's identical with the given one. Otherwise it works like snd_hda_codec_write_cache(). The alc269 code uses this function as an example. Signed-off-by: Takashi Iwai commit ad35879aa192e783db2d41c196f48f3fc059ce22 Author: Takashi Iwai Date: Tue Mar 30 18:00:59 2010 +0200 ALSA: hda - Add mute LED support for HP laptop with ALC269 Some HP laptops have a mute LED that is controlled over the unused MIC2 VREF pin. Implement the LED updater like patch_sigmatel.c for this model. Signed-off-by: Takashi Iwai commit c35c9d5d3f03c203168e816f6f735d23f92fd6f1 Merge: 4671264 1f85d72 Author: Takashi Iwai Date: Tue Mar 30 18:00:42 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 720fcb36ac1aa2df2c54c170253b6b29600cbefc Merge: 6ae6650 dec710b 3089f38 f4cff0d Author: Paul Mundt Date: Tue Mar 30 11:26:43 2010 +0900 Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk' Conflicts: arch/sh/kernel/cpu/clock.c Signed-off-by: Paul Mundt commit f4cff0d0ffc0162636357d0475409ecf1304f854 Author: Paul Mundt Date: Tue Mar 30 11:20:35 2010 +0900 sh: sh7724 clkdev lookups. Conver to TMU clock lookups for SH7724. Signed-off-by: Paul Mundt commit 788e69e548cc8d127b90f0de1f7b7e983d1d587a Author: J. Bruce Fields Date: Mon Mar 29 21:02:31 2010 -0400 svcrpc: don't hold sv_lock over svc_xprt_put() svc_xprt_put() can call tcp_close(), which can sleep, so we shouldn't be holding this lock. In fact, only the xpt_list removal and the sv_tmpcnt decrement should need the sv_lock here. Reported-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit 36c0d8cca3283c235c9af1954de641df84c80f0f Author: Sreenivasa Honnur Date: Sun Mar 28 22:13:50 2010 +0000 vxge: Updating Maintainer list of S2IO 10GbE drivers (xframe / vxge). - updating Maintainer list of S2IO 10GbE drivers (xframe / vxge). Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit b8ba796808c107f8fe6bcd318836972536d28eb0 Author: Sreenivasa Honnur Date: Sun Mar 28 22:13:13 2010 +0000 vxge: Version update. - Version update Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 1dc47a9b1b05e3ab039e7d2ab97455ff09a9e554 Author: Sreenivasa Honnur Date: Sun Mar 28 22:12:33 2010 +0000 vxge: Set function-0 as the privilaged function for normal function. - For Normal function (MR-IOV disabled, SR-IOV disabled) Function-0 is the privilaged function. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit b59c94571a6593c71a78bbcebb42982099154938 Author: Sreenivasa Honnur Date: Sun Mar 28 22:11:41 2010 +0000 vxge: Fixed MSIX interrupt configuration. - Fixed MSIX interrupt configuration to support non contiguous vpaths in functions. Four msi-x vectors are reserved per vpath internal to the chip. In all, there are 68 msi-x vectors for the 17 vpaths in the chip. In the multi function configurations, non-contiguous vpaths are configured to represent a function. For instance vpaths 0 and 8 can be configured to represent function zero. - If pci_enable_msix fails for the requested vectors, try with a lesser number vectors by reducing the vpath count. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 4c5f3b210f53e315e460d539655a8d14595c5d1a Author: Sreenivasa Honnur Date: Sun Mar 28 22:10:33 2010 +0000 vxge: Fixed "ethtool -d" prints. - Fixed "ethtool -d" prints - reg_space pointer was getting over written, updating it correctly. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 47231f7fb49bed800dd806b4c32f881005d84de8 Author: Sreenivasa Honnur Date: Sun Mar 28 22:09:47 2010 +0000 vxge: Align the memory only if it is misaligned. - Align the memory only if it is misaligned. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 3363276f1c420b7de92169ddabd2bb88aa26a7d6 Author: Sreenivasa Honnur Date: Sun Mar 28 22:08:30 2010 +0000 vxge: Fix starvation of receive ring controller when blasted by short packets. - Fix starvation of receive ring controller when blasted by short packets. This was because the driver was posting 64 rxds initially while the ring controller was expecting to read 256 replenished rxds. While the driver was coming up, the internal rxd memory filled up the 64 buffers provided and the ring controller was left waiting for the remaining 192 rxds to complete the write back of completed rxds to the host and generation of an interrupt. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 18dec74c16abaa92d663dfef64ee6503e085be89 Author: Sreenivasa Honnur Date: Sun Mar 28 22:07:34 2010 +0000 vxge: Fix a receive stall due to driver being out of synch with chip. - Fix a receive stall due to driver being out of synch with chip. In a corner case scenario the adapter's ring controller may return a RxD with transfer code of 0xC, while the host ownership bit is still set to the adapter. The driver needs to assume that this case where (host_ownership == 1 or adapter) and (transfer_code == 0xC) is valid, that is, this RxD has been returned by the receive ring controller but no frame data is associated with the rxd. - Restore the transfer code field of each newly replenished RxD to 0x0. - Code cleanup. Removed usage of magic numbers. Signed-off-by: Sreenivasa Honnur Signed-off-by: Ramkrishna Vepa Signed-off-by: David S. Miller commit 7905e357ebe67a26d9dc8caa1a0b8346431b5f0d Merge: 083ba27 76232eb Author: David S. Miller Date: Mon Mar 29 13:50:10 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 083ba279d52bcad20f1dfa3cefd4255cbe82d521 Author: Amit Kumar Salecha Date: Mon Mar 29 02:43:45 2010 +0000 netxen: fix interrupt for NX2031 Signed-off-by: Amit Kumar Salecha For NX2031, msix is supported from fw version > 3.4.336. This fw version check should take flash fw in consider instead of running fw or fw from file. Signed-off-by: David S. Miller commit e270299a2f7a3040fe598113f74c2a7d5f63b582 Author: Amit Kumar Salecha Date: Mon Mar 29 02:43:44 2010 +0000 netxen: fix fw load from file Rarely: Fw file size can be unaligned to 8. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 10c0f2a852a529eacf2f223bbaef47832224a521 Author: Rajesh K Borundia Date: Mon Mar 29 02:43:43 2010 +0000 netxen: validate unified romimage Signed-off-by: Rajesh K Borundia Signed-off-by: Amit Kumar Salecha Validate all sections of unified romimage, before accessing them, to avoid seg fault. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 6b50ea1516fab30ce5843e5b11e43488f38c776d Author: Amit Kumar Salecha Date: Mon Mar 29 02:43:42 2010 +0000 netxen: fix corner cases of firmware recovery Signed-off-by: Amit Kumar Salecha o DEV_NEED_RESET state was not handled during fw intialization phase. o nx_decr_dev_ref_cnt() can return error, if fail to grab pcie seamphore. Signed-off-by: David S. Miller commit ff90cd4a1dcfc03bf228d94f553619198e65bc42 Author: Sucheta Chakraborty Date: Mon Mar 29 02:43:41 2010 +0000 netxen: fix tx csum status Kernel default tx csum function (ethtool_op_get_tx_csum) doesn't show correct csum status. It takes various FLAGS (NETIF_F_ALL_CSUM) in account to show tx csum status, which driver doesn't set while disabling tx csum. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d Merge: 9dd7b79 fb48e3c Author: Mark Brown Date: Mon Mar 29 21:03:20 2010 +0100 Merge branch 'for-2.6.34' into for-2.6.35 commit 9dd7b79a86c53a097463ee1582c0bc6c4b83b770 Author: Barry Song <21cnbao@gmail.com> Date: Mon Mar 29 11:16:00 2010 +0800 ASoC: ad193x: move codec register/unregister to bus probe/remove The way i've factored out the bus probe and removal functions so that there's no code in the individual I2C and SPI functions means that the register() and unregister() functions could just be squashed into the bus_probe() and bus_remove() functions. Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e6ab07ce0f0cb1636fd14aa4f3e6e9631bd5d0c6 Merge: cc780d3 923a004 Author: Mark Brown Date: Mon Mar 29 21:00:04 2010 +0100 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35 commit 7b7b9042263f5cafb6ce85b3764375a8de7e22da Author: Tejun Heo Date: Tue Mar 30 02:52:29 2010 +0900 ALSA: usb - 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 Signed-off-by: Takashi Iwai commit 923a00427a141a6d1c83f1b151221a2458b2de8d Author: Tejun Heo Date: Tue Mar 30 02:52:29 2010 +0900 ASoC: 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 Signed-off-by: Takashi Iwai commit f77f13e22df4a40d237697df496152c8c37f3f2b Author: Gilles Espinasse Date: Mon Mar 29 15:41:47 2010 +0200 Fix comment and Kconfig typos for 'require' and 'fragment' Signed-off-by: Gilles Espinasse Signed-off-by: Jiri Kosina commit f4221802ea3a28f7c16d157ac6f697d58267cb58 Author: Paul Mundt Date: Mon Mar 29 17:45:12 2010 +0900 sh: sh7723 clkdev lookups. Convert to TMU clock lookups for SH7723. Signed-off-by: Paul Mundt commit 04b1731766b22cd41a0acd480e3206e93f2d5931 Author: Paul Mundt Date: Mon Mar 29 17:37:39 2010 +0900 sh: sh7722 clock string death. Kills off clock string usage, using the new function clock definition instead. Signed-off-by: Paul Mundt commit 2169bc1bae5d6d996276ddbd017f9d9b582abcae Author: Paul Mundt Date: Mon Mar 29 17:36:41 2010 +0900 sh: sh7366 clock string death. Kills off clock string usage, using the new function clock definition instead. Signed-off-by: Paul Mundt commit 5afdd0d93a32938752384f195fdbde06163b3c2e Author: Paul Mundt Date: Mon Mar 29 17:35:04 2010 +0900 sh: sh7343 clock string death. Kills off clock string usage, using the new function clock definition instead. Signed-off-by: Paul Mundt commit 4dc50a068ad8fbbd2dd6dd5ac8ac2652589ba046 Author: Paul Mundt Date: Mon Mar 29 17:25:03 2010 +0900 sh: Kill off timer clock strings for legacy CPG parts. Now with the lookup aliases in place there is no longer any need to provide the clock string, kill it off for all legacy CPG CPUs. Signed-off-by: Paul Mundt commit 0776d602abe61871d27accd8e3bcb225a96f4a9f Author: Paul Mundt Date: Mon Mar 29 17:22:50 2010 +0900 sh: provide some clock lookup aliases for legacy CPG parts. For the CPUs that have not yet been converted off of legacy CPG we provide some pclk aliases in order to make driver migration easier. Signed-off-by: Paul Mundt commit c55fbdd3f97a468d51cbdb03bb7c9c7287fbda2f Author: Paul Mundt Date: Mon Mar 29 17:10:06 2010 +0900 sh: sh7785 clkdev lookups. Convert to TMU clock lookups for SH7785. Signed-off-by: Paul Mundt commit 9966ddafe1b4f2a9a09ea748b42ef69417b23ff1 Author: Stephen Rothwell Date: Mon Mar 29 19:01:48 2010 +1100 ALSA: usb pcm: use of kmalloc requires the include of slab.h Signed-off-by: Stephen Rothwell Signed-off-by: Takashi Iwai commit e21d2aa76e1fc91cbf18c4b593d32112d954fab5 Author: Paul Mundt Date: Mon Mar 29 17:03:15 2010 +0900 sh: sh7786 clkdev lookups. This plugs in clkdev lookups for the SH7786 clocks and migrates off of clock string usage for the TMU clocks. Previously the TMU clocks were aliased to the peripheral clock, so this gets the driver actually toggling the proper clocks now as well. Signed-off-by: Paul Mundt commit 30bde1f5076a9b6bd4b6a168523930ce242c7449 Author: Stephen Rothwell Date: Mon Mar 29 01:00:44 2010 -0700 rps: fix net-sysfs build for !CONFIG_RPS Signed-off-by: Stephen Rothwell Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c2a25e819717ea34e8f682d67a3fa76f4893395b Author: Paul Mundt Date: Mon Mar 29 16:55:43 2010 +0900 clocksource: Deprecate clock string across the SH drivers. We want to get rid of the clock string from platform data entirely, depending on the clkdev-based clock lookup to do the right thing for us instead. This converts all of the SH drivers to request their associated function clocks directly, and if there is no match for that then we fall back on the legacy lookup while warning about it. After all of the outstanding CPUs have been converted to clkdev lookups the clock string will be killed off completely. Signed-off-by: Paul Mundt commit d01e14a6b96a3384b6806fac1a769ca3be0022bb Author: Takashi Iwai Date: Mon Mar 29 09:31:57 2010 +0200 ASoC: Fix file permission of soc/codecs/twl6040.c Signed-off-by: Takashi Iwai commit 68b40cc40af45dd969c50fdbac6ab5b99c91255b Author: Stephen Rothwell Date: Mon Mar 29 17:55:51 2010 +1100 ASoC: TWL6040: use of kzalloc/kfree requires the include of slab.h Signed-off-by: Stephen Rothwell Signed-off-by: Takashi Iwai commit 467126460818e287aa92c73232c38453ec2ab013 Author: Takashi Iwai Date: Mon Mar 29 09:19:38 2010 +0200 ALSA: hda - Report errors when invalid values are passed to snd_hda_amp_*() The values should be in 8 bits. Signed-off-by: Takashi Iwai commit 55440e4e37540305997b7e93d319ddce97a9cfb1 Merge: 5266874 5dbd5ec Author: Takashi Iwai Date: Mon Mar 29 09:20:32 2010 +0200 Merge branch 'fix/hda' into topic/hda commit 620bb636dfb36574b57a89a4c3029237d69bee04 Merge: c7ed1ab bd05086 Author: Paul Mundt Date: Mon Mar 29 16:00:06 2010 +0900 Merge branch 'sh/driver-core' into sh/clkfwk commit bd05086bbe3f241cd552068f9ceba9e19c6ce427 Author: Paul Mundt Date: Mon Mar 29 15:51:35 2010 +0900 driver core: Convert to kasprintf() for early dev_name(). This is just a simple refactoring patch on top of the early dev_name() support, converting from kstrdup() to kasprintf() as suggested by Kay. Signed-off-by: Paul Mundt commit 1b132ea03e169ce5eca75b00224a78a6782740e8 Author: Stephen Rothwell Date: Mon Mar 29 15:32:18 2010 +1100 ASoC: update for removeal of slab.h from percpu.h Signed-off-by: Stephen Rothwell Signed-off-by: Takashi Iwai commit 6ae6650232ddcf2f50e8817acd63cde37cf1d093 Author: Matt Fleming Date: Mon Mar 29 15:24:54 2010 +0900 sh: tlb debugfs support. Export the status of the utlb and itlb entries through debugfs. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 36db0456582484aa78809376f1e41ec2873fc9d5 Author: Stephen Rothwell Date: Mon Mar 29 16:02:50 2010 +1100 ALSA: usb - use of kmalloc/kfree requires the include of slab.h Signed-off-by: Stephen Rothwell Signed-off-by: Takashi Iwai commit 10f744d205dde72a0016dbdb11e239da8269958b Author: Eric Dumazet Date: Sun Mar 28 23:07:20 2010 -0700 net: __netif_receive_skb should be static Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 0c0dbfecbf217b47d0b508afb59b8b3639582a4c Author: David S. Miller Date: Sat Mar 27 19:23:46 2010 -0700 decnet: Remove unused FIB metric macros. Unlike the ipv4 side, these are completely unused. Signed-off-by: David S. Miller commit adcfe1964e627b62fbc6e45609b1f0db2c64dd14 Author: Jan Engelhardt Date: Sat Mar 27 17:15:29 2010 -0700 net: increase preallocated size of nlmsg to accomodate for IFLA_STATS64 When more data is stuffed into an nlmsg than initially projected, an extra allocation needs to be done. Reserve enough for IFLA_STATS64 so that this does not to needlessy happen. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 14a4b42bd6082b4ce3b94bad00cd367707cc1e97 Author: Jan Engelhardt Date: Sat Mar 27 16:35:50 2010 -0700 net: fix unaligned access in IFLA_STATS64 Tony Luck observes that the original IFLA_STATS64 submission causes unaligned accesses. This is because nla_data() returns a pointer to a memory region that is only aligned to 32 bits. Do some memcpying to workaround this. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 8544b9f7371ec6a7a5c0f8701ddde9e98f52a37e Author: Bruce Allan Date: Wed Mar 24 12:55:30 2010 +0000 e1000e: Use pr_ and netdev_ As an alternative to a quite large patch previously submitted by Joe Perches to make use of kernel logging API, this patch is much less intrusive. Convert e_ to netdev_ Use #define pr_fmt Convert a few printks to pr_ Cc: Joe Perches Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 66aa4a55fe0548c8b13a195c61774db65c5896cd Author: Tom Goff Date: Fri Mar 19 15:38:50 2010 +0000 netlink: use the appropriate namespace pid This was included in OpenVZ kernels but wasn't integrated upstream. >From git://git.openvz.org/pub/linux-2.6.24-openvz: commit 5c69402f18adf7276352e051ece2cf31feefab02 Author: Alexey Dobriyan Date: Mon Dec 24 14:37:45 2007 +0300 netlink: fixup ->tgid to work in multiple PID namespaces Signed-off-by: Tom Goff Acked-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 5c58c47a4f3758c81594402451d8fe0d8accb4e8 Author: Jiri Pirko Date: Tue Mar 23 22:58:20 2010 +0000 ixgbevf: convert to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2853eb892edb6be1ea13787d0c24fb72c1d1cca5 Author: Jiri Pirko Date: Tue Mar 23 22:58:01 2010 +0000 ixgbe: convert to use netdev_for_each_mc_addr Signed-off-by: Jiri Pirko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 1fb2f77c037624601fd214fb7c29faa84cd7bdd7 Author: Henrik Kretzschmar Date: Fri Mar 26 20:38:35 2010 +0100 debugobjects: Section mismatch cleanup This patch marks two functions, which only get called at initialization, as __init. Here is also interesting, that modpost doesn't catch here the right function name. WARNING: lib/built-in.o(.text+0x585f): Section mismatch in reference from the function T.506() to the variable .init.data:obj The function T.506() references the variable __initdata obj. This is often because T.506 lacks a __initdata annotation or the annotation of obj is wrong. Signed-off-by: Henrik Kretzschmar LKML-Reference: <1269632315-19403-1-git-send-email-henne@nachtwindheim.de> Signed-off-by: Thomas Gleixner commit 11164cd4f6dab326a88bdf27f2f8f7c11977e91a Author: Peter Zijlstra Date: Fri Mar 26 14:08:44 2010 +0100 perf, x86: Add Nehelem PMU programming errata workaround Implement the workaround for Intel Errata AAK100 and AAP53. Also, remove the Core-i7 name for Nehalem events since there are also Westmere based i7 chips. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <1269608924.12097.147.camel@laptop> Signed-off-by: Ingo Molnar commit 5266874b09c8a9de744813dd0f7387f02e8191bf Merge: 05471e4 079e683 Author: Takashi Iwai Date: Fri Mar 26 15:28:41 2010 +0100 Merge remote branch 'alsa/devel' into topic/hda commit cc780d380a004b58c139570b037d0e3b897bb2be Author: Kuninori Morimoto Date: Thu Mar 25 19:15:53 2010 +0900 ASoC: fsi: Add FSI2 device support ARM-SHMOBILE series have FIFO-buffered serial interface 2 (FSI2) device which is advanced version of FSI. This patch add simple support for it. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4a942b457ee239eab04db8dd4d4c12ef6dc4a152 Author: Kuninori Morimoto Date: Thu Mar 25 19:15:51 2010 +0900 ASoC: fsi: Add FIFO size calculate Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit ea8e61b7bbc4a2faef77db34eb2db2a2c2372ff6 Author: Peter Zijlstra Date: Thu Mar 25 14:51:51 2010 +0100 x86, ptrace: Fix block-step Implement ptrace-block-step using TIF_BLOCKSTEP which will set DEBUGCTLMSR_BTF when set for a task while preserving any other DEBUGCTLMSR bits. Signed-off-by: Peter Zijlstra LKML-Reference: <20100325135414.017536066@chello.nl> Signed-off-by: Ingo Molnar commit faa4602e47690fb11221e00f9b9697c8dc0d4b19 Author: Peter Zijlstra Date: Thu Mar 25 14:51:50 2010 +0100 x86, perf, bts, mm: Delete the never used BTS-ptrace code Support for the PMU's BTS features has been upstreamed in v2.6.32, but we still have the old and disabled ptrace-BTS, as Linus noticed it not so long ago. It's buggy: TIF_DEBUGCTLMSR is trampling all over that MSR without regard for other uses (perf) and doesn't provide the flexibility needed for perf either. Its users are ptrace-block-step and ptrace-bts, since ptrace-bts was never used and ptrace-block-step can be implemented using a much simpler approach. So axe all 3000 lines of it. That includes the *locked_memory*() APIs in mm/mlock.c as well. Reported-by: Linus Torvalds Signed-off-by: Peter Zijlstra Cc: Roland McGrath Cc: Oleg Nesterov Cc: Markus Metzger Cc: Steven Rostedt Cc: Andrew Morton LKML-Reference: <20100325135413.938004390@chello.nl> Signed-off-by: Ingo Molnar commit 079e683ebd882655b6d6e0b17989e51bae2d77d6 Author: Jaroslav Kysela Date: Fri Mar 26 11:16:59 2010 +0100 ALSA: hda-intel - probe_only module option is int type now Signed-off-by: Jaroslav Kysela commit 38f57968f45333585293e88ea12ca577811fb9a7 Author: Jaroslav Kysela Date: Fri Mar 26 11:14:55 2010 +0100 ALSA: hda-intel - remove model=hwio from documentation Signed-off-by: Jaroslav Kysela commit 10e77ddac0e1f3b9cea04dfe8180f8641f329703 Author: Jaroslav Kysela Date: Fri Mar 26 11:04:38 2010 +0100 ALSA: hda-intel - remove model=hwio , use probe_only=3 instead The probe_only module parameter skips the codec initialization, too. Remove the model=hwio code and use second bit in probe_only to skip the HDA codec reset procedure. Signed-off-by: Jaroslav Kysela commit 0bf0e5a6f304ac1bc93a80cdd68b4d91f3519eb5 Author: Jaroslav Kysela Date: Fri Mar 26 10:33:18 2010 +0100 ALSA: hda-intel - AD1984 thinkpad - add analog beep input control For Lenovo Thinkpad T61/X61, the analog beep input is connected to node 0x20, index 3. Move the digital beep mute/volume controls as "Digital Beep" and create analog beep controls for mentioned node. Signed-off-by: Jaroslav Kysela commit cd508fe58b07499403e806b558c7f15c90442292 Author: Jaroslav Kysela Date: Fri Mar 26 10:28:46 2010 +0100 ALSA: hda-intel - add special 'hwio' model to bypass initialization Using the 'model=hwio' option, the driver bypasses any codec initialization and the reset procedure for codecs is also bypassed. This mode is usefull to enable direct access using hwdep interface (using hdaverb or hda-analyzer tools) and retain codec setup from BIOS. Signed-off-by: Jaroslav Kysela commit 7c5ecaf7666617889f337296c610815b519abfa9 Author: Peter Zijlstra Date: Thu Mar 25 14:51:49 2010 +0100 perf, x86: Clean up debugctlmsr bit definitions Move all debugctlmsr thingies into msr-index.h Signed-off-by: Peter Zijlstra LKML-Reference: <20100325135413.861425293@chello.nl> Signed-off-by: Ingo Molnar commit 5a10317483f606106395814ee2fdaa2f1256a3b3 Author: Zhang, Yanmin Date: Thu Mar 25 19:59:01 2010 -0300 perf record: Zero out mmap_array to fix segfault Reported-by: Li Zefan Tested-by: Li Zefan Signed-off-by: Zhang Yanmin Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1269557941-15617-6-git-send-email-acme@infradead.org> Cc: Signed-off-by: Ingo Molnar commit 5aab621b7bf024608f0c089e21656e7fe875a150 Author: Arnaldo Carvalho de Melo Date: Thu Mar 25 19:59:00 2010 -0300 perf symbols: Move hex2u64 and strxfrchar to symbol.c Mostly used in symbol.c so move them there to reduce the number of files needed to use the symbol system. Also do some header adjustments with the same intent. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269557941-15617-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 618038df3588fdfcaccfd40057f36ce792bee252 Author: Arnaldo Carvalho de Melo Date: Thu Mar 25 19:58:59 2010 -0300 perf tools: Move __used from perf.h to linux/compiler.h Just like in the kernel and also to remove the need to include perf.h in the symbol subsystem. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269557941-15617-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 4b8cf84624e9a58a21aaac3d064222092ae234e0 Author: Arnaldo Carvalho de Melo Date: Thu Mar 25 19:58:58 2010 -0300 perf symbols: Move map related routines to map.c Thru series of refactorings functions were being renamed but not moved to map.c to reduce patch noise, now lets have them in the same place so that use of the symbol system by tools can be constrained to building and linking fewer source files: symbol.c, map.c and rbtree.c. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269557941-15617-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b177f63f5226e75280855bbcd106e677250778bd Author: Arnaldo Carvalho de Melo Date: Thu Mar 25 19:58:57 2010 -0300 perf symbols: Pass the mmap parameters instead of using mmap_event To reduce the coupling of the symbol system with the rest of perf. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269557941-15617-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d5679ae4d2d4369477dc3b60027cca222aef33e9 Author: Arnaldo Carvalho de Melo Date: Wed Mar 24 16:40:19 2010 -0300 perf report: Pass the DSO to 'perf annotate' So that we ensure that the symbol asked for annotation really is in the DSO we are interested in. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269459619-982-6-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b3c9ac0846c654dea4df095999ee202e8b4cb253 Author: Arnaldo Carvalho de Melo Date: Wed Mar 24 16:40:18 2010 -0300 perf callchains: Store the map together with the symbol We need this to know where a symbol in a callchain came from, for various reasons, among them precise annotation from a TUI/GUI tool. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269459619-982-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 59fd53062f71011a68d03f4cd0ba93d822ac3249 Author: Arnaldo Carvalho de Melo Date: Wed Mar 24 16:40:17 2010 -0300 perf tools: Introduce struct map_symbol That will be in both struct hist_entry and struct callchain_list, so that the TUI can store a pointer to the pair (map, symbol) in the trees where hist_entries and callchain_lists are present, to allow precise annotation instead of looking for the first symbol with the selected name. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269459619-982-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ac73c5a9c1767b2771e6d2b5accafdef89db04c2 Author: Arnaldo Carvalho de Melo Date: Wed Mar 24 16:40:16 2010 -0300 perf annotate: Allow specifying DSOs where to look for symbol Using the same parameter as in 'perf report', allowing to specify just one and disambiguate between DSOs that have the symbol of interest. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269459619-982-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 96415e4d3f5fdf9cdb12eedfcbc58152b1e1458c Author: Arnaldo Carvalho de Melo Date: Wed Mar 24 16:40:15 2010 -0300 perf symbols: Avoid unnecessary symbol loading when dso list is specified We were performing the full thread__find_addr_location operation, i.e. resolving to a map/dso _and_ loading its symbols when we can optimize it by first calling thread__find_addr_map to find just the map/dso, check if it is one that we are interested in (passed via --dsos/-d in 'perf annotate', 'perf report', etc) and if not avoid loading the symtab. Nice speedup when we know which DSO we're interested in. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269459619-982-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 53c540195724b52422da067a31ef6916d2c70202 Author: Arnaldo Carvalho de Melo Date: Wed Mar 24 16:40:14 2010 -0300 perf report: Add a popup menu to ask what operation is to be performed Right now it presents a menu with these options: +------------------------------+ | Annotate CURRENT_SYMBOL_NAME | | Exit | +------------------------------+ If the highlighted (current) symbol is not annotatable only the "Exit" option will appear. Also add a confirmation dialog when ESC is pressed on the top level to avoid exiting the application by pressing one too many ESC key. To get to the menu just press the -> (Right navigation key), to exit just press ESC. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269459619-982-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d814f30105798b6677ecb73ed61d691ff96dada9 Author: Cyrill Gorcunov Date: Wed Mar 24 12:09:26 2010 +0800 x86, perf: Add raw events support for the P4 PMU The adding of raw event support lead to complete code refactoring. I hope is became more readable then it was. The list of changes: 1) The 64bit config field is enough to hold all information we need to track event details. To achieve it we used *own* enum for events selection in ESCR register and map this key into proper value at moment of event enabling. For the same reason we use 12LSB bits in CCCR register -- to track which exactly cache trace event was requested. And we cear this bits at real 'write' moment. 2) There is no per-cpu area reserved for P4 PMU anymore. We don't need it. All is held by config. 3) Now we may use any available counter, ie we try to grab any possible counter. v2: - Lin Ming reported the lack of ESCR selector in CCCR for cache events v3: - Don't loose cache event codes at config unpacking procedure, we may need it one day so no obscure hack behind our back, better to clear reserved bits explicitly when needed (thanks Ming for pointing out) - Lin Ming fixed misplaced opcodes in cache events Signed-off-by: Cyrill Gorcunov Tested-by: Lin Ming Signed-off-by: Lin Ming Cc: Arnaldo Carvalho de Melo Cc: Stephane Eranian Cc: Robert Richter Cc: Frederic Weisbecker Cc: Cyrill Gorcunov Cc: Peter Zijlstra LKML-Reference: <1269403766.3409.6.camel@minggr.sh.intel.com> [ v4: did a few whitespace fixlets ] Signed-off-by: Ingo Molnar commit b79d1d54cf0672f764402fe4711ef5306f917bd3 Author: David S. Miller Date: Thu Mar 25 21:39:21 2010 -0700 ipv6: Fix result generation in ipv6_get_ifaddr(). Finishing naturally from hlist_for_each_entry(x, ...) does not result in 'x' being NULL. Signed-off-by: David S. Miller commit b54c9b98bbfb4836b1f7441c5a9db24affd3c2e9 Author: David S. Miller Date: Thu Mar 25 21:25:30 2010 -0700 ipv6: Preserve pervious behavior in ipv6_link_dev_addr(). Use list_add_tail() to get the behavior we had before the list_head conversion for ipv6 address lists. Signed-off-by: David S. Miller commit 225a9be24d799aa16d543c31fb09f0c9ed1d9caa Author: Rajiv Andrade Date: Thu Mar 25 00:55:32 2010 -0300 TPM: workaround to enforce PCR updates across suspends Add a workaround for TPM's which fail to flush last written PCR values in a TPM_SaveState, in preparation for suspend. Signed-off-by: David Safford Acked-by: Rajiv Andrade Signed-off-by: James Morris commit ec2755a93d5df044cb52558d2c778780272e0980 Author: Sedji Gaouaou Date: Thu Feb 25 18:59:40 2010 +0100 ALSA: AC97: add full duplex support for atmel AT91 and AVR. This patch add full duplex support on AT91 and AVR. It was a bug: we needed to check first if there are some chips opened so we could enable both reception and sending of the data. Signed-off-by: Sedji Gaouaou Acked-by: Liam Girdwood Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit 7177395fdd919e561544a7d1c0ac196098a2ae2d Author: Sedji Gaouaou Date: Mon Mar 1 12:19:18 2010 +0100 ALSA: AC97: add AC97 support for AT91. This patch add AC97 support for ATMEL AT91, using the AVR32 code. While AVR is using a DMA, the AT91 chips are using a Peripheral Data Controller. Signed-off-by: Sedji Gaouaou Acked-by: Liam Girdwood Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit df3345457a7a174dfb5872a070af80d456985038 Author: Eric Dumazet Date: Wed Mar 24 19:13:54 2010 +0000 rps: add CONFIG_RPS RPS currently depends on SMP and SYSFS Adding a CONFIG_RPS makes sense in case this requirement changes in the future. This patch saves about 1500 bytes of kernel text in case SMP is on but SYSFS is off. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d28667f871991e0eea983b398421b8db2c8bdf8c Author: Wey-Yi Guy Date: Fri Mar 19 11:54:49 2010 -0700 iwlwifi: avoid device type checking in generic code Avoid checking for specified device type to perform certain function, switch to .cfg approach as more generic and better implementation method. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 6e8cc38d5b05bb812f89a35bd9bf52405e67d0df Author: Wey-Yi Guy Date: Fri Mar 19 10:36:09 2010 -0700 iwlwifi: change spin_lock to spin_lock_irqsave Use spin_lock_irqsave() in interrupt handler to disable interrupts locally and provide the spinlock on SMP. This covers both interrupt and SMP concurrency. With this changes, also fix the sparse warning issues. Signed-off-by: Wey-Yi Guy Acked-by: Zhu Yi Signed-off-by: Reinette Chatre commit 6c69d121676761b2a85282df796af9c3f8c99b64 Author: Wey-Yi Guy Date: Thu Mar 18 15:37:49 2010 -0700 iwlwifi: remove "\n" from module parameter description Remove the "\n" from following module parameter description: - enable wifi/bluetooth co-exist - led mode: 0=blinking, 1=On(RF On)/Off(RF Off), (default 0) to be consistence with the rest of iwlagn/iwlcore module parameters format. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 2f3f7f9c23287c742af1d435b6fe8b9c9c7b7bd9 Author: Wey-Yi Guy Date: Thu Mar 18 10:56:32 2010 -0700 iwlwifi: Generic approach to measure temperature In stead of checking for 4965 and do KELVIN_TO_CELSIUS conversation, add .cfg parameter for more generic approach. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit ed1b6e99b5e64d2b9cdf764754a072c7fdc1c3c4 Author: Johannes Berg Date: Thu Mar 18 09:58:27 2010 -0700 iwlwifi: remove noise reporting We go to great lengths to calculate this value that is never used by mac80211. Additionally, it is now deprecated by mac80211 and is causing driver compilation to give warnings. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 3d2b162e7e0a3e5093bccdf455f7c83f65c82db8 Author: Wey-Yi Guy Date: Wed Mar 17 18:57:13 2010 -0700 iwlwifi: add missing email address information Add missing contact email address to iwl-5000.c Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 510cb791ab32a6296e45ebc425a011551bed7bd1 Author: Wey-Yi Guy Date: Tue Mar 16 12:37:28 2010 -0700 iwlwifi: remove non-exist extern functions and structures After re-structure the agn files layout and move all the agn shared functions out from iwl-5000.c, all those functions and data structures do not need to be declare "extern" from iwl-5000.c in iwl-dev.h. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 0b5af201b25334f7b9c991b2800693dd4cb4b5f7 Author: Jay Sternberg Date: Wed Mar 17 16:16:12 2010 -0700 iwlwifi: enable '6000 Series 2x2 AGN Gen2' adaptors Signed-off-by: Jay Sternberg Signed-off-by: Reinette Chatre commit 8d801080dd8d28bf7d85cacba131f18b7653ee49 Author: Wey-Yi Guy Date: Wed Mar 17 13:34:36 2010 -0700 iwlwifi: more clean up to move agn only rx functions from iwlcore to iwlagn Move more functions only used by agn driver from iwlcore to iwlagn. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 54b81550dd674466fe7d01629d2aab015c545a1e Author: Wey-Yi Guy Date: Wed Mar 17 13:34:35 2010 -0700 iwlwifi: move agn only rx functions from iwlcore to iwlagn Identify the rx functions only used by agn driver and move those from iwlcore to iwlagn. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 74bcdb33e99f49ef5202dd2f8109945b4570edc2 Author: Wey-Yi Guy Date: Wed Mar 17 13:34:34 2010 -0700 iwlwifi: move agn only tx functions from iwlcore to iwlagn Identify the tx functions only used by agn driver and move those from iwlcore to iwlagn. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 348ee7cd57831c47373dd157f138c558daaf129d Author: Wey-Yi Guy Date: Tue Mar 16 12:37:27 2010 -0700 iwlwifi: move agn module parameter structure to common place agn module parameter data structure shared by all agn devices, move it iwl-agn-lib.c file. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 00e70590dc2707043b82c0cf9a6929b81e640fee Author: Wey-Yi Guy Date: Tue Mar 16 12:37:26 2010 -0700 iwlwifi: each device has its own eeprom tx power version Each device has it own eeprom, so the tx power version could be different, define TX_POWER_VERSION per device. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit e04ed0a5bb62520345c73587d7ebf51e426642ee Author: Wey-Yi Guy Date: Tue Mar 16 17:47:58 2010 -0700 iwlwifi: move agn common code to iwlagn library file Multiple iwlagn based devices share the same common functions. Move those functions from iwl-5000.c to iwl-agn-lib.c file. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 741a626627e42812afd957f875c34c89be8a103e Author: Wey-Yi Guy Date: Tue Mar 16 12:37:24 2010 -0700 iwlwifi: move ucode alive related code to separate file uCode alive for iwlagn based devices share the same functions. Move those functions from iwl-5000.c to iwl-agn-ucode.c. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 19e6cda094002e9756a3d181cbb4c31ef2a9b6bb Author: Wey-Yi Guy Date: Tue Mar 16 17:41:23 2010 -0700 iwlwifi: move hw related defines to separate file Multiple iwlagn based devices shared the same hw definitions. Move device hardware related defines from iwl-5000-hw.h to iwl-agn-hw.h file. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit b305a08058f794c8a99c5ee87827b92d6b8c24ae Author: Wey-Yi Guy Date: Tue Mar 16 17:41:22 2010 -0700 iwlwifi: move tx queue related code to separate file Multiple iwlagn based devices shared the same tansmit queue functions. Move tx queue related code from iwl-5000.c to iwl-agn-tx.c file. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 7dc77dba6a8bde512996824643da5669d73cbcdc Author: Wey-Yi Guy Date: Tue Mar 16 10:23:31 2010 -0700 iwlwifi: move hcmd related code to separate file Multiple iwlagn based devices shared the same hcmd related functions. Move from iwl-5000.c to iwl-agn-hcmd.c file. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 81b8176eb8edac7d2135db2af03ab5fe0cb3b6f7 Author: Wey-Yi Guy Date: Tue Mar 16 10:23:30 2010 -0700 iwlwifi: code cleanup for "load ucode" function Loading uCode functions are shared across multiple agn devices. Move those functions to iwl-agn-ucode.c file with other uCode related functions. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 792bc3cbe06cddabd865acc3122ee0415f854a11 Author: Wey-Yi Guy Date: Tue Mar 16 10:23:29 2010 -0700 iwlwifi: move ucode loading related code to separated file Multiple iwlagn based devices shared the same ucode loading procedure. Move loading related code from iwl-5000.c to iwl-agn-ucode.c file. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 872c8ddcbec06995c1c7caa3e41c921290a8b6df Author: Wey-Yi Guy Date: Tue Mar 16 10:46:31 2010 -0700 iwlwifi: iwl_good_ack_health() only apply to AGN device iwl_good_ack_health() check for expected and actual ack count which only apply to aggregation mode. Move the function to iwlagn module. Reported-by: Chantry Xavier Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit e184f67d39f681b1e8c9a43ff7001c3405c2bd7c Author: Reinette Chatre Date: Thu Mar 25 11:14:52 2010 -0700 Revert "iwlwifi: fix build error for CONFIG_IWLAGN=n" This reverts commit 76232ebf898c4d5e657f2b663fbf7108bca80ded. iwl_good_ack_health only applies to aggregation and thus only to iwlagn. We can thus move the function to iwlagn instead of modifying compile flags. This is done in following patch. Signed-off-by: Reinette Chatre commit b44672889c11e13e4f4dc0a8ee23f0e64f1e57c6 Author: Jan Engelhardt Date: Wed Mar 24 22:50:01 2010 +0100 netfilter: xtables: merge registration structure to NFPROTO_UNSPEC Signed-off-by: Jan Engelhardt commit d879e19e18ebc69fc20a9b95612e9dd0acf4d7aa Author: Jan Engelhardt Date: Mon Mar 22 19:39:04 2010 +0100 netfilter: xtables: remove xt_string revision 0 Superseded by xt_string revision 1 (linux v2.6.26-rc8-1127-g4ad3f26, iptables 1.4.2-rc1). Signed-off-by: Jan Engelhardt commit 110d99ed1c846458654e2771b3ad626319f19394 Author: Jan Engelhardt Date: Mon Mar 22 19:35:01 2010 +0100 netfilter: xtables: remove xt_multiport revision 0 Superseded by xt_multiport revision 1 (introduction already predates linux.git). Signed-off-by: Jan Engelhardt commit 779dd630d8e198a2dc5581a48efae546161cc726 Author: Jan Engelhardt Date: Mon Mar 22 19:28:53 2010 +0100 netfilter: xtables: remove xt_hashlimit revision 0 Superseded by xt_hashlimit revision 1 (linux v2.6.24-6212-g09e410d, iptables 1.4.1-rc1). Signed-off-by: Jan Engelhardt commit f95c74e33eff5e3fe9798e2dc0a7749150ea3f80 Author: Jan Engelhardt Date: Sun Mar 21 04:05:56 2010 +0100 netfilter: xtables: shorten up return clause The return value of nf_ct_l3proto_get can directly be returned even in the case of success. Signed-off-by: Jan Engelhardt commit 4a5a5c73b7cfee46a0b1411903cfa0dea532deec Author: Jan Engelhardt Date: Fri Mar 19 17:32:59 2010 +0100 netfilter: xtables: slightly better error reporting When extended status codes are available, such as ENOMEM on failed allocations, or subsequent functions (e.g. nf_ct_get_l3proto), passing them up to userspace seems like a good idea compared to just always EINVAL. Signed-off-by: Jan Engelhardt commit d6b00a5345ce4e86e8b00a88bb84a2c0c1f69ddc Author: Jan Engelhardt Date: Thu Mar 25 16:34:45 2010 +0100 netfilter: xtables: change targets to return error code Part of the transition of done by this semantic patch: // @ rule1 @ struct xt_target ops; identifier check; @@ ops.checkentry = check; @@ identifier rule1.check; @@ check(...) { <... -return true; +return 0; ...> } @@ identifier rule1.check; @@ check(...) { <... -return false; +return -EINVAL; ...> } // Signed-off-by: Jan Engelhardt commit bd414ee605ff3ac5fcd79f57269a897879ee4cde Author: Jan Engelhardt Date: Tue Mar 23 16:35:56 2010 +0100 netfilter: xtables: change matches to return error code The following semantic patch does part of the transformation: // @ rule1 @ struct xt_match ops; identifier check; @@ ops.checkentry = check; @@ identifier rule1.check; @@ check(...) { <... -return true; +return 0; ...> } @@ identifier rule1.check; @@ check(...) { <... -return false; +return -EINVAL; ...> } // Signed-off-by: Jan Engelhardt commit 135367b8f6a18507af6b9a6910a14b5699415309 Author: Jan Engelhardt Date: Fri Mar 19 17:16:42 2010 +0100 netfilter: xtables: change xt_target.checkentry return type Restore function signatures from bool to int so that we can report memory allocation failures or similar using -ENOMEM rather than always having to pass -EINVAL back. // @@ type bool; identifier check, par; @@ -bool check +int check (struct xt_tgchk_param *par) { ... } // Minus the change it does to xt_ct_find_proto. Signed-off-by: Jan Engelhardt commit b0f38452ff73da7e9e0ddc68cd5c6b93c897ca0d Author: Jan Engelhardt Date: Fri Mar 19 17:16:42 2010 +0100 netfilter: xtables: change xt_match.checkentry return type Restore function signatures from bool to int so that we can report memory allocation failures or similar using -ENOMEM rather than always having to pass -EINVAL back. This semantic patch may not be too precise (checking for functions that use xt_mtchk_param rather than functions referenced by xt_match.checkentry), but reviewed, it produced the intended result. // @@ type bool; identifier check, par; @@ -bool check +int check (struct xt_mtchk_param *par) { ... } // Signed-off-by: Jan Engelhardt commit 9f5673174161cc026a6c87f70d9b457e7ad82a80 Author: Jan Engelhardt Date: Tue Mar 23 17:40:13 2010 +0100 netfilter: xtables: untangle spaghetti if clauses in checkentry As I'm changing the return values soon, I want to have a clear visual path. Signed-off-by: Jan Engelhardt commit 7911b5c75b613f533b6cb6f999041dd5ea3bb004 Author: Jan Engelhardt Date: Tue Mar 23 04:08:46 2010 +0100 netfilter: ipvs: use NFPROTO values for NF_HOOK invocation Semantic patch: // @@ @@ IP_VS_XMIT( -PF_INET6, +NFPROTO_IPV6, ...) @@ @@ IP_VS_XMIT( -PF_INET, +NFPROTO_IPV4, ...) // Signed-off-by: Jan Engelhardt commit 5d877d876cfb96c0c3254184171b4767501f4f95 Author: Jan Engelhardt Date: Tue Mar 23 04:09:14 2010 +0100 netfilter: decnet: use NFPROTO values for NF_HOOK invocation The semantic patch used was: // @@ @@ NF_HOOK( -PF_DECnet, +NFPROTO_DECNET, ...) // Signed-off-by: Jan Engelhardt commit b2e0b385d77069031edb957839aaaa8441b47287 Author: Jan Engelhardt Date: Tue Mar 23 04:09:07 2010 +0100 netfilter: ipv6: use NFPROTO values for NF_HOOK invocation The semantic patch that was used: // @@ @@ (NF_HOOK |NF_HOOK_THRESH |nf_hook )( -PF_INET6, +NFPROTO_IPV6, ...) // Signed-off-by: Jan Engelhardt commit 9bbc768aa911a3ef336272eaa6d220abfba8ce50 Author: Jan Engelhardt Date: Tue Mar 23 04:07:29 2010 +0100 netfilter: ipv4: use NFPROTO values for NF_HOOK invocation The semantic patch that was used: // @@ @@ (NF_HOOK |NF_HOOK_COND |nf_hook )( -PF_INET, +NFPROTO_IPV4, ...) // Signed-off-by: Jan Engelhardt commit 713aefa3fb3929ce36305d4d1b7b4059d87ed115 Author: Jan Engelhardt Date: Tue Mar 23 04:07:21 2010 +0100 netfilter: bridge: use NFPROTO values for NF_HOOK invocation The first argument to NF_HOOK* is an nfproto since quite some time. Commit v2.6.27-2457-gfdc9314 was the first to practically start using the new names. Do that now for the remaining NF_HOOK calls. The semantic patch used was: // @@ @@ (NF_HOOK |NF_HOOK_THRESH )( -PF_BRIDGE, +NFPROTO_BRIDGE, ...) @@ @@ NF_HOOK( -PF_INET6, +NFPROTO_IPV6, ...) @@ @@ NF_HOOK( -PF_INET, +NFPROTO_IPV4, ...) // Signed-off-by: Jan Engelhardt commit 05471e4c446ca42d474b89df55bd48b0ce802717 Merge: 7fb5622 6a4f2cc Author: Takashi Iwai Date: Thu Mar 25 15:06:58 2010 +0100 Merge branch 'fix/hda' into topic/hda commit 5dc7a6d5749d3ddbf9fbea9512cb45762428512c Author: Jan Engelhardt Date: Fri Mar 19 21:29:08 2010 +0100 netfilter: xt_recent: allow changing ip_list_[ug]id at runtime Signed-off-by: Jan Engelhardt commit fd0ec0e6216baea854465bbdb177f2d1b2ccaf22 Author: Jan Engelhardt Date: Fri Jul 10 19:27:47 2009 +0200 netfilter: xtables: consolidate code into xt_request_find_match Signed-off-by: Jan Engelhardt commit d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b Author: Jan Engelhardt Date: Fri Jul 10 18:55:11 2009 +0200 netfilter: xtables: make use of xt_request_find_target Signed-off-by: Jan Engelhardt commit ff67e4e42bd178b1179c4d8e5c1fde18758ce84f Author: Jan Engelhardt Date: Fri Mar 19 21:08:16 2010 +0100 netfilter: xt extensions: use pr_ (2) Supplement to 1159683ef48469de71dc26f0ee1a9c30d131cf89. Downgrade the log level to INFO for most checkentry messages as they are, IMO, just an extra information to the -EINVAL code that is returned as part of a parameter "constraint violation". Leave errors to real errors, such as being unable to create a LED trigger. Signed-off-by: Jan Engelhardt commit fca5bca48759c21eddc0667a4582a227d7b0165a Author: Felix Homann Date: Thu Mar 25 11:29:14 2010 +0100 ALSA: usbaudio: Add basic support for M-Audio Fast Track Ultra series This adds basic support for M-Audio's Fast Track Ultra series of USB audio interfaces. It is a refactored version of the patch Clemens Ladisch posted some time ago. Neither playback nor capturing work properly at 44100 Hz (don't know why). The other sampling rates work properly. There's no support for the DSP mixer, yet. Signed-off-by: Felix Homann Signed-off-by: Takashi Iwai commit 5239c4ff4ae9e810ba761518ad71b463f0ccbf3c Author: Greg Thelen Date: Wed Mar 24 14:48:30 2010 -0700 cpuset: Fix documentation punctuation Fix cpusets.txt documentation punctuation. Signed-off-by: Greg Thelen Acked-by: Randy Dunlap Acked-by: Paul Menage Signed-off-by: Jiri Kosina commit 0d34545563f99886b997be7da63f0e8084af3bc5 Author: Jan Engelhardt Date: Fri Mar 19 18:47:51 2010 +0100 netfilter: xtables: make use of caller family rather than target family Supplement to aa5fa3185791aac71c9172d4fda3e8729164b5d1. The semantic patch for this change is: // @@ struct xt_target_param *par; @@ -par->target->family +par->family @@ struct xt_tgchk_param *par; @@ -par->target->family +par->family @@ struct xt_tgdtor_param *par; @@ -par->target->family +par->family // Signed-off-by: Jan Engelhardt commit 76232ebf898c4d5e657f2b663fbf7108bca80ded Author: John W. Linville Date: Wed Mar 24 17:21:08 2010 -0400 iwlwifi: fix build error for CONFIG_IWLAGN=n drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health': drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn' Reported-by: Randy Dunlap Signed-off-by: John W. Linville commit 2381a55c88453d3f29fe62d235579a05fc20b7b3 Author: Frans Pop Date: Wed Mar 24 07:57:36 2010 +0000 net/various: remove trailing space in messages Signed-off-by: Frans Pop Signed-off-by: David S. Miller commit d6dbee861386cd3f4cee62bcf28597e63e251e0c Author: Frans Pop Date: Wed Mar 24 07:57:35 2010 +0000 net/intel: remove trailing space in messages Includes one minor indentation fix to placate checkpatch. Signed-off-by: Frans Pop Cc: e1000-devel@lists.sourceforge.net Signed-off-by: David S. Miller commit c2bb1b9c7e862ecca2ffb20b1457034d2c401845 Author: Frans Pop Date: Wed Mar 24 07:57:34 2010 +0000 net/tulip: remove trailing space in messages Signed-off-by: Frans Pop Signed-off-by: David S. Miller commit 014e46686eff2159bac0887465fed7662c379ad3 Author: Frans Pop Date: Wed Mar 24 07:57:33 2010 +0000 net/tokenring: remove trailing space in messages Trailing spaces in files in /proc for lanstreamer.c and olympic.c have been left as they are. Signed-off-by: Frans Pop Signed-off-by: David S. Miller commit 84d57bd61866c06aee5658fabe43292a231a5992 Author: Frans Pop Date: Wed Mar 24 07:57:32 2010 +0000 net/smc91xx: remove trailing space in messages Includes a few whitespace fixes to placate checkpatch. Signed-off-by: Frans Pop Signed-off-by: David S. Miller commit 583d077d35dd8df231c1e391e5406f0faf1a1788 Author: Frans Pop Date: Wed Mar 24 07:57:31 2010 +0000 net/ps3_gelic: remove trailing space in messages ps3_gelic_wireless.c: also remove a stray "p" after a newline. Signed-off-by: Frans Pop Cc: Benjamin Herrenschmidt Cc: linuxppc-dev@ozlabs.org Signed-off-by: David S. Miller commit 19299b34b42f4d37be2ce9b411664f37ca10ff61 Author: Frans Pop Date: Wed Mar 24 07:57:30 2010 +0000 net/irda: remove trailing space in messages Includes a minor consistency improvement between two related debug messages. Signed-off-by: Frans Pop Cc: Samuel Ortiz Signed-off-by: David S. Miller commit a570f095eac34b7439eed2df6728381708c55bdc Author: Frans Pop Date: Wed Mar 24 07:57:29 2010 +0000 tipc: remove trailing space in messages Signed-off-by: Frans Pop Cc: Per Liden Cc: Jon Maloy Cc: Allan Stephens Signed-off-by: David S. Miller commit b138338056fc423c61a583d45f8aa64cfad87131 Author: Frans Pop Date: Wed Mar 24 07:57:28 2010 +0000 net: remove trailing space in messages Signed-off-by: Frans Pop Signed-off-by: David S. Miller commit 18062ca94714a66e75da8a22e010d0e8e61ab4cd Author: Dan Carpenter Date: Wed Mar 24 01:57:30 2010 +0000 rds: cleanup: remove unneeded variable We never use "sk" so this patch removes it. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit a424077a0a48d5b2e1bdbb8cc56fd43abfd7fd6c Author: Dan Carpenter Date: Wed Mar 24 01:56:03 2010 +0000 wimax: remove unneeded variable We never actually use "dev" so I removed it. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit a3dcce97b285ba54810f38fe2eccc295d69a76ce Author: Dan Carpenter Date: Wed Mar 24 01:55:10 2010 +0000 llc: cleanup: remove dead code from llc_init() We don't need "dev" any more after: a5a04819c5740cb1aa217af2cc8f5ef26f33d744 [LLC]: station source mac address Signed-off-by: Dan Carpenter Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 14b44974d5a3c1ca59f6809b7313d7229eb55fd8 Author: Dan Carpenter Date: Wed Mar 24 14:56:41 2010 +0300 mac80211: remove unneed variable from ieee80211_tx_pending() We don't need "sdata" any more after: d84f323477260e773d5317ad7cbe50f76115cb47 mac80211: remove dev_hold/put calls Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 4ac5541bdaea4d8e93710c58775cfa48ac82e09b Author: Juuso Oikarinen Date: Wed Mar 24 10:11:14 2010 +0200 cfg80211: Improve connection quality maintenance docs in nl80211.h In nl80211.h, be a little more elaborate in the docs for the definitions NL80211_ATTR_CQM_RSSI_THOLD and NL80211_ATTR_CQM_RSSI_HYST. Reported-by: Luis R. Rodriguez Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit a97c13c34509be460dea23c86f31c02daa2428b5 Author: Juuso Oikarinen Date: Tue Mar 23 09:02:34 2010 +0200 mac80211: Add support for connection quality monitoring Add support for the set_cqm_config op. This op function configures the requested connection quality monitor rssi threshold and rssi hysteresis values to the hardware if the hardware supports IEEE80211_HW_SUPPORTS_CQM. For unsupported hardware, currently -EOPNOTSUPP is returned, so the mac80211 is currently not doing connection quality monitoring on the host. This could be added later, if needed. Signed-off-by: Juuso Oikarinen Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit d6dc1a386358979e12366d1f35eeb68fc181e101 Author: Juuso Oikarinen Date: Tue Mar 23 09:02:33 2010 +0200 cfg80211: Add connection quality monitoring support to nl80211 Add support for basic configuration of a connection quality monitoring to the nl80211 interface, and basic support for notifying about triggered monitoring events. Via this interface a user-space connection manager may configure and receive pre-warning events of deteriorating WLAN connection quality, and start preparing for roaming in advance, before the connection is already lost. An example usage of such a trigger is starting scanning for nearby AP's in an attempt to find one with better connection quality, and associate to it before the connection characteristics of the existing connection become too bad or the association is even lost, leading in a prolonged delay in connectivity. The interface currently supports only RSSI, but it could be later extended to include other parameters, such as signal-to-noise ratio, if need for that arises. Signed-off-by: Juuso Oikarinen Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 921ca03c8f8e982f27fc406bc301caf2196b99f7 Author: Amitkumar Karwar Date: Thu Feb 25 17:16:36 2010 -0800 libertas: add auto auth mode feature Auto auth mode is enabled by default. If user doesn't specify the auth mode, while association driver will first try with open mode and then with shared key mode. If user specifies an auth mode, auto auth is disabled and driver will not try association with another auth mode. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit a5990ea1254cd186b38744507aeec3136a0c1c95 Author: Li Zefan Date: Thu Mar 11 14:08:10 2010 -0800 sunrpc/cache: fix module refcnt leak in a failure path Don't forget to release the module refcnt if seq_open() returns failure. Signed-off-by: Li Zefan Cc: J. Bruce Fields Cc: Neil Brown Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: J. Bruce Fields commit e1572c5eeca8ef87a250322364584458b2dadb35 Author: Sujith Date: Wed Mar 24 13:42:13 2010 +0530 ath9k_htc: Fix symbol collision with ath9k Signed-off-by: Sujith Signed-off-by: John W. Linville commit 92d6b71ab906be706f3679353b30a8d2c3831144 Author: Dimitri Sivanich Date: Thu Mar 11 14:08:56 2010 -0800 genirq: Expose irq_desc->node in proc/irq Expose irq_desc->node as /proc/irq/*/node. This file provides device hardware locality information for apps desiring to include hardware locality in irq mapping decisions. Signed-off-by: Dimitri Sivanich Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 10ea76cc25b6738eb2f7c58b3312e1ebc61f753e Author: Kuninori Morimoto Date: Tue Mar 23 11:47:54 2010 +0900 ASoC: fsi: IRQ related process had be united Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit feb58cffca772097a849b413fb7954f87e9e9e71 Author: Kuninori Morimoto Date: Wed Mar 24 15:27:24 2010 +0900 ASoC: fsi: ensures process inside master lock Bit operation for fsi_master should be done inside master lock. But soft-reset/interrupt operation were outside of it. This patch modify this problem. It still allow to INT_ST outside-operation on fsi_interrupt, but it is not problem. Because this register doesn't need the bit operation. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5cfc8ee0bb5134e1204e1ec5843e164f24315021 Author: John Stultz Date: Wed Mar 24 00:22:36 2010 +0000 ARM: convert arm to arch_gettimeoffset() Convert arm to use GENERIC_TIME via the arch_getoffset() infrastructure, reducing the amount of arch specific code we need to maintain. The arm architecture is the last arch that need to be converted. Signed-off-by: John Stultz Signed-off-by: Russell King Cc: Andrew Morton commit e51d739ab79110c43ca03daf3ddb3c52dadd38b7 Author: Tom Herbert Date: Tue Mar 23 13:39:19 2010 +0000 net: Fix locking in flush_backlog Need to take spinlocks when dequeuing from input_pkt_queue in flush_backlog. Also, flush_backlog can now be called directly from netdev_run_todo. Signed-off-by: Tom Herbert Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit f722377bfa869c9c1abeca88266bb4cfd3a5d06d Author: Thomas Weber Date: Tue Mar 23 19:50:16 2010 +0100 i2c: twl.h: Fix comment typos and tab Fix typo in comments: - contollable => controllable - uniqe => unique Replace tab with whitespace in defines. Signed-off-by: Thomas Weber Signed-off-by: Jiri Kosina commit c5a079f46aabff026b2acaba0a2579a74c3c3731 Author: Daniel Ngu Date: Tue Mar 23 00:52:44 2010 +1300 drivers/net/wireless/b43/main.c:4351: Fixed coding style WARNING: braces {} are not necessary for any arm of this statement Signed-off-by: Daniel Ngu Signed-off-by: John W. Linville commit 1e4dcd012423b6a28f968a55886d2b27896a1586 Author: Juuso Oikarinen Date: Fri Mar 19 07:14:53 2010 +0200 mac80211: Add support for connection monitor in hardware This patch is based on a RFC patch by Kalle Valo. The wl1271 has a feature which handles the connection monitor logic in hardware, basically sending periodically nullfunc frames and reporting to the host if AP is lost, after attempting to recover by sending probe-requests to the AP. Add support to mac80211 by adding a new flag IEEE80211_HW_CONNECTION_MONITOR which prevents conn_mon_timer from triggering during idle periods, and prevents sending probe-requests to the AP if beacon-loss is indicated by the hardware. Cc: Kalle Valo Signed-off-by: Juuso Oikarinen Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 43ead78ac48b75aaf47de96fcf10cbf5962f32a6 Author: Joe Perches Date: Thu Mar 18 18:29:40 2010 -0700 drivers/net/wireless/ray_cs.c: Use iw_handler function prototypes Change local functions that are cast to iw_handler to the more standard use with "union iwreq_data *wrqu" so the iw_handler array no longer needs the casts. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit adc009e2e76b222006beb7f9df6d0aee051509d2 Author: Joe Perches Date: Thu Mar 18 18:29:39 2010 -0700 orinoco/wext.c: Remove local #define STD_IW_HANDLER Use IW_HANDLER from wireless.h instead Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 56b632e8cc7a13cece861d890deb2843116f9372 Author: Joe Perches Date: Thu Mar 18 18:29:38 2010 -0700 drivers/net: Remove local #define IW_IOCTL, use IW_HANDLER Use #define IW_HANDLER from wireless.h instead Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 270020e85ec88a832d663fff4489523169641c2b Author: Joe Perches Date: Thu Mar 18 18:29:37 2010 -0700 drivers/net/wireless: Use IW_HANDLER macro Convert direct uses of [ (foo - SIOCIWFIRST) , fn) Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 76326f1d4c98fe01daf363e3d07f84bafed1feec Author: Joe Perches Date: Thu Mar 18 18:29:36 2010 -0700 net/wireless/wext-core.c: Use IW_EVENT_IDX macro There's a wireless.h macro for this, might as well use it. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 44608f801283f0f69d8a04d9976837748e410084 Author: Joe Perches Date: Thu Mar 18 18:29:35 2010 -0700 net/wireless/wext_core.c: Use IW_IOCTL_IDX macro There's a wireless.h macro for this, might as well use it. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 2ae2332ed11687325096e68e326ec57f0294cff9 Author: Joe Perches Date: Thu Mar 18 18:29:33 2010 -0700 wireless.h: Use SIOCIWFIRST not SIOCSIWCOMMIT for range check These two #defines use the same value, but SIOCIWFIRST makes more sense in this use. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit f6e0bb56d43d1f3b2ad54d51b65c07ef3bdead16 Author: Joe Perches Date: Thu Mar 18 18:29:32 2010 -0700 include/linux/wireless.h: Add IW_HANDLER macro to initialize array entry Copied the idea from orinoco Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 3b56dd6a090e905eece023f690298013da4b6b67 Author: Teemu Paasikivi Date: Thu Mar 18 12:26:46 2010 +0200 wl1271: Changed platform_device to be dynamically allocated Changed platform_device to be allocated dynamically from the wl1271_alloc_hw function. Also cleaned up error handling in the wl1271_alloc_hw function and module probe functions. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 2ea9fb3d79aac371e5bb0c4b0f5be7195e8fcd33 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:45 2010 +0200 wl1271: Remove circular interlocking related to the inetaddr notifier chain Removing the wl1271 from the inet addr notifier chain sometimes causes the registered handler to be called - causing locking problems if the removing function is called from within the mutex. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a0cb7be4f4fa765dcfa82675811cd7e7713b5610 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:44 2010 +0200 wl1271: Don't generate null func template for ad-hoc The null func template is not needed for ad-hoc, and it's generation is not supported for ad-hoc (mac80211 will WARN about it.) Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 14b228a0d4234e4a2d4e683052da78760e8abf0f Author: Juuso Oikarinen Date: Thu Mar 18 12:26:43 2010 +0200 wl1271: Update filters properly This patch adds support for the filters configured by the mac80211 stack. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 801a673ed1b36fc0e7dd92d8bb0090a4dc26a7d0 Author: Teemu Paasikivi Date: Thu Mar 18 12:26:42 2010 +0200 wl1271: Removed duplicate code from module remove function. Removed duplicate code from wl1271_sdio module remove function. For freeing stuff in the remove function wl1271_free_hw function is now used. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a3b8ea7554862e80a14b83233b37ddd2506d1d70 Author: Teemu Paasikivi Date: Thu Mar 18 12:26:41 2010 +0200 wl1271: Added DEBUG_SDIO flag Added separate flag for SDIO debugging. Previously it has used DEBUG_SPI flag. This patch also includes couple indentation fixes. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit c76a0d6c9357d3e6ac32793b89a0a303966e1c4c Author: Juuso Oikarinen Date: Thu Mar 18 12:26:40 2010 +0200 wl1271: Remove deprecated interface config function It's no longer needed. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 1b72aecd950c4c3cec2d66dbe5436c9e25a487b7 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:39 2010 +0200 wl1271: Fix MAC address handling This patch fixes MAC address handling. To achieve this, firmware booting had to be delayed from the previous op_start to op_add_interface, which is the point when the driver gets to know the configured MAC address. As the wl1271 only supports one virtual interface, this even seems quite logical. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 4695dc917d9ec7a38cb4f91fceb2b78aaec1f945 Author: Kalle Valo Date: Thu Mar 18 12:26:38 2010 +0200 wl1271: enable U-APSD wl1271 supports U-APSD similarly as wl1251, so let's enable it. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 522ac25048676b2141d0560841654323339c0cbb Author: Kalle Valo Date: Thu Mar 18 12:26:37 2010 +0200 wl1271: fix ps scheme in wl1271_op_conf_tx() Commit "wl1271: implement WMM" accidentally used CONF_PS_SCHEME_LEGACY_PSPOLL, but instead CONF_PS_SCHEME_LEGACY should be used as earlier. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 023e082609ba3225dbd5c33933a90156d2201d7f Author: Kalle Valo Date: Thu Mar 18 12:26:36 2010 +0200 wl1271: create qos nullfunc template Needed for U-APSD. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 818e3063a9546fcd826155dd47582a6e2f4d1c37 Author: Kalle Valo Date: Thu Mar 18 12:26:35 2010 +0200 wl1271: get probe request template from mac80211 If we get probe request from mac80211, we can remove two functions. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 899e6e65c39990a76c17940625dbe6001f618734 Author: Kalle Valo Date: Thu Mar 18 12:26:34 2010 +0200 wl1271: get pspoll and nullfunc templates from mac80211 mac80211 now can create pspoll and nullfunc templates, better to use those. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 12bd89499f22ec01bbff21fd04a347ee82726bf6 Author: Kalle Valo Date: Thu Mar 18 12:26:33 2010 +0200 wl1271: enable WMM Everything is ready now and we can enable WMM in wl1271. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 7fc3a8647d2eaa8bc2f7ac7e9baff55199da7be6 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:32 2010 +0200 wl1271: Add sysfs file to control BT co-ex state Add a sysfs file to control the state of the BT co-ex (enable or disable it.) By default, the BT co-ex is enabled. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit a1dd8187d8d8f565976c9e55374dee520cdc2fa3 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:31 2010 +0200 wl1271: Move platform device registration from _spi to _main In order to get the platform device for both SPI and SDIO, move the platform device registration to wl1271_main.c from wl1271_spi.c. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 1b00f546fc4271d94c1bccb1955ce64d9ace1000 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:30 2010 +0200 wl1271: Add proper WLAN-BT co-ex configuration, and enable co-ex. Add configuration values for the varous WLAN-BT co-ex configuration parameters, and finally enable WLAN-BT co-ex. Based on preliminary measurements, it appears the co-ex feature is not increasing WLAN power consumption, if BT is not activated. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 885c9907440947a4f50d4c7a93b1a45266b00b84 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:29 2010 +0200 wl1271: Fix SG configuration message structures The bluetooth coexistence (SG) configuration messages have changed and were completely wrong. For instance, intending to enable the SG, it was instead disabled. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 93f56be146a7be4d3243fc64d9b6313d96eaa62b Author: Teemu Paasikivi Date: Thu Mar 18 12:26:28 2010 +0200 wl1271: Changed SDIO MMC host claiming Changed driver to keep MMC host claimed while wlan interface is up. This keeps MMC stack from powering the SDIO device down. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit becd551cac0d6868819083c59fc32d1072ba1804 Author: Teemu Paasikivi Date: Thu Mar 18 12:26:27 2010 +0200 wl1271: Cleaned up wlan power on/off functions Added method for wlan power control to io_ops struct and moved wl1271_power_on and wl1271_power_off functions to wl1271_io.h. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit b43316dbf9c6b01f3ac6dc23bcb94ae66eb3a721 Author: Juuso Oikarinen Date: Thu Mar 18 12:26:26 2010 +0200 wl1271: Fix configuration of the TX opportunity value The per-queue TX opportunity value is configured by the mac80211 in units of 32us. The firmware however wants it in us, so add the conversion. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit fb9987d0f748c983bb795a86f47522313f701a08 Author: Sujith Date: Wed Mar 17 14:25:25 2010 +0530 ath9k_htc: Support for AR9271 chipset. Features: * Station mode * IBSS mode * Monitor mode * Legacy support * HT support * TX/RX 11n Aggregation * HW encryption * LED * Suspend/Resume For more information: http://wireless.kernel.org/en/users/Drivers/ath9k_htc Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 736b3a27b3c50c4a23717b802240435a69e8d0ff Author: Sujith Date: Wed Mar 17 14:25:24 2010 +0530 ath9k_hw: fix hardware deinit Without this you will get a panic if the device initialization fails. Also, free ath_hw instance properly. ath9k_hw_deinit() shouldn't do it. Cc: stable@kernel.org Signed-off-by: Sujith Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 05020d236e91ddab1cb42483843a8995b3be1adf Author: Sujith Date: Wed Mar 17 14:25:23 2010 +0530 ath9k_hw: add HTC init hardware call for special resets for AR9271 AR9271 needs a full reset only upon the first reset, add a call for the driver to enable these special resets. We can optimize this out later without an export. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 25e2ab17fd77e752597050980cec4efae7f87854 Author: Sujith Date: Wed Mar 17 14:25:22 2010 +0530 ath9k_hw: always set the core clock for AR9271 When initializing the PLL on AR9271 we always need to set the core clock to 117MHz. While at it remove the baud rate settings for the serial device on the AR9271, the default settings work well unless you want to customize it. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 02afa2a01b74ed3e8f3a85be11919b33f4ad4f02 Author: Sujith Date: Wed Mar 17 14:25:21 2010 +0530 ath9k_hw: use the skip count for PA calibration on AR9271 Periodic power amplifier offset calibration is skipped on ath9k algorithmically, this is required on AR9271. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 2cbfaea48500ce98588e31bd806bbfb524b36b31 Author: Sujith Date: Wed Mar 17 14:25:20 2010 +0530 ath9k_hw: restrict valid nf readings for AR9271 to -114 Noisefloor values read on AR9271 are unreliable if they are less than -114, set those statically to -116. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 6398dc039d92b12805a900b3f82a033007a5b465 Author: Sujith Date: Wed Mar 17 14:25:19 2010 +0530 ath9k_hw: fix noisefloor history buffer usage on AR9271 Noisefloor calibration involves querying hardware for samples and storing this information on a history buffer in hardware for actual noisefloor calibration processing in hardware. The history buffer supports collecting information for all Atheros hardware, one history buffer slot for each chain on each channel used for MIMO operation. For current hardware this means one history buffer slot for each chain on both the control (or primary) channel and the extension (or secondary) channel. We know which noisefloor registers to poke for collecting noisefloor data through the chainmask. For AR9285 and AR9271 devices, both 1x1, the chaimmask is defined as 0x9 = 0b0001001. The first four bits represent each chain out of a maximum of 4 chains [0-3] on the primary channel. The last four bits represent each chain on the extension channel. A chainmask of 0x9 therefore indicates chain 1 is active on both the primary and the extension channel. AR9271 only requires collecting and storing noisefloor history buffer data for the first chain on both the control and extension channel (nfarray[0] and nfarray[3]) so fix the code and avoid which reads and writes to the history buffer for the other chains. Since the noisefloor varies depending on the number of chains your device supports also initialize the noisefloor history buffer with reasonable values seen on 1x1 devices such as AR9285. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 14b3af381df6359b15416df350e4e11892a52ab3 Author: Sujith Date: Wed Mar 17 14:25:18 2010 +0530 ath9k_hw: Fix full sleep setup for AR9271 After telling the AR9271 to go into full sleep we do not need to clear the RTC reset signal. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e492d7cfdbb49f364529bc1642b978d85654c398 Author: Sujith Date: Wed Mar 17 14:25:17 2010 +0530 ath9k_hw: fix TX descriptor setup for AR9271 The TX descriptors setup for AR971 requires the same setup as AR9285, so use that. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 527d485fd8765e1df1dd9114f5c623253d6349c3 Author: Sujith Date: Wed Mar 17 14:25:16 2010 +0530 ath9k_hw: skip chip tests for AR9271 The chip test is not required for AR9271 on the host driver code as the firmware will do the test internally on its own. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5b5fa3558db7451f4744ef92f2b1830d05b9307b Author: Sujith Date: Wed Mar 17 14:25:15 2010 +0530 ath9k_hw: add GPIO setup code for AR9271 Assign the proper number of GPIO pins for AR9271. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 70807e99dbb0c5847668b617caf0ad7f876a23d9 Author: Sujith Date: Wed Mar 17 14:25:14 2010 +0530 ath9k_hw: update initialization values for AR9271 Update the register initialization values for AR9271. This is based on our last review from our systems team. Signed-off-by: Sujith Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e21247cc4a37296f57281a472e961ff09de0e98d Author: Ming Lei Date: Mon Mar 1 23:13:29 2010 +0800 ath9k: decrease size of ath9k.ko From e74b075cdb143d45be9b371ee8a8e2dcfc15ab34 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Sat, 27 Feb 2010 23:50:54 +0800 Subject: [PATCH] ath9k: decrease size of ath9k.ko The patch defines the fields of 'valid_single_stream' and 'valid' in struct ath_rate_table as char type, so decrease the size of ath9k.ko about 2KB. old ath9k.ko [tom@tom-lei ath9k]$ size ath9k.ko text data bss dec hex filename 69344 3080 168 72592 11b90 ath9k.ko new ath9k.ko [tom@tom-lei ath9k]$ size ath9k.ko text data bss dec hex filename 67304 3080 168 70552 11398 ath9k.ko Signed-off-by: Larry Finger Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit d82689e249266d64cd37429c9e1ff6346e5446ab Merge: 819bfec fa8f130 Author: John W. Linville Date: Tue Mar 23 16:46:43 2010 -0400 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit ec43b1a64a132303a6800c781bc17c683aedc55b Author: Sathya Perla Date: Mon Mar 22 20:41:34 2010 +0000 be2net: fix unmap_single/page() called incorrectly in Tx compl processing The first wrb seen by tx compl processing does not have a dma handle in it. Currently, pci_unmap_single() is attempted on this wrb and pci_unmap_page() on the rest. So, pci_unmap_page() gets incorrectly called on the dma hdl of skb->data (that was mapped using map_single()). This patch fixes this issue. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 7101e111217581a36e2eeae7c4a3815d60673cbc Author: Sathya Perla Date: Mon Mar 22 20:41:12 2010 +0000 be2net: handle dma mapping errors in Tx path Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 88978e562302c836c1c4597700c79d971e93abc0 Author: Arnaldo Carvalho de Melo Date: Tue Mar 23 14:33:58 2010 -0300 perf archive: Explain how to use the generated tarball [root@doppio ~]# perf archive Now please run: $ tar xvf perf.data.tar.bz2 -C ~/.debug wherever you need to run 'perf report' on. [root@doppio ~]# Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269365638-10223-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ae76148114aa2457baa0d340fc506bb7d114cb12 Author: Bernhard Urban Date: Tue Mar 23 04:12:38 2010 +0100 ALSA: aureon - Patch for suspend/resume for Terratec Aureon cards. Add proper suspend/resume code for Terratec Aureon cards. Based on ice1724 suspend/resume work of Igor Chernyshev. Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4944 Tested on linux-2.6.32.9 Signed-off-by: Bernhard Urban Signed-off-by: Takashi Iwai commit 3d0205bd1383aa3cac93c209b7c7d03b27930195 Author: John Stultz Date: Thu Mar 18 20:19:28 2010 -0700 ntp: Remove tickadj There are zero users of tickadj. So remove it. Signed-off-by: John Stultz LKML-Reference: <1268968769-19209-2-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit e1292ba164742e3a236e407148e00300b7196906 Author: John Stultz Date: Thu Mar 18 20:19:27 2010 -0700 ntp: Make time_adjust static Now that no arches are accessing time_adjust directly, make it static. Signed-off-by: John Stultz LKML-Reference: <1268968769-19209-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 85ae01b2da0ed606a2e8d840aadef90fd30220a1 Merge: 6407d47 306ff3e Author: Takashi Iwai Date: Tue Mar 23 14:56:33 2010 +0100 Merge remote branch 'alsa/devel' into topic/usb commit 1ad747ca9b6f97f895e0a6ccd447b158aeaa568d Author: Kuninori Morimoto Date: Tue Mar 23 16:27:38 2010 +0900 ASoC: ak4642: Add enhanced sampling rate Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0643ce8f42e763635d8d6cf311730a6e84d4be92 Author: Kuninori Morimoto Date: Mon Mar 15 18:10:50 2010 +0900 ASoC: ak4642: Add set_fmt function for snd_soc_dai_ops Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4b6316b4b16c7fb5d51df43f0371416e054e7102 Author: Kuninori Morimoto Date: Tue Mar 23 16:27:28 2010 +0900 ASoC: ak4642: Add pll select support Current ak4642 was not able to select pll. This patch add support it. It still expect PLL base input pin is MCKI. see Table 5 "setting of PLL Mode" of datasheet Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 778a76e2dbdb896d005849e9e74518d6aba85671 Author: Mark Brown Date: Mon Mar 22 22:05:10 2010 +0000 ASoC: Implement WM8994 DAI tristate support This also adds the first DAI operation for AIF3 so fill out the ID and the ops for that too. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 306ff3e473a970f88680e8355c0900fcab0357e2 Author: Clemens Ladisch Date: Mon Mar 22 15:12:07 2010 +0100 ALSA: ua101: remove experimental status Now that the EHCI driver copes with small iso packets without blowing up, take the snd-ua101 driver out of the alpha-test stage. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit 3089f381fbaf53560dcbcb4aef6ef17fe44e347c Author: Guennadi Liakhovetski Date: Fri Mar 19 13:53:04 2010 +0000 SH: extend SCI DMA support to work on SCIFA ports SCIFA ports have additional bits to control DMA requests and they must have respective interrupt sources enabled, as the datasheet suggests, the only way to avoid actually taking interrupts in addition to DMA events is by masking the IRQ on the CPU. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit b2623a61cfd3c6badb8396dc85ab5a70f4a05f61 Author: Magnus Damm Date: Fri Mar 19 04:47:10 2010 +0000 dmaengine: shdma: Introduce include/linux/sh_dma.h Create a common platform data header file for the shdma dmaengine driver. This is done by moving common structures from sh asm/dmaengine.h to linux/sh_dma.h. DMA registers are also copied from sh asm/dma-register.h to make the code architecture independent. The sh header file asm/dmaengine.h is still kept with the slave id enum. This allows us to keep the old processor specific code as is and slowly move over to slave id enums in per-processor headers. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f354a38175f5219146f4675dca770e114cf3c502 Author: Magnus Damm Date: Fri Mar 19 04:47:01 2010 +0000 serial: sh-sci: Use sg_dma_len() and sg_dma_address() Convert the dmaengine code in sh-sci.c from directly accessing the struct scatterlist members length, dma_length and dma_address to using the macros sg_dma_len() and sg_dma_address(). Makes the code build for ARM. Signed-off-by: Magnus Damm Acked-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 02ca5083f60521d09f13224596564a405108bc4c Author: Magnus Damm Date: Fri Mar 19 04:46:47 2010 +0000 dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER Move SHDMA_SLAVE_NUMBER from asm/dmaengine.h to shdma.h. Set it to 256 to support a wide range of processors. The amount of memory consumed by this change is limited to 256 bits. While at it, rename to SH_DMA_SLAVE_NUMBER to match with the rest of the file. Signed-off-by: Magnus Damm Acked-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 4bab9d426e6dbd9ea09330919a33d35d5faab400 Author: Magnus Damm Date: Fri Mar 19 04:46:38 2010 +0000 dmaengine: shdma: Remove sh_dmae_slave_chan_id enum This patch replaces the sh_dmae_slave_chan_id enum with an unsigned int. The purpose of this chainge is to make it possible to separate the slave id enums from the dmaengine header. The slave id enums varies with processor model, so in the future it makes sense to put these in the processor specific headers together with the pinmux enums. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7316ae88c43d47f6503f4c29b4973204e33c3411 Author: Tom Goff Date: Fri Mar 19 15:40:13 2010 +0000 net_sched: make traffic control network namespace aware Mostly minor changes to add a net argument to various functions and remove initial network namespace checks. Make /proc/net/psched per network namespace. Signed-off-by: Tom Goff Signed-off-by: David S. Miller commit 300bc0602489d9f09f7b548f790afd2952f6070b Author: Joe Perches Date: Mon Mar 22 20:08:04 2010 -0700 ixgbevf: Message formatting fixup Commit 29b8dd024bd48c3d1d1e5140f5bbb683786f998e left a trailing ", " after a message. Fix it and make the text used a bit smaller when DEBUG is #defined Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 38013262c2c815fa404fa9f42dbc958c616fb385 Author: Dan Carpenter Date: Mon Mar 22 02:11:45 2010 +0000 korina: use resource_size() This size calculation is wrong. It should be end - start + 1. Use resource_size() to calculate it correctly. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 3e4aa12f8a81506c44f04b4f0eb7663981c5a282 Author: Jiri Pirko Date: Mon Mar 22 03:21:39 2010 +0000 ipoib: remove addrlen check for mc addresses Finally this bit can be removed. Currently, after the bonding driver is changed/fixed (32a806c194ea112cfab00f558482dd97bee5e44e net-next-2.6), that's not possible for an addr with different length than dev->addr_len to be present in list. Removing this check as in new mc_list there will be no addrlen in the record. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 664ffe80c0df5ad2576420ed2e6bd75cc704ba3a Author: Dan Carpenter Date: Mon Mar 22 02:07:28 2010 +0000 ewrk3: range checking problem The range checking here is wrong. It should be HASH_TABLE_LEN which is 512. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit ecbacf8da78d9312e3ef5ccdbbbd547267092941 Author: Amerigo Wang Date: Sun Mar 21 23:59:23 2010 +0000 netconsole: do not depend on experimental Nowadays, most distributions enable netconsole by default, including RHEL, Fedora, Debian, Arch, Opensuse. And we don't have any bug reports about it. So I think there is no need to mark it as experimental any more. Cc: David S. Miller Signed-off-by: WANG Cong Acked-by: Neil Horman Acked-by: Matt Mackall Signed-off-by: David S. Miller commit 7c5365bca33194092e0a094b34b268283022a1a1 Author: Dan Carpenter Date: Mon Mar 22 02:11:11 2010 +0000 stmmac: use resource_size() The size calculation is not correct. It should be end - start + 1. Use resource_size() to calculate it instead. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit d2ba2ed8fe3aa796a671a6922119d7171bb49515 Author: Alexander Duyck Date: Mon Mar 22 14:08:06 2010 +0000 igb: add support for Intel I350 Gigabit Network Connection This patch adds support for the the I350 Gigabit network connection which is the follow-on part to the 82580. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher CC: James Hearn Signed-off-by: David S. Miller commit 52a1dd4d15cc28da5d3e9bfb1526c314d65fdff8 Author: Alexander Duyck Date: Mon Mar 22 14:07:46 2010 +0000 igb: cleanup usage of virtualization registers The igb driver was incorrectly attempting to write to registers that do not exist on 82580 hardware. This wasn't causing any issues that I can tell, but it is not recommended behavior either so I have changed this so we are determining which registers to write to based on mac type. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 411f557c3accbaa1e2b378d29aeaffffbec39ccc Author: Alexander Duyck Date: Mon Mar 22 14:07:26 2010 +0000 igb: Do not overwrite mdicnfg register when accessing 82580 phy This change removes the extra configuration we were doing on the mdicnfg register which should be set by EEPROM and which we should not need to write again afterwards. This code was a holdover from some earlier development work that was being done on a board with an incomplete EEPROM and is no longer needed now that the production EEPROMs are in place. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 33e2bf6aa16061bae1253514e7c32af27d2b4b31 Merge: e880eb6 819bfec Author: David S. Miller Date: Mon Mar 22 18:15:15 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ath5k/phy.c commit e880eb6c5c9d98e389ffc0d8947f75d70785361a Author: Tom Herbert Date: Mon Mar 22 18:06:47 2010 -0700 rps: Fix build with CONFIG_SYSFS enabled Fix build with CONFIG_SYSFS not enabled. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 4ded2b250f1fbba4e414d17dc55ee513485c0aa1 Author: Arnaldo Carvalho de Melo Date: Mon Mar 22 17:52:49 2010 -0300 perf report: Implement Newt callgraphs Starts collapsed, allows annotating by pressing 'A' or 'a' on the symbol, be it the top level one or any of the symbols in the chains. It (ab)uses the only tree widget in newt, that is actually a checkbox tree that we use with just one option ('.'), end result is usable but we really need to create a custom widget tree so that we can use the data structures we have (hist_entry rb_tree + callchain rb_tree + lists), so that we reduce the memory footprint by not creating a mirror set of data structures in the newtCheckboxTree widget. Thanks to Frédéric Weisbacker for fixing the orphanage problem in 301fde2, without that we were tripping a newt bug (fix already sent to newt's maintainer). Signed-off-by: Arnaldo Carvalho de Melo Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269291169-29820-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 91885258e8343bb65c08f668d7e6c16563eb4284 Author: Jeff Layton Date: Fri Mar 19 08:06:28 2010 -0400 nfsd: don't break lease while servicing a COMMIT This is the second attempt to fix the problem whereby a COMMIT call causes a lease break and triggers a possible deadlock. The problem is that nfsd attempts to break a lease on a COMMIT call. This triggers a delegation recall if the lease is held for a delegation. If the client is the one holding the delegation and it's the same one on which it's issuing the COMMIT, then it can't return that delegation until the COMMIT is complete. But, nfsd won't complete the COMMIT until the delegation is returned. The client and server are essentially deadlocked until the state is marked bad (due to the client not responding on the callback channel). The first patch attempted to deal with this by eliminating the open of the file altogether and simply had nfsd_commit pass a NULL file pointer to the vfs_fsync_range. That would conflict with some work in progress by Christoph Hellwig to clean up the fsync interface, so this patch takes a different approach. This declares a new NFSD_MAY_NOT_BREAK_LEASE access flag that indicates to nfsd_open that it should not break any leases when opening the file, and has nfsd_commit set that flag on the nfsd_open call. For now, this patch leaves nfsd_commit opening the file with write access since I'm not clear on what sort of access would be more appropriate. Signed-off-by: Jeff Layton Cc: stable@kernel.org Signed-off-by: J. Bruce Fields commit 478b0973bf8c90db3677fbb8d812e2bdefc43d9b Author: Arnaldo Carvalho de Melo Date: Mon Mar 22 13:10:29 2010 -0300 perf tools: Exit browser before printing usage when unkown option passed If not the screen will get garbled when using newt. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269274229-20442-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 084ab9f862416b2ddb4bb9804884de19bf09774d Author: Arnaldo Carvalho de Melo Date: Mon Mar 22 13:10:28 2010 -0300 perf stat: Better report failure to collect system wide stats Before: [acme@doppio linux-2.6-tip]$ perf stat -a sleep 1s Performance counter stats for 'sleep 1s': task-clock-msecs context-switches CPU-migrations page-faults cycles instructions branches branch-misses cache-references cache-misses 1.016998463 seconds time elapsed [acme@doppio linux-2.6-tip]$ Now: [acme@doppio linux-2.6-tip]$ perf stat -a sleep 1s No permission to collect system-wide stats. Consider tweaking /proc/sys/kernel/perf_event_paranoid. [acme@doppio linux-2.6-tip]$ Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269274229-20442-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit ca721e45b39209415d2288dbac3667b26d9d1def Author: Masami Hiramatsu Date: Mon Mar 22 13:10:27 2010 -0300 perf probe: Add NO_DWARF make option Add NO_DWARF make option for testing build without libdw. Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <1269274229-20442-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 4b4da7f76660ea8b5aa45615165c48f62167ffa8 Author: Masami Hiramatsu Date: Mon Mar 22 13:10:26 2010 -0300 perf probe: Cleanup debuginfo related code Cleanup debuginfo related code to eliminate fragile code which pointed by Ingo (Thanks!). 1) Invert logic of NO_DWARF_SUPPORT to DWARF_SUPPORT. 2) For removing assymetric/local variable ifdefs, introduce more helper functions. 3) Change options order to reduce the number of ifdefs. Reported-by: Ingo Molnar Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <1269274229-20442-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f3a1f0ea9432ec395cd112f42201e8e523c07bc5 Author: Arnaldo Carvalho de Melo Date: Mon Mar 22 13:10:25 2010 -0300 perf newt: Properly restore the screen when error exiting Show an OK message box with the last message sent via pr_err, etc. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1269274229-20442-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 301fde27c7fcd0380b02b175d547e894ff65d78a Author: Frederic Weisbecker Date: Mon Mar 22 13:09:33 2010 -0300 perf: Fix orphan callchain branches Callchains have markers inside their capture to tell we enter a context (kernel, user, ...). Those are not displayed in the callchains but they are incidentally an active part of the radix tree where callchains are stored, just like any other address. If we have the two following callchains: addr1 -> addr2 -> user context -> addr3 addr1 -> addr2 -> user context -> addr4 addr1 -> addr2 -> addr 5 This is pretty common if addr1 and addr2 are part of an interrupt path, addr3 and addr4 are user addresses and addr5 is a kernel non interrupt path. This will be stored as follows in the tree: addr1 addr2 / \ / addr5 user context / \ addr3 addr4 But we ignore the context markers in the report, hence the addr3 and addr4 will appear as orphan branches: |--28.30%-- hrtimer_interrupt | smp_apic_timer_interrupt | apic_timer_interrupt | | <------------- here, no parent! | | | | | |--11.11%-- 0x7fae7bccb875 | | | | | |--11.11%-- 0xffffffffff60013b | | | | | |--11.11%-- __pthread_mutex_lock_internal | | | | | |--11.11%-- __errno_location Fix this by removing the context markers when we process the callchains to the tree. Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Frederic Weisbecker Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1269274173-20328-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d2f1e15b661e71fd52111f51c99a6ce41384e9ef Merge: 40b7e05 220bf99 Author: Ingo Molnar Date: Mon Mar 22 18:46:57 2010 +0100 Merge commit 'v2.6.34-rc2' into perf/core Merge reason: Pick up latest perf fixes from upstream. Signed-off-by: Ingo Molnar commit 74511020dde10252f8b8e648690d99dba721de14 Merge: 6926686 3cc4e53 Author: Mark Brown Date: Mon Mar 22 17:23:46 2010 +0000 Merge branch 'for-2.6.34' into for-2.6.35 commit 69266866a5790080d7fe80094b28d670ff8aa765 Author: Mark Brown Date: Mon Mar 22 16:37:01 2010 +0000 ASoC: Allow WM8903 mic detect disable and don't force bias on Don't force enable the microphone bias on WM8903 when doing jack detection, and don't force enable microphone bias. This allows platforms to only enable microphone detection when a jack has been inserted. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit f06bce9c8c54354ea4ff96852bd92e10204c8cfb Author: Mark Brown Date: Mon Mar 22 15:30:30 2010 +0000 ASoC: Allow disabling of WM835x jack detection If no report is specified then disable detection. Note that we don't disable the slow clock, though the power consumption from it should be negligable. That should be reference counted, ideally through DAPM. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 2f14430af52fff08ed1987a3cee612e133a6b82f Author: Mark Brown Date: Mon Mar 22 13:48:36 2010 +0000 ASoC: Move WM8350 microphone detection bias managment out of driver Allow machines to control exactly when the bias is turned on and off. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 5b9e87ccccf77f46c006c2cf0988a66d0f3f310d Author: Mark Brown Date: Mon Mar 22 13:36:13 2010 +0000 ASoC: Allow force enabled pins to be disabled Some systems, such as those with mechanical jack detection, may wish to force enable a pin (typically mic bias) only some of the time. Support such systems by having disable_pin() also coveer force enabled pins. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d5021ec9fc32edc6f512c2375923d757e9825f6a Author: Mark Brown Date: Mon Mar 22 12:06:30 2010 +0000 ASoC: Add a notifier for jack status changes Some systems provide both mechanical and electrical detection of jack status changes. On such systems power savings can be achieved by only enabling the electrical detection methods when physical insertion has been detected. Begin supporting such systems by providing a notifier for jack status changes which can be used to trigger any reconfiguration. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 70f60a220b33832ae4e2622b913f138892b6fe7b Author: Frank Blaschka Date: Mon Mar 22 09:59:48 2010 -0700 qeth: l3 fix build error in ipv6 addr list handling Adapt qeth l3 to: commit c2e21293c054817c42eb5fa9c613d2ad51954136 (ipv6: convert addrconf list to hlist) converted lst_next member of inet6_ifaddr struct to a hlist. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit c96907f21f26a1f8c1a1a9096a22500e4d158c4f Author: Peter Ujfalusi Date: Mon Mar 22 17:46:37 2010 +0200 ASoC: TWL4030: PM fix for output amplifiers Gain controls on outputs affect the power consumption when the gain is set to non 0 value. Outputs with amps have one register to configure the routing and the gain: PREDL_CTL (0x25): bit 0: Voice enable bit 1: Audio L1 enable bit 2: Audio L2 enable bit 3: Audio R2 enable bit 4-5: Gain (0x0 - power down, 0x1 - 6dB, 0x2 - 0dB, 0x3 - -6dB) bit 0 - 3: is handled in DAPM domain (DAPM_MIXER) bit 4 - 5: has simple volume control If there is no audio activity (BIAS_STANDBY), and user changes the volume, than the output amplifier will be enabled. If the user changes the routing (but the codec remains in BIAS_STANDBY), than the cached gain value also be written to the register, which enables the amplifier. The existing workaround for this is to have virtual PGAs associated with the outputs, and whit DAPM PMD the gain on the output will be forced to 0 (off) by bypassing the regcache. This failed to disable the amplifiers in several scenario (as mentioned above). Also if the codec is in BIAS_ON state, and user modifies a volume control, which path is actually not enabled, than that amplifier will be enabled as well, but it will be not turned off, since there is no DAPM path, which would make mute it. To prevent amps being enabled, when they are not needed, introduce the following workaround: Track the state of each of this type of output. In twl4030_write only allow actual write, when the given output is enabled, otherwise only update the reg_cache. The PGA event handlers on power up will write the cached value to the chip (restoring gain, routing selection). On power down 0 is written to the register (disabling the amp, and also just in case clearing the routing). Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7fb5622326bf98437e629e94f8710eb12a90b30d Author: Takashi Iwai Date: Mon Mar 22 17:09:47 2010 +0100 ALSA: hda - Fix uninitialized variable warning in alc_auto_parse_customize_define() Signed-off-by: Takashi Iwai commit 6407d474e6ae6a798fa5ba40b32f508a52de80ff Author: Randy Dunlap Date: Mon Mar 22 08:55:35 2010 -0700 ALSA: usb: fix usb build error when PM is not enabled Fix build errors when CONFIG_PM is not enabled: sound/usb/card.c:629: error: 'usb_audio_suspend' undeclared here (not in a function) sound/usb/card.c:630: error: 'usb_audio_resume' undeclared here (not in a function) Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 2fb20b61550d3c5335e59819ed22734900d4d6e3 Merge: 23caaf1 6da7a2a Author: Takashi Iwai Date: Mon Mar 22 17:05:48 2010 +0100 Merge branch 'topic/misc' into topic/usb commit 6da7a2aa899f75116e1a62cef78c358ada9878b7 Author: Daniel Mack Date: Mon Mar 22 13:13:37 2010 +0100 ALSA: usb/caiaq: Add support for Traktor Kontrol X1 This device does not have audio controllers and backlit buttons only. Input data is handled over a dedicated USB endpoint. All functions are supported by the driver now. Signed-off-by: Daniel Mack Cc: Dmitry Torokhov Signed-off-by: Takashi Iwai commit 7668448ea91cda36661878da54c851f8eb239d8e Author: Dan Carpenter Date: Sat Mar 20 01:20:49 2010 +0000 bridge: cleanup: remove unused assignment We never actually use iph again so this assignment can be removed. Signed-off-by: Dan Carpenter Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 986917b7b7570f889fa9c8c54962a9f2c3b32bf4 Author: Yegor Yefremov Date: Fri Mar 19 00:50:44 2010 +0000 can: sja1000: add read/write routines for 8, 16 and 32-bit register access add routines for 8, 16 and 32-bit access like in drivers/i2c/busses/i2c-pca-platform.c Signed-off-by: Yegor Yefremov Acked-by: Wolfgang Grandegger Acked-by: Wolfram Sang Signed-off-by: David S. Miller commit abde89d7f57adfae5a43f086b45e5746be16e3f0 Author: Yegor Yefremov Date: Fri Mar 19 00:49:08 2010 +0000 can: sja1000: allow shared interrupt definition extend the AND mask, so that IRQF_SHARED flag remains Signed-off-by: Yegor Yefremov Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit e99b99b471c21b071132e51bb7aa6b7a8796dc02 Author: Robert Olsson Date: Thu Mar 18 22:44:30 2010 +0000 pktgen node allocation Here is patch to manipulate packet node allocation and implicitly how packets are DMA'd etc. The flag NODE_ALLOC enables the function and numa_node_id(); when enabled it can also be explicitly controlled via a new node parameter Tested this with 10 Intel 82599 ports w. TYAN S7025 E5520 CPU's. Was able to TX/DMA ~80 Gbit/s to Ethernet wires. Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit 99fe3c391d50d381687fd84ed0ab22d57079e41f Author: Eric Dumazet Date: Thu Mar 18 11:27:25 2010 +0000 net: dev_getfirstbyhwtype() optimization Use RCU to avoid RTNL use in dev_getfirstbyhwtype() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit ec733b15a3ef0b5759141a177f8044a2f40c41e7 Author: Eric Dumazet Date: Thu Mar 18 20:36:06 2010 +0000 net: snmp mib cleanup There is no point to align or pad mibs to cache lines, they are per cpu allocated with a 8 bytes alignment anyway. This wastes space for no gain. This patch removes __SNMP_MIB_ALIGN__ Since SNMP mibs contain "unsigned long" fields only, we can relax the allocation alignment from "unsigned long long" to "unsigned long" Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 62c97ac04a67c120ec37a9bfd445a8d5dbbc1ed2 Author: Eric Dumazet Date: Thu Mar 18 13:48:26 2010 +0000 atm: Use kasprintf Use kasprintf in atm_proc_dev_register() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 283f2fe87e980d8af5ad8aa63751e7e3258ee05a Author: Eric Dumazet Date: Thu Mar 18 13:37:40 2010 +0000 net: speedup netdev_set_master() We currently force a synchronize_net() in netdev_set_master() This seems necessary only when a slave had a master and we dismantle it. In the other case ("ifenslave bond0 ethO"), we dont need this long delay. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 907cdda5205b012eec7513f66713749b293188c9 Author: Eric Dumazet Date: Fri Mar 19 05:37:18 2010 +0000 tcp: Add SNMP counter for DEFER_ACCEPT Its currently hard to diagnose when ACK frames are dropped because an application set TCP_DEFER_ACCEPT on its listening socket. See http://bugzilla.kernel.org/show_bug.cgi?id=15507 This patch adds a SNMP value, named TCPDeferAcceptDrop netstat -s | grep TCPDeferAcceptDrop TCPDeferAcceptDrop: 0 This counter is incremented every time we drop a pure ACK frame received by a socket in SYN_RECV state because its SYNACK retrans count is lower than defer_accept value. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 32a806c194ea112cfab00f558482dd97bee5e44e Author: Jiri Pirko Date: Fri Mar 19 04:00:23 2010 +0000 bonding: flush unicast and multicast lists when changing type After the type change, addresses in unicast and multicast lists wouldn't make sense, not to mention possible different lenghts. So flush both lists here. Note "dev_addr_discard" will be very soon replaced by "dev_mc_flush" (once mc_list conversion will be done). Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 755d0e77ac9c8d125388922dc33434ed5b2ebe80 Author: Patrick McHardy Date: Fri Mar 19 04:42:24 2010 +0000 net: rtnetlink: ignore NETDEV_PRE_TYPE_CHANGE in rtnetlink_event() Ignore the new NETDEV_PRE_TYPE_CHANGE event in rtnetlink_event() since there have been no changes userspace needs to be notified of. Also add a comment to the netdev notifier event definitions to remind people to update the exclusion list when adding new event types. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 93929ebc813e2bbb768676ed13a1661893631504 Merge: c027ddc e3d2530 Author: Takashi Iwai Date: Sun Mar 21 09:33:25 2010 +0100 Merge branch 'fix/hda' into topic/hda commit 3e81c6da39a265e11ef48f52bd15bf7ca0068c75 Author: David S. Miller Date: Sat Mar 20 16:18:00 2010 -0700 ipv6: Fix bug in ipv6_chk_same_addr(). hlist_for_each_entry(p...) will not necessarily initialize 'p' to anything if the hlist is empty. GCC notices this and emits a warning. Just return true explicitly when we hit a match, and return false is we fall out of the loop without one. Signed-off-by: David S. Miller commit b2db756449f63f98049587f7ede4a8e85e0c79b1 Author: YOSHIFUJI Hideaki Date: Sat Mar 20 16:11:12 2010 -0700 ipv6: Reduce timer events for addrconf_verify(). This patch reduces timer events while keeping accuracy by rounding our timer and/or batching several address validations in addrconf_verify(). addrconf_verify() is called at earliest timeout among interface addresses' timeouts, but at maximum ADDR_CHECK_FREQUENCY (120 secs). In most cases, all of timeouts of interface addresses are long enough (e.g. several hours or days vs 2 minutes), this timer is usually called every ADDR_CHECK_FREQUENCY, and it is okay to be lazy. (Note this timer could be eliminated if all code paths which modifies variables related to timeouts call us manually, but it is another story.) However, in other least but important cases, we try keeping accuracy. When the real interface address timeout is coming, and the timeout is just before the rounded timeout, we accept some error. When a timeout has been reached, we also try batching other several events in very near future. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 88949cf484bfc399e1d662b5dda6892aaca21aae Author: stephen hemminger Date: Wed Mar 17 20:31:17 2010 +0000 IPv6: addrconf cleanup addrconf_verify The variable regen_advance is only used in the privacy case. Move it to simplify code and eliminate ifdef's Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e21e8467d3188a36f7f0af0d4b9aae74e23fda0e Author: Stephen Hemminger Date: Sat Mar 20 16:09:01 2010 -0700 addrconf: checkpatch fixes Fix some of the checkpatch complaints. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bcdd553fd3037d8700082ec4cbb6b25437ea06d6 Author: Stephen Hemminger Date: Sat Mar 20 16:08:18 2010 -0700 IPv6: addrconf cleanups Some minor stuff, reformat comments and add whitespace for clarity Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 502a2ffd7376ae27cfde6172257db0ff9d8cfec2 Author: stephen hemminger Date: Wed Mar 17 20:31:13 2010 +0000 ipv6: convert idev_list to list macros Convert to list macro's for the list of addresses per interface in IPv6. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 3a88a81d89c20be312b3b219b185bbdde24b8fb8 Author: stephen hemminger Date: Wed Mar 17 20:31:12 2010 +0000 ipv6: user better hash for addrconf The existing hash function has a couple of issues: * it is hardwired to 16 for IN6_ADDR_HSIZE * limited to 256 and callers using int * use jhash2 rather than some old BSD algorithm No need for random seed since this is local only (based on assigned addresses) table. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5c578aedcb21d79eeb4e9cf04ca5b276ac82614c Author: stephen hemminger Date: Wed Mar 17 20:31:11 2010 +0000 IPv6: convert addrconf hash list to RCU Convert from reader/writer lock to RCU and spinlock for addrconf hash list. Adds an additional helper macro for hlist_for_each_entry_continue_rcu to handle the continue case. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c2e21293c054817c42eb5fa9c613d2ad51954136 Author: stephen hemminger Date: Wed Mar 17 20:31:10 2010 +0000 ipv6: convert addrconf list to hlist Using hash list macros, simplifies code and helps later RCU. This patch includes some initialization that is not strictly necessary, since an empty hlist node/list is all zero; and list is in BSS and node is allocated with kzalloc. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 372e6c8f1f7b2bb68f9992d2e664925c73552a1d Author: stephen hemminger Date: Wed Mar 17 20:31:09 2010 +0000 ipv6: convert temporary address list to list macros Use list macros instead of open coded linked list. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e77c8e83dd587f2616d7ff20d23a897891e6e20d Merge: 641cb85 af98441 Author: David S. Miller Date: Sat Mar 20 15:24:29 2010 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit fa8f130c504223d25c116b3d23787f465dfb1317 Author: Wey-Yi Guy Date: Fri Mar 5 14:22:46 2010 -0800 iwlwifi: code cleanup for connectivity recovery Split the connectivity check and recovery routine into separated functions based on the types 1. iwl_good_ack_health() - check for ack count 2. iwl_good_plcp_health() - check for plcp error Based on the type of errors being detected, different recovery methods will be used to bring the system back to normal operational state. Because different NIC has different HW and uCode, the behavior is also different; these functions thus now form part of the ops infrastructure, so we can have more control on how to monitor and recover from error condition case per device. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit d5a0ffa3eaf9e898f25a925813f1a723be7808f8 Author: Wey-Yi Guy Date: Thu Mar 4 13:38:59 2010 -0800 iwlwifi: Recover TX flow failure Monitors the tx statistics to detect the drop in throughput. When the throughput drops, the ratio of the actual_ack_count and the expected_ack_count also drops. At the same time, the aggregated ba_timeout (the number of ba timeout retries) also rises. If the actual_ack_count/expected_ack_count ratio is 0 and the number of ba timeout retries rises to BA_TIMEOUT_MAX, no tx packets can be delivered. Reloading the uCode and bring the system back to normal operational state. Signed-off-by: Trieu 'Andrew' Nguyen Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit beac5498b792ed8420885ee23e8d4f2885ee2d13 Author: Wey-Yi Guy Date: Thu Mar 4 13:38:58 2010 -0800 iwlwifi: move plcp check to separated function Move the plcp error checking into stand alone function and pointed by ops to accommodate devices not needing this recovery. Signed-off-by: Trieu 'Andrew' Nguyen Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit b74e31a9bc1013e69b85b139072485dc153453dd Author: Wey-Yi Guy Date: Mon Mar 1 17:23:50 2010 -0800 iwlwifi: Recover TX flow stall due to stuck queue Monitors the internal TX queues periodically. When a queue is stuck for some unknown conditions causing the throughput to drop and the transfer is stop, the driver will force firmware reload and bring the system back to normal operational state. The iwlwifi devices behave differently in this regard so this feature is made part of the ops infrastructure so we can have more control on how to monitor and recover from tx queue stall case per device. Signed-off-by: Trieu 'Andrew' Nguyen Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit c11362c01b280f8b2c728bc64793d484282b8734 Author: Shanyu Zhao Date: Fri Mar 5 17:05:20 2010 -0800 iwlwifi: clean up driver names for 1000/5000/6000 Align the driver names with official product names for 1000/5000/6000 series. This change mainly affects the debug messages show up in system log. No functional changes. Signed-off-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit fe0b3b96ab28b7e5fb6c5aea68e6dd88115873da Author: Johannes Berg Date: Thu Jan 21 07:07:44 2010 -0800 iwlwifi: sta_id cannot be invalid in rs_initialize_lq The only caller of this is iwl_rs_rate_init which is only called with a valid sta_id. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit fe6b23dd361199bfbc50b0cbce6bed37c5797c75 Author: Reinette Chatre Date: Mon Feb 22 16:24:47 2010 -0800 iwlwifi: implement new mac80211 station add/remove calls mac80211 recently implemented two new callbacks that are used to request station add/remove from the driver. The benefot from these new callbacks are that they enable the driver to sleep while performing this work. This is a big patch since a few things need to be coordinated in this move. First we need to decouple station management from rate scaling, which caused a lot of code to be moved and/or deleted. Next we needed to tie in with mac80211's station management callback and let it direct our station management as well as trigger the rate scaling initialization. Signed-off-by: Reinette Chatre commit 7e2461910e9115c9964975f77584baf8c2f76bfe Author: Reinette Chatre Date: Thu Feb 18 22:58:32 2010 -0800 iwlwifi: only add broadcast station once Currently the broadcast station is added after every RXON command. Change this to only add the broadcast station when interface is added by mac80211. With this we need some extra work to ensure broadcast station is always present since station table is cleared when RXON without ASSOC bit set is sent. To deal with this we re-add all driver known stations to uCode after such an RXON command is sent. We also do some cleanup and remove the various calls to clear the station table. We now only clear the station table in two scenarios: - only clear uCode portion of station table when RXON command without ASSOC bit is sent - clear uCode and driver portion when interface goes down or is removed. We need to do this clearing when interface goes down to deal with the device restart/reconfigure routines which do not remove the interface, but do add the interface during reconfiguration. Previously the keys were also cleared when station table in driver is cleared, this is not done anymore since mac80211 will take care that keys are set and cleared correctly. There is a known issue with this change. Associating with different AP without bringing interface down fails with a firmware error. This is because of the lack of full station notification support and the later patches in this series that complete the station notification support will fix this. Signed-off-by: Reinette Chatre commit 647291f5c1596839eb69d6c1f231b2249a703c27 Author: Ben Cahill Date: Tue Mar 2 12:48:25 2010 -0800 iwlagn: Add Flow-handler (FH) register dump for 4965. FH register dump debug feature was recently added for 5000 and later; 4965 can use it also. Signed-off-by: Ben Cahill Signed-off-by: Reinette Chatre commit 4bd96a7a8185755b091233b16034c7436cbf57af Author: Shane Wang Date: Wed Mar 10 14:36:10 2010 +0800 x86, tboot: Add support for S3 memory integrity protection This patch adds support for S3 memory integrity protection within an Intel(R) TXT launched kernel, for all kernel and userspace memory. All RAM used by the kernel and userspace, as indicated by memory ranges of type E820_RAM and E820_RESERVED_KERN in the e820 table, will be integrity protected. The MAINTAINERS file is also updated to reflect the maintainers of the TXT-related code. All MACing is done in tboot, based on a complexity analysis and tradeoff. v3: Compared with v2, this patch adds a check of array size in tboot.c, and a note to specify which c/s of tboot supports this kind of MACing in intel_txt.txt. Signed-off-by: Shane Wang LKML-Reference: <4B973DDA.6050902@intel.com> Signed-off-by: Joseph Cihula Acked-by: Pavel Machek Acked-by: Rafael J. Wysocki Signed-off-by: H. Peter Anvin commit 819bfecc4fc6b6e5a793f719a45b7146ce423b79 Author: florian@mickler.org Date: Sat Mar 13 13:31:05 2010 +0100 rename new rfkill sysfs knobs This patch renames the (never officially released) sysfs-knobs "blocked_hw" and "blocked_sw" to "hard" and "soft", as the hardware vs software conotation is misleading. It also gets rid of not needed locks around u32-read-access. Signed-off-by: Florian Mickler Signed-off-by: John W. Linville commit 4ca612ebdb795d15714487576cfb2e0f7173f0a4 Merge: b2dfa62 6937c94 Author: Mark Brown Date: Fri Mar 19 19:39:23 2010 +0000 Merge branch 'for-2.6.34' into for-2.6.35 commit b2dfa62c525fbe4d89790b6fa90af7c3f1c052ae Author: Guennadi Liakhovetski Date: Thu Mar 18 08:23:33 2010 +0100 ASoC: remove a card from the list, if instantiation failed If instantiation of a card failed, we still have to remove it from the card list on unregistration. This fixes an Oops on Migo-R, triggering, when after a failed firmware load attempt the driver modules are removed and re-inserted again. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fd23b7dee5e4d369f620979cb120f53629389355 Author: Daniel Mack Date: Fri Mar 19 14:52:55 2010 +0000 ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream This fixes a memory corruption when ASoC devices are used in full-duplex mode. Specifically for pxa-ssp code, where this pointer is dynamically allocated for each direction and destroyed upon each stream start. All other platforms are fixed blindly, I couldn't even compile-test them. Sorry for any breakage I may have caused. Reported-by: Sven Neumann Reported-by: Michael Hirsch Signed-off-by: Daniel Mack Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b102c01faed5e0083a4e6d29a2d61f6b57716e94 Author: Alessandro Rubini Date: Fri Mar 5 12:38:51 2010 +0100 ARM: 5978/1: plat-nomadik: use one-shot clock events This is a complete rewrite of the MTU driver, using one-shot for events and a free-running timer for stamping. It allows CONFIG_NO_HZ and CONFIG_HIGH_RES_TIMERS to work on Nomadik and Ux500. Signed-off-by: Alessandro Rubini Acked-by: Linus Walleij Acked-by: Andrea Gallo Signed-off-by: Russell King commit 94bdc0e2d76c5f2467346bf14e7e16d6d8e0395d Author: Rabin Vincent Date: Wed Mar 3 04:54:37 2010 +0100 ARM: 5973/1: ux500: add gpio support Add support for the GPIOs on the U8500, using the plat-nomadik GPIO driver. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 1df20afce51e7af2a587425d1aafca2608fe0066 Author: Rabin Vincent Date: Mon Mar 1 05:07:47 2010 +0100 ARM: 5964/1: ux500: support clock gating Implement clock gating support for the u8500 clocks. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 75a36ee01e860be693220f1c40e2c04fb6cc69ba Author: Rabin Vincent Date: Mon Mar 1 05:05:56 2010 +0100 ARM: 5963/1: ux500: add support for u8500 v1 revision Add cpu_is_u8500{ed/v1}() functions to determine the variant based on the CPU id, add the changed peripheral addresses, and fixup the MTU address. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit cc2c13342508d52cf08ea81f639b5de69607fd5d Author: Rabin Vincent Date: Mon Mar 1 05:03:31 2010 +0100 ARM: 5962/1: ux500: move system timer to cpu file There is nothing board-specific about the system timer, so move it to the CPU file. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 3e3c62ca5395df48319b808379bc9fd487ff3c29 Author: Rabin Vincent Date: Wed Mar 3 04:52:34 2010 +0100 ARM: 5972/1: nomadik-gpio: convert to platform driver On the U8500 platform there are four GPIO blocks, each with a 4K address space, including the peripheral identification. However, each of these blocks have a varying number of banks, each of which have 32 GPIOs and an interrupt line. The current nomadik-gpio driver implementation can handle each of these sub-banks easily with one instance each, but cannot as-is be hooked up to them because it is an AMBA driver and it expects to see a peripheral with the appropriate peripheral ids but having only one bank and only one interrupt. Solve this by converting the driver to a platform driver. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit aaedaa2b5c610ae97f863078075d8d3c6ef91575 Author: Rabin Vincent Date: Wed Mar 3 04:50:27 2010 +0100 ARM: 5971/1: nomadik-gpio: mask/ack/unmask the parent irq Since we register as a chained handler, we need to take care of acking the parent irq. Current code had the acking disabled because just acking the interrupt disables it on some interrupt controllers (like the VIC used on Nomadik). However, not acking at all is incorrect because interrupt controllers like the GIC need an EOI indication, which is done in the ack routine. Solve this by maskacking and unmasking it appropriately, similar to how handle_level_irq operates. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit c0fcb8dba829421fe20652a376a2bedaf168238f Author: Rabin Vincent Date: Wed Mar 3 04:48:54 2010 +0100 ARM: 5970/1: nomadik-gpio: fix spinlock usage Fix the incorrect spinlock usage which leads to these compiler warnings: arch/arm/plat-nomadik/gpio.c:60: warning: passing argument 1 of `spinlock_check' from incompatible pointer type arch/arm/plat-nomadik/gpio.c:69: warning: passing argument 1 of `spin_unlock_irqrestore' from incompatible pointer type Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 3a5e854e09b77c49c8030c7dfd3a3f506571a89a Author: Rabin Vincent Date: Wed Mar 3 04:46:58 2010 +0100 ARM: 5969/1: nomadik: move gpio to plat-nomadik Move the Nomadik GPIO driver to plat-nomadik so that it can also be used on the Ux500 platform. The mach-nomadik include/mach/gpio.h is replaced by one that includes the one now in plat-nomadik, so that code doesn't need to include the one in plat specifically, and can instead use as usual. Acked-by: Alessandro Rubini Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit e4bf5becccf4685754c4d8e4485bb2ff7d28147f Author: viresh kumar Date: Tue Mar 9 11:54:30 2010 +0100 ARM: 5979/1: CLKDEV: return from clk_find as soon as we get maching clk clk_find function looks for clock with matching dev_id and con_id. We should return from clk_find as soon as we get a clock with matching dev_id and con_id. This can be done by comparing variable "match" with 3. Acked-by: Uwe Kleine-Konig Signed-off-by: Viresh Kumar Signed-off-by: Russell King commit 0deac0bf66110fe70507c5dcec661c9e85fa07ca Author: Russell King Date: Mon Mar 15 20:36:22 2010 +0000 ARM: Arrange for COMMON_CLKDEV to select HAVE_CLK If support for COMMON_CLKDEV is enabled, we have CLK support. Signed-off-by: Russell King commit 2c46cd8163b25bf6f38e612e9f1d162f0357c8f1 Author: Zhitong Wang Date: Fri Mar 19 16:04:10 2010 +0100 netfilter: remove unused headers in net/ipv4/netfilter/nf_nat_h323.c Remove unused headers in net/ipv4/netfilter/nf_nat_h323.c Signed-off-by: Zhitong Wang Signed-off-by: Patrick McHardy commit 1159683ef48469de71dc26f0ee1a9c30d131cf89 Author: Zhitong Wang Date: Fri Mar 19 16:01:54 2010 +0100 netfilter: remove unused headers in net/ipv6/netfilter/ip6t_LOG.c Remove unused headers in net/ipv6/netfilter/ip6t_LOG.c Signed-off-by: Zhitong Wang Signed-off-by: Patrick McHardy commit 093208f5d03980d7216b706e3c54432d0f299e26 Author: Mark Brown Date: Tue Mar 16 16:11:14 2010 +0000 ASoC: Hook up microphone jack detection on 1133-EV1 board Note that since all the microphones share a bias there is a single jack exported for all three, even though there are two physical connectors plus the soldered down silicon mic. Note also that the SiMic is always present by default. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a655b96c2404245ee1c309a4b199b92812b09651 Merge: 698c375 ebb812c Author: Mark Brown Date: Fri Mar 19 12:48:10 2010 +0000 Merge branch 'topic/jack' into for-2.6.35 commit 698c3756660f7afd6fa5051f667a259a953eea77 Author: Barry Song <21cnbao@gmail.com> Date: Fri Mar 19 11:18:40 2010 +0800 ASoC: change bf5xx-ad1938 machine driver to bf5xx-ad193x machine driver Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit cffce322be94ecdd3bbb74dfd3f3834c51b4232a Author: Mark Brown Date: Fri Mar 19 12:22:03 2010 +0000 ASoC: Unexport AD193x bus probe/remove functions The export is not needed since the per-bus code lives in the same module. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a1533d94c6b930ef4263941adfd1e1132ca95627 Author: Barry Song <21cnbao@gmail.com> Date: Fri Mar 19 14:48:33 2010 +0800 ASoC: rename ad1938 to ad193x and add support for ad1936/7/8/9 Signed-off-by: Barry Song Signed-off-by: Yi Li Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8ecbabd977dc64d2d8c9980420a3d72db06fe551 Author: Misael Lopez Cruz Date: Fri Mar 19 11:25:51 2010 +0000 ASoC: TWL6040: Add twl6040 codec driver Initial version of TWL6040 codec driver. The TWL6040 codec uses a proprietary PDM-based digital audio interface. Audio paths supported are: - Input: Main Mic, Sub Mic, Headset Mic, Auxiliary-FM Left/Right - Output: Headset Left/Right, Handsfree Left/Right TWL6040 codec supports power-up/down manual and automatic sequence. Manual sequence is done through a specific register writes sequence. Automatic sequence is done when the codec is powered-up through the external AUDPWRON line. The completion of the sequence is signaled through the audio interrupt. TWL6040 codec sysclk can be provided by: low-power or high performance PLL: - The low-power PLL takes a low-frequency input at 32,768 Hz and generates an approximate of 17.64 or 19.2 MHz (for 44.1 KHz and 48 KHz respectively) - The high-performance PLL generates an exact 19.2 MHz clock signal from high-frequency input at 12/19.2/26/38.4 MHz. Low-power playback mode is a special scenario where only headset path (headset DAC and driver) is active. For the particular case of headset path, PLL being used defines the headset power mode: low-power, high-performance. Signed-off-by: Misael Lopez Cruz Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 27648b2f1c464f8827cc01ba4eb21580b5402947 Author: Mark Brown Date: Tue Mar 16 16:09:47 2010 +0000 ASoC: Correct typoed Mic2 connections on 1133-EV1 board Signed-off-by: Mark Brown commit 299a151f53ed9272af616076305d3ee762c2eba0 Author: Peter Ujfalusi Date: Fri Mar 19 12:27:31 2010 +0200 ASoC: omap-mcbsp: Add support for Left Justified format Basic support for Left Justified coding for OMAP McBSP. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9fc71e8f586efc99472337a8b089a4915877b4b8 Author: Jorge Eduardo Candelaria Date: Thu Mar 18 19:45:41 2010 -0600 ASoC: McPDM: Use tabs for indentation Indentation in initial support for McPDM driver was converted to spaces. Use tabs to comply with open source coding-style. Signed-off-by: Jorge Eduardo Candelaria Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c027ddcd01c852dfa5880862e47f022d7d9402f5 Author: Kailang Yang Date: Fri Mar 19 11:33:06 2010 +0100 ALSA: hda - Add alc_codec_rename() helper Added alc_codec_rename() helper for renaming codec->chip_name. Added Acer-specific codec naming for ALC269/662. [Clean-up and refactoring by tiwai] Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit da00c24493bf6ae3772dfe7343dca033ebc75955 Author: Kailang Yang Date: Fri Mar 19 11:23:45 2010 +0100 ALSA: hda - Add parse customize define function for Realtek codecs Added alc_auto_parse_customize_define() to parse the Realtek-specific attributes from SKU. Also enable beep controls only when the proper attribute bit is set. Signed-off-by: Takashi Iwai commit 6ff86a3f33e84c430aeb8ff3b7f68b1c052ec1e9 Author: Kailang Yang Date: Fri Mar 19 11:14:36 2010 +0100 ALSA: hda - Take internal mic as Front Mic Add new check for MIC. Do the internal DMIC as the Front MIC. It could solve the default record source index issue. [Fix the check properly using the bitmask by tiwai] Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit b7a5633ab39105b47b341249824f9387a002cea9 Author: Justin P. Mattock Date: Thu Mar 18 19:26:13 2010 -0700 fix comment typo in sound/pci/hda/hda_local.h I think this should be automatic pin instead of ping. (but could be wrong). Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit ab5097b11f6fcb587b65cd08bd7241661ade77db Author: Greg Thelen Date: Thu Mar 18 15:04:39 2010 -0700 memcg: fix typo in memcg documentation Updated memory.txt to be more consistent: s/swapiness/swappiness/ Signed-off-by: Greg Thelen Acked-by: Balbir Singh Signed-off-by: Jiri Kosina commit 40b7e05e17eef31ff30fe08dfc2424ef653a792c Author: Lin Ming Date: Fri Mar 19 15:28:58 2010 +0800 perf, x86: Fix key indexing in Pentium-4 PMU Index 0-6 in p4_templates are reserved for common hardware events. So p4_templates is arranged as below: 0 - 6: common hardware events 7 - N: cache events N+1 - ...: other raw events Reported-by: Cyrill Gorcunov Signed-off-by: Lin Ming Acked-by: Cyrill Gorcunov Cc: Peter Zijlstra LKML-Reference: <1268983738.13901.142.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit dec710b77c2cf04bf512acada3c14a16f11708d9 Author: Magnus Damm Date: Fri Mar 19 16:48:01 2010 +0900 sh: INTC ioremap support Extend the INTC code with ioremap() support V2. Support INTC controllers that are not accessible through a 1:1 virt:phys window. Needed by SH-Mobile ARM INTCS. The INTC code behaves as usual if the io window resource is omitted. The slow phys->virt lookup only happens during setup. The fast path code operates on virtual addresses. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 01e9651a21bc0e6731da733593e4aaf4cf46b5e5 Author: Magnus Damm Date: Wed Mar 10 09:31:01 2010 +0000 sh: add INTC out of memory error handling Extend the INTC code to warn and return an error code in the case of memory allocation failure. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 641cb85e68945878d520d5fc3c2dc64aa1dda868 Author: Vasanthy Kolluri Date: Thu Mar 18 16:20:04 2010 +0000 enic: Clean up: Change driver description; Fix tab space; Update MAINTAINERS 1) Change enic driver description to "Cisco VIC Ethernet NIC Driver" 2) Fix tab space 3) Update MAINTAINERS list Signed-off-by: Scott Feldman Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller commit d883aa76416f8e9e872f11ac08c5a3c6684840de Author: Vasanthy Kolluri Date: Thu Mar 18 16:19:59 2010 +0000 enic: Clean up: Add wrapper functions Add wrapper functions vnic_dev_notify_setcmd and vnic_dev_notify_unsetcmd for firmware notify commands. Signed-off-by: Scott Feldman Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller commit 73c1ea9b54eb4794b7413ceb2250ad7957dfcc91 Author: Vasanthy Kolluri Date: Thu Mar 18 16:19:54 2010 +0000 enic: Do not advertise NETIF_F_HW_VLAN_RX Hardware does not honor vlan filters from the host and so the driver does not need to advertise this. Signed-off-by: Scott Feldman Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller commit b6d24eb663cdf4af9c08b37ad2e31056c5eb2561 Author: Vasanthy Kolluri Date: Thu Mar 18 16:19:49 2010 +0000 enic: Bug Fix: Fix timeout for hardware Tx and Rx queue disable operations The timeout for hardware Tx and Rx queue disable operations is increased to work-around an erratum for "unnamed" chipset where a DMA completion may take upto 10ms. We have to wait atleast this long for hardware to signal that Tx and Rx queues are quiesced. Signed-off-by: Scott Feldman Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller commit a55a603dae47a1ea4fbfad3a3a428ea7a0900ab6 Author: Vasanthy Kolluri Date: Thu Mar 18 16:19:44 2010 +0000 enic: Bug Fix: Fix hardware descriptor reads The last bit written to a completion descriptor by hardware is the color bit. Driver must read all other descriptor fields only after reading the color bit to avoid reading stale descriptor fields. There is a rmb() after reading the color bit to avoid any compiler/cpu reordering of the reads. The color bit is the generation bit that toggles each pass through the completion descriptor ring. Signed-off-by: Scott Feldman Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller commit ba7e94a44afbbf4c494e00b844f7bbfb144e7f6d Author: Huang Weiyi Date: Thu Mar 18 20:24:51 2010 -0700 net: remove unused #include Remove unused #include ('s) in drivers/net/ksz884x.c Signed-off-by: Huang Weiyi Signed-off-by: David S. Miller commit 1c01fe14a87332cc88266fbd6e598319322eb96f Author: Jiri Pirko Date: Wed Mar 10 10:30:19 2010 +0000 net: forbid underlaying devices to change its type It's not desired for underlaying devices to change type. At the time, there is for example possible to have bond with changed type from Ethernet to Infiniband as a port of a bridge. This patch fixes this. Signed-off-by: Jiri Pirko Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 3ca5b4042ecae5e73c59de62e4ac0db31c10e0f8 Author: Jiri Pirko Date: Wed Mar 10 10:29:35 2010 +0000 bonding: check return value of nofitier when changing type This patch adds the possibility to refuse the bonding type change for other subsystems (such as for example bridge, vlan, etc.) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 93d9b7d7a85cfb4e1711d5226eba73586dd4919f Author: Jiri Pirko Date: Wed Mar 10 10:28:56 2010 +0000 net: rename notifier defines for netdev type change Since generally there could be more netdevices changing type other than bonding, making this event type name "bonding-unrelated" Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 1e94d72feab025b8f7c55d07020602f82f3a97dd Author: Tom Herbert Date: Thu Mar 18 17:45:44 2010 -0700 rps: Fixed build with CONFIG_SMP not enabled. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 9c8c6bad3137112d2c7bf3d215b736ee4215fa74 Author: Cyrill Gorcunov Date: Fri Mar 19 00:12:56 2010 +0300 x86, perf: Fix few cosmetic dabs for P4 pmu (comments and constantify) - A few ESCR have escaped fixing at previous attempt. - p4_escr_map is read only, make it const. Nothing serious. Signed-off-by: Cyrill Gorcunov Cc: Lin Ming LKML-Reference: <20100318211256.GH5062@lenovo> Signed-off-by: Ingo Molnar commit 4b24a88b35e15e04bd8f2c5dda65b5dc8ebca05f Author: Stephane Eranian Date: Wed Mar 17 23:21:01 2010 +0200 perf_events: Fix resource leak in x86 __hw_perf_event_init() If reserve_pmc_hardware() succeeds but reserve_ds_buffers() fails, then we need to release_pmc_hardware. It won't be done by the destroy() callback because we return before setting it in case of error. Signed-off-by: Stephane Eranian Cc: Cc: peterz@infradead.org Cc: paulus@samba.org Cc: davem@davemloft.net Cc: fweisbec@gmail.com Cc: robert.richter@amd.com Cc: perfmon2-devel@lists.sf.net LKML-Reference: <4ba1568b.15185e0a.182a.7802@mx.google.com> Signed-off-by: Ingo Molnar -- arch/x86/kernel/cpu/perf_event.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 6a1c7b7e2ea3ca5f6ae73154c4b72755d262c9e0 Author: Olaya, Margarita Date: Wed Mar 17 17:42:29 2010 -0500 OMAP4: PMIC: Rename twl6030_codec as twl6040_codec Correction for chips: twl6030 is Phoenix Power chip twl6040 is Phoenix Audio chip Signed-off-by: Margarita Olaya Cabrera Acked-by: Liam Girdwood Acked-by: Samuel Ortiz Signed-off-by: Mark Brown commit cb7d6b5053e86598735d9af19930f5929f007b7f Author: Lin Ming Date: Thu Mar 18 18:33:12 2010 +0800 perf, x86: Add cache events for the Pentium-4 PMU Move the HT bit setting code from p4_pmu_event_map to p4_hw_config. So the cache events can get HT bit set correctly. Tested on my P4 desktop, below 6 cache events work: L1-dcache-load-misses LLC-load-misses dTLB-load-misses dTLB-store-misses iTLB-loads iTLB-load-misses Signed-off-by: Lin Ming Reviewed-by: Cyrill Gorcunov Cc: Peter Zijlstra LKML-Reference: <1268908392.13901.128.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit f34edbc1cdb0f8f83d94e1d668dd6e41abf0defb Author: Lin Ming Date: Thu Mar 18 18:33:07 2010 +0800 perf, x86: Add a key to simplify template lookup in Pentium-4 PMU Currently, we use opcode(Event and Event-Selector) + emask to look up template in p4_templates. But cache events (L1-dcache-load-misses, LLC-load-misses, etc) use the same event(P4_REPLAY_EVENT) to do the counting, ie, they have the same opcode and emask. So we can not use current lookup mechanism to find the template for cache events. This patch introduces a "key", which is the index into p4_templates. The low 12 bits of CCCR are reserved, so we can hide the "key" in the low 12 bits of hwc->config. We extract the key from hwc->config and then quickly find the template. Signed-off-by: Lin Ming Reviewed-by: Cyrill Gorcunov Cc: Peter Zijlstra LKML-Reference: <1268908387.13901.127.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit 55632770d7298835645489828af87f854c47749c Author: Ingo Molnar Date: Thu Mar 18 16:51:16 2010 +0100 perf events: Fix false positive build warning with older GCC's gcc 4.2.1 produces: util/probe-event.c: In function 'add_perf_probe_events': util/probe-event.c:883: warning: 'tev' may be used uninitialized in this function make: *** [util/probe-event.o] Error 1 Newer GCCs get this right. To work it around, initialize the variable to NULL so that older GCCs see it as initialized too. Cc: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220612.32050.33806.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 7335f75e9ca166044e38a96abad422d8e6e364b5 Author: Cyrill Gorcunov Date: Wed Mar 17 13:37:01 2010 +0300 x86, perf: Use apic_write unconditionally Since apic_write() maps to a plain noop in the !CONFIG_X86_LOCAL_APIC case we're safe to remove this conditional compilation and clean up the code a bit. Signed-off-by: Cyrill Gorcunov Cc: fweisbec@gmail.com Cc: acme@redhat.com Cc: eranian@google.com Cc: peterz@infradead.org LKML-Reference: <20100317104356.232371479@openvz.org> Signed-off-by: Ingo Molnar commit d674cd1963129b70bc5f631c51fb30fb73213fb2 Author: Cyrill Gorcunov Date: Wed Mar 17 13:37:00 2010 +0300 x86, apic: Allow to use certain functions without APIC built-in support In case even if the kernel is configured so that no APIC support is built-in we still may allow to use certain apic functions as dummy calls. In particular we start using it in perf-events code. Note that this is not that same as NOOP apic driver (which is used if APIC support is present but no physical APIC is available), this is for the case when we don't have apic code compiled in at all. Signed-off-by: Cyrill Gorcunov Cc: H. Peter Anvin Cc: Yinghai Lu Cc: Yinghai Lu LKML-Reference: <20100317104356.011052632@openvz.org> Signed-off-by: Ingo Molnar commit d6d901c23a9c4c7361aa901b5b2dda69703dd5e0 Author: Zhang, Yanmin Date: Thu Mar 18 11:36:05 2010 -0300 perf events: Change perf parameter --pid to process-wide collection instead of thread-wide Parameter --pid (or -p) of perf currently means a thread-wide collection. For exmaple, if a process whose id is 8888 has 10 threads, 'perf top -p 8888' just collects the main thread statistics. That's misleading. Users are used to attach a whole process when debugging a process by gdb. To follow normal usage style, the patch change --pid to process-wide collection and add --tid (-t) to mean a thread-wide collection. Usage example is: # perf top -p 8888 # perf record -p 8888 -f sleep 10 # perf stat -p 8888 -f sleep 10 Above commands collect the statistics of all threads of process 8888. Signed-off-by: Zhang Yanmin Signed-off-by: Arnaldo Carvalho de Melo Cc: Avi Kivity Cc: Peter Zijlstra Cc: Sheng Yang Cc: Joerg Roedel Cc: Jes Sorensen Cc: Marcelo Tosatti Cc: Gleb Natapov Cc: zhiteng.huang@intel.com Cc: Zachary Amsden LKML-Reference: <1268922965-14774-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 46be604b5ba738d53e5f5314813a4e7092864baf Author: Zhang, Yanmin Date: Thu Mar 18 11:36:04 2010 -0300 perf record: Enable counters only when kernel is execing subcommand 'perf record' starts counters before subcommand is execed, so the statistics is not precise because it includes data of some preparation steps. I fix it with the patch. In addition, change the condition to fork/exec subcommand. If there is a subcommand parameter, perf always fork/exec it. The usage example is: # perf record -f -a sleep 10 So this command could collect statistics for 10 seconds precisely. User still could stop it by CTRL+C. Without the new capability, user could only input CTRL+C to stop it without precise time clock. Signed-off-by: Zhang Yanmin Signed-off-by: Arnaldo Carvalho de Melo Cc: Avi Kivity Cc: Peter Zijlstra Cc: Sheng Yang Cc: oerg Roedel Cc: Jes Sorensen Cc: Marcelo Tosatti Cc: Gleb Natapov Cc: Cc: Zachary Amsden LKML-Reference: <1268922965-14774-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 6be2850effd6a8bae11d623c8c52e88d2fbc0e96 Author: Zhang, Yanmin Date: Thu Mar 18 11:36:03 2010 -0300 perf stat: Enable counters when collecting process-wide or system-wide data Command 'perf stat' doesn't enable counters when collecting an existing (by -p) process or system-wide statistics. Fix the issue. Change the condition of fork/exec subcommand. If there is a subcommand parameter, perf always forks/execs it. The usage example is: # perf stat -a sleep 10 So this command could collect statistics for 10 seconds precisely. User still could stop it by CTRL+C. Without the new capability, user could only use CTRL+C to stop it without precise time clock. Another issue is 'perf stat -a' consumes 100% time of a full single logical cpu. It has a bad impact on running workload. Fix it by adding a sleep(1) in the while(!done) loop in function run_perf_stat. Signed-off-by: Zhang Yanmin Signed-off-by: Arnaldo Carvalho de Melo Cc: Avi Kivity Cc: Peter Zijlstra Cc: Sheng Yang Cc: Marcelo Tosatti Cc: Joerg Roedel Cc: Jes Sorensen Cc: Gleb Natapov Cc: Zachary Amsden Cc: LKML-Reference: <1268922965-14774-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 8bee4bad03c5b601bd6cea123c31025680587ccc Author: Jan Engelhardt Date: Wed Mar 17 16:04:40 2010 +0100 netfilter: xt extensions: use pr_ Signed-off-by: Jan Engelhardt commit be91fd5e323b46450ca82f6828e933e3791fb2f2 Author: Jan Engelhardt Date: Thu Mar 18 02:22:32 2010 +0100 netfilter: xtables: replace custom duprintf with pr_debug Signed-off-by: Jan Engelhardt commit 85bc3f38147c5d3fb1eb9ca2236536389b592cae Author: Jan Engelhardt Date: Thu Mar 18 00:27:03 2010 +0100 netfilter: xtables: do not print any messages on ENOMEM ENOMEM is a very obvious error code (cf. EINVAL), so I think we do not really need a warning message. Not to mention that if the allocation fails, the user is most likely going to get a stack trace from slab already. Signed-off-by: Jan Engelhardt commit f5c511c67aaec323c186543856cfddab31bed1d1 Author: Jan Engelhardt Date: Thu Mar 18 14:02:10 2010 +0100 netfilter: xtables: reduce holes in struct xt_target This will save one full padding chunk (8 bytes on x86_64) per target. Signed-off-by: Jan Engelhardt commit 4f948db1915ff05e4ce0fd98e6323db6a3ec0fc0 Author: Jan Engelhardt Date: Thu Mar 18 11:03:51 2010 +0100 netfilter: xtables: remove almost-unused xt_match_param.data member This member is taking up a "long" per match, yet is only used by one module out of the roughly 90 modules, ip6t_hbh. ip6t_hbh can be restructured a little to accomodate for the lack of the .data member. This variant uses checking the par->match address, which should avoid having to add two extra functions, including calls, i.e. (hbh_mt6: call hbhdst_mt6(skb, par, NEXTHDR_OPT), dst_mt6: call hbhdst_mt6(skb, par, NEXTHDR_DEST)) Signed-off-by: Jan Engelhardt commit 16599786ae5e9d5f936706d2202d8c7224cd51ed Author: Jan Engelhardt Date: Thu Mar 18 10:30:44 2010 +0100 netfilter: update documentation fields of x_tables.h Signed-off-by: Jan Engelhardt commit aa5fa3185791aac71c9172d4fda3e8729164b5d1 Author: Jan Engelhardt Date: Thu Mar 18 00:44:52 2010 +0100 netfilter: xtables: make use of caller family rather than match family The matches can have .family = NFPROTO_UNSPEC, and though that is not the case for the touched modules, it seems better to just use the nfproto from the caller. Signed-off-by: Jan Engelhardt commit 115bc8f2874078e6ac78d88652a91b58447d5f4d Author: Jan Engelhardt Date: Tue Mar 16 20:06:55 2010 +0100 netfilter: xtables: resort osf kconfig text Restore alphabetical ordering of the list and put the xt_osf option into its 'right' place again. Signed-off-by: Jan Engelhardt commit e5042a290097b7c2fc9b6a247585b6ed07b13026 Author: Jan Engelhardt Date: Tue Mar 16 21:44:44 2010 +0100 netfilter: xtables: limit xt_mac to ethernet devices I do not see a point of allowing the MAC module to work with devices that don't possibly have one, e.g. various tunnel interfaces such as tun and sit. Signed-off-by: Jan Engelhardt commit 1d1c397db95f1c0cd95f6fa633c1e68acfaacec3 Author: Jan Engelhardt Date: Tue Mar 16 21:09:04 2010 +0100 netfilter: xtables: clean up xt_mac match routine Signed-off-by: Jan Engelhardt commit 7d5f7ed802507999c22949b84686d03987fe57ec Author: Jan Engelhardt Date: Tue Mar 9 23:27:24 2010 +0100 netfilter: xtables: do without explicit XT_ALIGN XT_ALIGN is already applied on matchsize/targetsize in x_tables.c, so it is not strictly needed in the extensions. Signed-off-by: Jan Engelhardt commit e8a96f69383f3d88cdc06d8ccd450f70c48628a3 Merge: c01ae81 1da05f5 Author: Patrick McHardy Date: Thu Mar 18 12:55:50 2010 +0100 Merge branch 'master' of ../nf-2.6 commit f4bee1bb0083869b1b7d73c6eda7703a7aae0506 Author: Barry Song <21cnbao@gmail.com> Date: Thu Mar 18 16:17:01 2010 +0800 ASoC: soc-cache: let reg be AND'ed by 0xff instead of data buffer for 8_8 mode The registers for AD193X are defined as 0x800-0x810 for spi which uses 16_8 mode, for i2c to support AD1937, we will use 8_8 mode, only the low byte of 0x800-0x810 is valid. The patch will not destory other codecs, but make soc cache interface more useful. Signed-off-by: Barry Song Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 85dfcdffc227717fd218b9a86b507d9b7a3c321d Author: Cliff Cai Date: Thu Mar 18 16:17:00 2010 +0800 ASoC: soc-cache: add i2c read entry for 8_8 mode Signed-off-by: Cliff Cai Signed-off-by: Barry Song Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e07b5d795aebbd7445cc98e8cd86b2c05fab07f8 Author: Jiri Kosina Date: Thu Mar 18 10:59:57 2010 +0100 hpet: x86_64 and i386 are not different code any more hpet implementation for x86_64 and i386 is unified. Reflect this in MAINTAINERS. Acked-by: Venkatesh Pallipadi Acked-by: Vojtech Pavlik Signed-off-by: Jiri Kosina commit a034016287236f435dbb8f1f57aee906f22b4598 Author: Rafael J. Wysocki Date: Wed Mar 17 23:12:24 2010 -0700 Net / e1000e: Fix build issue introduced by runtime PM patch The recent PCI runtime PM patch broke build for CONFIG_PM_RUNTIME and CONFIG_PM_SLEEP undefined. Fix that by moving the PM callbacks under suitable #ifdefs. Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit a8d89807373f95f3f7637e3987710a4500a7a857 Author: Viral Mehta Date: Wed Mar 17 19:31:17 2010 +0530 kfifo: fix kerneldoc for kfifo_avail and kfifo_in_locked Function argument is not having "len" anywhere; "len" is later used in kfifo_{in|out}. So here, it would be appropriate to say, it copies @n bytes and not @len Signed-off-by: Viral Mehta Signed-off-by: Jiri Kosina commit 9c5fb19adbeabd269ace11ee2d916cbc0d9118e6 Author: Venkatesh Pallipadi Date: Wed Mar 17 13:17:52 2010 -0700 HPET maintainer email update Updating my email address in MAINTAINERS. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Jiri Kosina commit ebb812cb8df48e299b3d4ab75cbb0042384ef70d Author: Mark Brown Date: Wed Mar 17 18:07:12 2010 +0000 ALSA: Add support for key reporting via the jack interface Some devices provide support for detection of a small number of buttons on their jacks. One common implementation provides a single button, implemented by shorting the microphone to ground and detected along with microphone presence detection by detecting varying current draws on the microphone bias signal. Provide support for up to three buttons via the jack interface. These default to reporting BTN_n but an API is provided to allow these to be remapped to other keys by the machine driver where it knows what the keys are. More keys can be added with ease if required. This is only intended to support simple accessory button designs. If the interface is limiting then either creating a child device for the accessory or accessing the input device in the jack directly is recommended. Signed-off-by: Mark Brown commit 1c6e555c3a66af29a51690748ca54314e62c16d5 Author: Mark Brown Date: Wed Mar 17 15:36:38 2010 +0000 ALSA: Rename jack switch table in preparation for button support Avoids confusion when we have button support. Signed-off-by: Mark Brown commit 2acebe9ecb2b77876e87a1480729cfb2db4570dd Author: Jack Steiner Date: Wed Mar 17 10:40:38 2010 -0500 x86, UV: Delete unneeded boot messages SGI:UV: Delete extra boot messages that describe the system topology. These messages are no longer useful. Signed-off-by: Jack Steiner LKML-Reference: <20100317154038.GA29346@sgi.com> Signed-off-by: Ingo Molnar commit c01ae818a3e3578747861d9a0c7fabe9641786c1 Author: Zhitong Wang Date: Wed Mar 17 16:28:25 2010 +0100 netfilter: remove unused headers in net/netfilter/nfnetlink.c Remove unused headers in net/netfilter/nfnetlink.c Signed-off-by: Zhitong Wang Signed-off-by: Patrick McHardy commit 606a9a02633c02d0e09fc96706f041053dbc57ee Author: Tim Gardner Date: Wed Mar 17 16:18:56 2010 +0100 netfilter: xt_recent: check for unsupported user space flags Signed-off-by: Tim Gardner Signed-off-by: Patrick McHardy commit 0079c5aee34880bcee7feee9960f0502c73dc5fa Author: Tim Gardner Date: Tue Mar 16 19:53:13 2010 +0100 netfilter: xt_recent: add an entry reaper One of the problems with the way xt_recent is implemented is that there is no efficient way to remove expired entries. Of course, one can write a rule '-m recent --remove', but you have to know beforehand which entry to delete. This commit adds reaper logic which checks the head of the LRU list when a rule is invoked that has a '--seconds' value and XT_RECENT_REAP set. If an entry ceases to accumulate time stamps, then it will eventually bubble to the top of the LRU list where it is then reaped. Signed-off-by: Tim Gardner Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 5be4a4f589841ef06fd79b241de3d5353a6c5efa Author: Jan Engelhardt Date: Mon Mar 1 11:55:33 2010 +0100 netfilter: xt_recent: remove old proc directory The compat option was introduced in October 2008. Signed-off-by: Jan Engelhardt commit 06bf514e3199150c715ab72e8e0e335ae8f99666 Author: Jan Engelhardt Date: Sun Feb 28 23:22:35 2010 +0100 netfilter: xt_recent: update description It had IPv6 for quite a while already :-) Signed-off-by: Jan Engelhardt commit 8244f4baf5e1793a75a1d4409efc3e2d9d71c9cb Author: Jan Engelhardt Date: Sun Feb 28 23:22:04 2010 +0100 netfilter: ebt_ip6: add principal maintainer in a MODULE_AUTHOR tag Cc: Kuo-Lang Tseng Signed-off-by: Jan Engelhardt commit 408ffaa4a11ddd6f730be520479fd5cd890c57d3 Author: Jan Engelhardt Date: Sun Feb 28 23:19:52 2010 +0100 netfilter: update my email address Signed-off-by: Jan Engelhardt commit 0cb47ea24d2f72ca91bbe60e1c831f57e03efa20 Author: Jan Engelhardt Date: Tue Mar 16 18:25:12 2010 +0100 netfilter: xtables: schedule xt_NOTRACK for removal It is being superseded by xt_CT (-j CT --notrack). Signed-off-by: Jan Engelhardt commit b8f00ba27e4acc4a2224360ce3aa8a22354434c5 Author: Jan Engelhardt Date: Fri Feb 26 14:20:32 2010 +0100 netfilter: xtables: merge xt_CONNMARK into xt_connmark Signed-off-by: Jan Engelhardt commit 28b949885f80efb87d7cebdcf879c99db12c37bd Author: Jan Engelhardt Date: Sat Feb 28 03:23:57 2009 +0100 netfilter: xtables: merge xt_MARK into xt_mark Two arguments for combining the two: - xt_mark is pretty useless without xt_MARK - the actual code is so small anyway that the kmod metadata and the module in its loaded state totally outweighs the combined actual code size. i586-before: -rw-r--r-- 1 jengelh users 3821 Feb 10 01:01 xt_MARK.ko -rw-r--r-- 1 jengelh users 2592 Feb 10 00:04 xt_MARK.o -rw-r--r-- 1 jengelh users 3274 Feb 10 01:01 xt_mark.ko -rw-r--r-- 1 jengelh users 2108 Feb 10 00:05 xt_mark.o text data bss dec hex filename 354 264 0 618 26a xt_MARK.o 223 176 0 399 18f xt_mark.o And the runtime size is like 14 KB. i586-after: -rw-r--r-- 1 jengelh users 3264 Feb 18 17:28 xt_mark.o Signed-off-by: Jan Engelhardt commit 44c5873199a90a45e9d64a86a1f54b1ccab21ec8 Author: Jan Engelhardt Date: Fri Feb 26 14:14:22 2010 +0100 netfilter: xtables: add comment markers to Xtables Kconfig Signed-off-by: Jan Engelhardt commit f76a47c83247b453f25629618056a6d2c1e39103 Author: Jan Engelhardt Date: Fri Jun 5 15:22:15 2009 +0200 netfilter: xt_NFQUEUE: consolidate v4/v6 targets into one Signed-off-by: Jan Engelhardt commit 076f7839dd30b379f3cd468b13cf513cdcd5cee7 Author: Jan Engelhardt Date: Thu Mar 11 00:38:44 2010 +0100 netfilter: xt_CT: par->family is an nfproto Signed-off-by: Jan Engelhardt commit dd76769dd53bdb804a4b02a3eb256f4740f78720 Author: Mark Brown Date: Wed Mar 17 11:51:33 2010 +0000 ASoC: Refresh WM8750 bias management The WM8750 is using some delayed work to manage the ramping of the bias at startup and resume out of line from the normal flow. This predates the support within ASoC core for moving the resume out of line from the main system resume which provides equivalent functionality with better interaction with applications. Change to doing the ramp in line to make use of the core functionality. Signed-off-by: Mark Brown Acked-by: Mark Brown commit a6c65736bc2e63392334bd800f1b2754ab55db1e Author: Mark Brown Date: Wed Mar 3 17:45:21 2010 +0000 ASoC: Remove current PGA control handling A code audit reveals that there are currently no users of the widget controls on PGAs. This is likely to continue to be the case since while there are useful things that can be done with integrating the PGA gain and mute controls with the power sequencing userspace generally wants stereo controls for output stages which this doesn't map onto well. In preparation for implementing something more useful strip out the existing code, leaving the parameters there for use by the new code. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d6dc0b4ead6e8720096ecfa3d9e899b47ddbc8ed Author: Robert Richter Date: Wed Mar 17 12:49:13 2010 +0100 perf/core, x86: Remove duplicate perf_event_mask variable The same information is stored also in x86_pmu.intel_ctrl. This patch removes perf_event_mask and instead uses x86_pmu.intel_ctrl directly. Signed-off-by: Robert Richter Cc: Stephane Eranian Cc: Peter Zijlstra LKML-Reference: <1268826553-19518-5-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 10f1014d86fd4fe5087080d609b51183396c5e4c Author: Robert Richter Date: Wed Mar 17 12:49:12 2010 +0100 perf/core, x86: Remove cpu_hw_events.interrupts This member in the struct is not used anymore and can be removed. Signed-off-by: Robert Richter Cc: Stephane Eranian Cc: Peter Zijlstra LKML-Reference: <1268826553-19518-4-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 141c4296cb630a7ed4c3730913bc3c0617ef9753 Author: Robert Richter Date: Wed Mar 17 12:49:11 2010 +0100 perf/core: Correct files in MAINTAINERS entry This corrects the file entries for perf_events. The following files are caught now: $ xargs | eval ls $(cat) | sort -u kernel/perf_event*.c include/linux/perf_event.h arch/*/kernel/perf_event*.c arch/*/kernel/*/perf_event*.c arch/*/kernel/*/*/perf_event*.c arch/*/include/asm/perf_event.h arch/*/lib/perf_event*.c arch/*/kernel/perf_callchain.c arch/alpha/include/asm/perf_event.h arch/arm/include/asm/perf_event.h arch/arm/kernel/perf_event.c arch/frv/include/asm/perf_event.h arch/frv/lib/perf_event.c arch/parisc/include/asm/perf_event.h arch/powerpc/include/asm/perf_event.h arch/powerpc/kernel/perf_callchain.c arch/powerpc/kernel/perf_event.c arch/s390/include/asm/perf_event.h arch/sh/include/asm/perf_event.h arch/sh/kernel/cpu/sh4a/perf_event.c arch/sh/kernel/cpu/sh4/perf_event.c arch/sh/kernel/perf_callchain.c arch/sh/kernel/perf_event.c arch/sparc/include/asm/perf_event.h arch/sparc/kernel/perf_event.c arch/x86/include/asm/perf_event.h arch/x86/kernel/cpu/perf_event_amd.c arch/x86/kernel/cpu/perf_event.c arch/x86/kernel/cpu/perf_event_intel.c arch/x86/kernel/cpu/perf_event_p6.c include/linux/perf_event.h kernel/perf_event.c Signed-off-by: Robert Richter Cc: Stephane Eranian Cc: Peter Zijlstra LKML-Reference: <1268826553-19518-3-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit b27ea29c6267889be255f2217fa7a6106e6a8b04 Author: Robert Richter Date: Wed Mar 17 12:49:10 2010 +0100 perf/core, x86: Reduce number of CONFIG_X86_LOCAL_APIC macros The function reserve_pmc_hardware() and release_pmc_hardware() were hard to read. This patch improves readability of the code by removing most of the CONFIG_X86_LOCAL_APIC macros. Signed-off-by: Robert Richter Cc: Stephane Eranian Cc: Peter Zijlstra LKML-Reference: <1268826553-19518-2-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 3b0d516463f8deb897a55cb81e9dbbe58a2490ed Author: Ingo Molnar Date: Wed Mar 17 12:13:28 2010 +0100 perf probe: Fix !dwarf build Fix the !drawf build. This uses the existing NO_DWARF_SUPPORT mechanism we use for that, but it's really fragile and needs a cleanup. (in a separate patch) 1) Such uses: #ifndef NO_DWARF_SUPPORT are double inverted logic a'la 'not not'. Instead the flag should be called DWARF_SUPPORT. 2) Furthermore, assymetric #ifdef polluted code flow like: if (need_dwarf) #ifdef NO_DWARF_SUPPORT die("Debuginfo-analysis is not supported"); #else /* !NO_DWARF_SUPPORT */ pr_debug("Some probes require debuginfo.\n"); fd = open_vmlinux(); is very fragile and not acceptable. Instead of that helper functions should be created and the dwarf/no-dwarf logic should be separated more cleanly. 3) Local variable #ifdefs like this: #ifndef NO_DWARF_SUPPORT int fd; #endif Are fragile as well and should be eliminated. Helper functions achieve that too. Cc: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220612.32050.33806.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 7df2f32956cf0f1a45df38cd0e0fe0c3467580e8 Author: Masami Hiramatsu Date: Tue Mar 16 18:06:26 2010 -0400 perf probe: Add data structure member access support Support accessing members in the data structures. With this, perf-probe accepts data-structure members(IOW, it now accepts dot '.' and arrow '->' operators) as probe arguemnts. e.g. ./perf probe --add 'schedule:44 rq->curr' ./perf probe --add 'vfs_read file->f_op->read file->f_path.dentry' Note that '>' can be interpreted as redirection in command-line. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220626.32050.57552.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit fb1587d869a399554220e166d4b90b581a8ade01 Author: Masami Hiramatsu Date: Tue Mar 16 18:06:19 2010 -0400 perf probe: List probes with line number and file name Improve --list to show current exist probes with line number and file name. This enables user easily to check which line is already probed. for example: ./perf probe --list probe:vfs_read (on vfs_read:8@linux-2.6-tip/fs/read_write.c) Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220619.32050.48702.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 4235b0454ebeefc2295ad8417e18a8761425b19e Author: Masami Hiramatsu Date: Tue Mar 16 18:06:12 2010 -0400 perf probe: Introduce kprobe_trace_event and perf_probe_event Introduce kprobe_trace_event and perf_probe_event and replace old probe_point structure with it. probe_point structure is not enough flexible nor extensible. New data structures will help implementing further features. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220612.32050.33806.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit f4d7da499e4fc1fdff8f26fdeb1a058d475a7a6c Author: Masami Hiramatsu Date: Tue Mar 16 18:06:05 2010 -0400 perf probe: Add --dry-run option Add --dry-run option for debugging and testing. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220605.32050.6571.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 016f262e4fb10c6ecff709317098912f94a21efa Author: Masami Hiramatsu Date: Tue Mar 16 18:05:58 2010 -0400 perf probe: Introduce die_find_child() function Introduce die_find_child() function to integrate DIE-tree searching functions. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220558.32050.7905.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 95a3e4c4e21de1920a2ddb54bfc57c0af7e2561e Author: Masami Hiramatsu Date: Tue Mar 16 18:05:51 2010 -0400 perf probe: Rename some die_get_* functions Rename die_get_real_subprogram and die_get_inlinefunc to die_find_real_subprogram and die_find_inlinefunc respectively, because these functions search its children. After that, 'die_get_' means getting a property of that die, and 'die_find_' means searching DIE-tree to get an appropriate child die. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220551.32050.36181.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 12a1fadb41b5a6733c36b488b881fb19a28c92d3 Author: Masami Hiramatsu Date: Tue Mar 16 18:05:44 2010 -0400 perf probe: Rename session to param Since this name 'session' conflicts with 'perf_session', and this structure just holds parameters anymore. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220544.32050.8788.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit e0faa8d35845bb1893cf9e608a5a5d92e9390bf0 Author: Masami Hiramatsu Date: Tue Mar 16 18:05:37 2010 -0400 perf probe: Move add-probe routine to util/ Move add-probe routine to util/probe_event.c. This simplifies main routine for reducing maintenance cost. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220537.32050.72214.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 31facc5f1ac674fbcc29f212377e589396bb934c Author: Masami Hiramatsu Date: Tue Mar 16 18:05:30 2010 -0400 perf probe: Use wrapper functions Use wrapped functions as much as possible, to check out of memory conditions in perf probe. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220530.32050.53951.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit a1d37d5285bcda07f9c0b80a2634ca20ab545297 Author: Masami Hiramatsu Date: Tue Mar 16 18:05:21 2010 -0400 perf tools: Introduce xzalloc() for detecting out of memory conditions Introducing xzalloc() which wrapping zalloc() for detecting out of memory conditions. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: <20100316220521.32050.85155.stgit@localhost6.localdomain6> [ -v2: small cleanups in surrounding code ] Signed-off-by: Ingo Molnar commit e4713e93b125497e9ba44d93de1bd9d8e5ad8946 Merge: 984763c a6b8457 Author: Ingo Molnar Date: Wed Mar 17 11:31:45 2010 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: We'll be queueing dependent changes. Signed-off-by: Ingo Molnar commit a6b84574eed7e4fd8cb8dac2d0926fe2cf34b941 Author: Frederic Weisbecker Date: Tue Mar 16 01:05:02 2010 +0100 perf: Fix unexported generic perf_arch_fetch_caller_regs perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should not have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! -v2: And also only build it if trace events are enabled. -v3: Fix changelog mistake Reported-by: Stephen Rothwell Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Xiao Guangrong Cc: Paul Mackerras LKML-Reference: <1268697902-9518-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 984763cb90d4b5444baa0c3e43feff7926bf1834 Author: Robert Richter Date: Tue Mar 16 17:07:33 2010 +0100 perf, x86: Report error code that returned from x86_pmu.hw_config() If x86_pmu.hw_config() fails a fixed error code (-EOPNOTSUPP) is returned even if a different error was reported. This patch fixes this. Signed-off-by: Robert Richter Acked-by: Cyrill Gorcunov Acked-by: Lin Ming Cc: acme@redhat.com Cc: eranian@google.com Cc: gorcunov@openvz.org Cc: peterz@infradead.org Cc: fweisbec@gmail.com LKML-Reference: <20100316160733.GR1585@erda.amd.com> Signed-off-by: Ingo Molnar commit 2a0761a35b70f170a9c14ecbcb6a959fb6e7bdf3 Author: Mark Brown Date: Tue Mar 16 15:54:12 2010 +0000 ASoC: Implement WM835x microphone jack detection support The WM8350 provides microphone presence and short circuit detection. Integrate this with the ASoC jack reporting API. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e50208a080a8abdfa6c85865362a1cf329e9fe31 Author: David S. Miller Date: Tue Mar 16 23:36:24 2010 -0700 e1000e: Fix build with CONFIG_PM disabled. Signed-off-by: David S. Miller commit fa05e1ad1b61b37fb64a66794c11ab478e975c56 Author: Joe Perches Date: Tue Mar 16 21:24:32 2010 -0700 drivers/net/e100.c: Use pr_ and netif_ Convert DPRINTK, commonly used for debugging, to netif_ Remove #define PFX Use #define pr_fmt Consistently use no periods for non-sentence logging messages Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit abf35df21513c51d7761c41fa6d3b819cdf4103e Author: Jason Gunthorpe Date: Tue Mar 9 09:17:42 2010 +0000 NET: Support clause 45 MDIO commands at the MDIO bus level IEEE 802.3ae clause 45 specifies a somewhat modified MDIO protocol for use by 10GIGE phys. The main change is a 21 bit address split into a 5 bit device ID and a 16 bit register offset. The definition is designed so that normal and extended devices can run on the same MDIO bus. Extend mdio-bitbang to do the new protocol. At the MDIO bus level the protocol is requested by or'ing MII_ADDR_C45 into the register offset. Make phy_read/phy_write/etc pass a full 32 bit register offset. This does not attempt to make the phy layer support C45 style PHYs, just to provide the MDIO bus support. Tested against a Broadcom 10GE phy with ID 0x206034, and several Broadcom 10/100/1000 Phys in normal mode. Signed-off-by: Jason Gunthorpe Signed-off-by: David S. Miller commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133 Author: Rafael J. Wysocki Date: Sun Mar 14 14:35:17 2010 +0000 e1000e / PCI / PM: Add basic runtime PM support (rev. 4) Use the PCI runtime power management framework to add basic PCI runtime PM support to the e1000e driver. Namely, make the driver suspend the device when the link is off and set it up for generating a wakeup event after the link has been detected again. [This feature is disabled until the user space enables it with the help of the /sys/devices/.../power/contol device attribute.] Based on a patch from Matthew Garrett. Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit e175944115db6762d3e98520c709e5a87f933c61 Author: Rafael J. Wysocki Date: Sun Mar 14 14:33:51 2010 +0000 r8169 / PCI / PM: Add simplified runtime PM support (rev. 3) Use the PCI runtime power management framework to add basic PCI runtime PM support to the r8169 driver. Namely, make the driver suspend the device when the link is not present and set it up for generating a wakeup event after the link has been detected again. [This feature is disabled until the user space enables it with the help of the /sys/devices/.../power/contol device attribute.] Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit ff6e2163f28a1094fb5ca5950fe2b43c3cf6bc7a Author: Jiri Pirko Date: Mon Mar 1 05:09:14 2010 +0000 net: convert multiple drivers to use netdev_for_each_mc_addr, part7 In mlx4, using char * to store mc address in private structure instead. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 0dc7d2b3cbfcf4ff20bdc68f563a2e52e6a2178f Author: Joe Perches Date: Sat Feb 27 14:43:51 2010 +0000 drivers/net/ks*: Use netdev_, netif_ and pr_ I'm not sure this is correct. It changes logging macros from: dev_(&ks->spidev->dev, to netdev_(ks->netdev, Comments? Use netdev_ Use netif_ Use pr_ Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Add missing line to message in ks8851_remove Change kmalloc/memset(,0) to kzalloc Remove ks_ macros Consolidation code into set_media_state Signed-off-by: David S. Miller commit ca50910185fcce694af0cc194de50d2374a7c7ef Author: Neil Horman Date: Mon Mar 15 07:58:45 2010 +0000 tipc: Allow retransmission of cloned buffers Forward port commit fc477e160af086f6e30c3d4fdf5f5c000d29beb5 from git://tipc.cslab.ericsson.net/pub/git/people/allan/tipc.git Origional commit message: Allow retransmission of cloned buffers This patch fixes an issue with TIPC's message retransmission logic that prevented retransmission of clone sk_buffs. Originally intended as a means of avoiding wasted work in retransmitting messages that were still on the driver's outbound queue, it also prevented TIPC from retransmitting messages through other means -- such as the secondary bearer of the broadcast link, or another interface in a set of bonded interfaces. This fix removes existing checks for cloned sk_buffs that prevented such retransmission. Origionally-Signed-off-by: Allan Stephens Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 1a624832a06b465d0e5651901bcbc3680c78d374 Author: Neil Horman Date: Mon Mar 15 08:02:24 2010 +0000 tipc: Increase frequency of load distribution over broadcast link Forward port commit 29eb572941501c40ac6e62dbc5043bf9ee76ee56 from git://tipc.cslab.ericsson.net/pub/git/people/allan/tipc.git Origional commit message: Increase frequency of load distribution over broadcast link This patch enhances the behavior of TIPC's broadcast link so that it alternates between redundant bearers (if available) after every message sent, rather than after every 10 messages. This change helps to speed up delivery of retransmitted messages by ensuring that they are not sent repeatedly over a bearer that is no longer working, but not yet recognized as failed. Tested by myself in the latest net-2.6 tree using the tipc sanity test suite Origionally-signed-off-by: Allan Stephens Signed-off-by: Neil Horman bcast.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) Signed-off-by: David S. Miller commit 10708f37ae729baba9b67bd134c3720709d4ae62 Author: Jan Engelhardt Date: Thu Mar 11 09:57:29 2010 +0000 net: core: add IFLA_STATS64 support `ip -s link` shows interface counters truncated to 32 bit. This is because interface statistics are transported only in 32-bit quantity to userspace. This commit adds a new IFLA_STATS64 attribute that exports them in full 64 bit. References: http://lkml.indiana.edu/hypermail/linux/kernel/0307.3/0215.html Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 6ce1a6df6efbbeaa262a225a1a439ebc30a75d2e Author: Jan Engelhardt Date: Thu Mar 11 09:57:28 2010 +0000 net: tcp: make veno selectable as default congestion module Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit dd2acaa7bcb150dadac0b17c8eb654b0712a62ab Author: Jan Engelhardt Date: Thu Mar 11 09:57:27 2010 +0000 net: tcp: make hybla selectable as default congestion module Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 2fb3573dfbca0bd853ddc1e47617eb446fa3deae Author: Eric Dumazet Date: Tue Mar 9 20:03:38 2010 +0000 net: remove rcu locking from fib_rules_event() We hold RTNL at this point and dont use RCU variants of list traversals, we dont need rcu_read_lock()/rcu_read_unlock() Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 14bb4789833a2e2610f30e2d3e1451701ac96ec1 Author: stephen hemminger Date: Tue Mar 2 13:32:09 2010 +0000 bridge: per-cpu packet statistics (v3) The shared packet statistics are a potential source of slow down on bridged traffic. Convert to per-cpu array, but only keep those statistics which change per-packet. Signed-off-by: Stephen Hemminger Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 0a9627f2649a02bea165cfd529d7bcb625c2fcad Author: Tom Herbert Date: Tue Mar 16 08:03:29 2010 +0000 rps: Receive Packet Steering This patch implements software receive side packet steering (RPS). RPS distributes the load of received packet processing across multiple CPUs. Problem statement: Protocol processing done in the NAPI context for received packets is serialized per device queue and becomes a bottleneck under high packet load. This substantially limits pps that can be achieved on a single queue NIC and provides no scaling with multiple cores. This solution queues packets early on in the receive path on the backlog queues of other CPUs. This allows protocol processing (e.g. IP and TCP) to be performed on packets in parallel. For each device (or each receive queue in a multi-queue device) a mask of CPUs is set to indicate the CPUs that can process packets. A CPU is selected on a per packet basis by hashing contents of the packet header (e.g. the TCP or UDP 4-tuple) and using the result to index into the CPU mask. The IPI mechanism is used to raise networking receive softirqs between CPUs. This effectively emulates in software what a multi-queue NIC can provide, but is generic requiring no device support. Many devices now provide a hash over the 4-tuple on a per packet basis (e.g. the Toeplitz hash). This patch allow drivers to set the HW reported hash in an skb field, and that value in turn is used to index into the RPS maps. Using the HW generated hash can avoid cache misses on the packet when steering it to a remote CPU. The CPU mask is set on a per device and per queue basis in the sysfs variable /sys/class/net//queues/rx-/rps_cpus. This is a set of canonical bit maps for receive queues in the device (numbered by ). If a device does not support multi-queue, a single variable is used for the device (rx-0). Generally, we have found this technique increases pps capabilities of a single queue device with good CPU utilization. Optimal settings for the CPU mask seem to depend on architectures and cache hierarcy. Below are some results running 500 instances of netperf TCP_RR test with 1 byte req. and resp. Results show cumulative transaction rate and system CPU utilization. e1000e on 8 core Intel Without RPS: 108K tps at 33% CPU With RPS: 311K tps at 64% CPU forcedeth on 16 core AMD Without RPS: 156K tps at 15% CPU With RPS: 404K tps at 49% CPU bnx2x on 16 core AMD Without RPS 567K tps at 61% CPU (4 HW RX queues) Without RPS 738K tps at 96% CPU (8 HW RX queues) With RPS: 854K tps at 76% CPU (4 HW RX queues) Caveats: - The benefits of this patch are dependent on architecture and cache hierarchy. Tuning the masks to get best performance is probably necessary. - This patch adds overhead in the path for processing a single packet. In a lightly loaded server this overhead may eliminate the advantages of increased parallelism, and possibly cause some relative performance degradation. We have found that masks that are cache aware (share same caches with the interrupting CPU) mitigate much of this. - The RPS masks can be changed dynamically, however whenever the mask is changed this introduces the possibility of generating out of order packets. It's probably best not change the masks too frequently. Signed-off-by: Tom Herbert include/linux/netdevice.h | 32 ++++- include/linux/skbuff.h | 3 + net/core/dev.c | 335 +++++++++++++++++++++++++++++++++++++-------- net/core/net-sysfs.c | 225 ++++++++++++++++++++++++++++++- net/core/skbuff.c | 2 + 5 files changed, 538 insertions(+), 59 deletions(-) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 768bbedf9ca4cc4784eae2003f37abe0818fe0b0 Author: Tina Yang Date: Thu Mar 11 13:50:07 2010 +0000 RDS: Enable per-cpu workqueue threads Create per-cpu workqueue threads instead of a single krdsd thread. This is a step towards better scalability. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 561c7df63e259203515509a7ad075382a42bff0c Author: Andy Grover Date: Thu Mar 11 13:50:06 2010 +0000 RDS: Do not call set_page_dirty() with irqs off set_page_dirty() unconditionally re-enables interrupts, so if we call it with irqs off, they will be on after the call, and that's bad. This patch moves the call after we've re-enabled interrupts in send_drop_to(), so it's safe. Also, add BUG_ONs to let us know if we ever do call set_page_dirty with interrupts off. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 450d06c0208ad195ccd74a7edd11321e316791ad Author: Sherman Pun Date: Thu Mar 11 13:50:05 2010 +0000 RDS: Properly unmap when getting a remote access error If the RDMA op has aborted with a remote access error, in addition to what we already do (tell userspace it has completed with an error) also unmap it and put() the rm. Otherwise, hangs may occur on arches that track maps and will not exit without proper cleanup. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit b98ba52f96e7cdb4dbe2b06bced83d95d94c9d02 Author: Andy Grover Date: Thu Mar 11 13:50:04 2010 +0000 RDS: only put sockets that have seen congestion on the poll_waitq rds_poll_waitq's listeners will be awoken if we receive a congestion notification. Bad performance may result because *all* polled sockets contend for this single lock. However, it should not be necessary to wake pollers when a congestion update arrives if they have never experienced congestion, and not putting these on the waitq will hopefully greatly reduce contention. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 550a8002e4340eaf3bc333e33b59427e9c20272d Author: Tina Yang Date: Thu Mar 11 13:50:03 2010 +0000 RDS: Fix locking in rds_send_drop_to() It seems rds_send_drop_to() called __rds_rdma_send_complete(rs, rm, RDS_RDMA_CANCELED) with only rds_sock lock, but not rds_message lock. It raced with other threads that is attempting to modify the rds_message as well, such as from within rds_rdma_send_complete(). Signed-off-by: Tina Yang Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 97069788d6784ac92d050557a02f6e7bf4d1f53d Author: Andy Grover Date: Thu Mar 11 13:50:02 2010 +0000 RDS: Turn down alarming reconnect messages RDS's error messages when a connection goes down are a little extreme. A connection may go down, and it will be re-established, and everything is fine. This patch links these messages through rdsdebug(), instead of to printk directly. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 571c02fa81e43ebb4b793f626d6c7bf0fa18902b Author: Andy Grover Date: Thu Mar 11 13:50:01 2010 +0000 RDS: Workaround for in-use MRs on close causing crash if a machine is shut down without closing sockets properly, and freeing all MRs, then a BUG_ON will bring it down. This patch changes these to WARN_ONs -- leaking MRs is not fatal (although not ideal, and there is more work to do here for a proper fix.) Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 048c15e641289d902f7ef9f1241068d8045e210c Author: Tina Yang Date: Thu Mar 11 13:50:00 2010 +0000 RDS: Fix send locking issue Fix a deadlock between rds_rdma_send_complete() and rds_send_remove_from_sock() when rds socket lock and rds message lock are acquired out-of-order. Signed-off-by: Tina Yang Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 2e7b3b994529d4760231a45a6b88950187bda877 Author: Andy Grover Date: Thu Mar 11 13:49:59 2010 +0000 RDS: Fix congestion issues for loopback We have two kinds of loopback: software (via loop transport) and hardware (via IB). sw is used for 127.0.0.1, and doesn't support rdma ops. hw is used for sends to local device IPs, and supports rdma. Both are used in different cases. For both of these, when there is a congestion map update, we want to call rds_cong_map_updated() but not actually send anything -- since loopback local and foreign congestion maps point to the same spot, they're already in sync. The old code never called sw loop's xmit_cong_map(),so rds_cong_map_updated() wasn't being called for it. sw loop ports would not work right with the congestion monitor. Fixing that meant that hw loopback now would send congestion maps to itself. This is also undesirable (racy), so we check for this case in the ib-specific xmit code. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 8e82376e5f72bb576504c8c6117685e56c1b97db Author: Andy Grover Date: Thu Mar 11 13:49:58 2010 +0000 RDS/TCP: Wait to wake thread when write space available Instead of waking the send thread whenever any send space is available, wait until it is at least half empty. This is modeled on how sock_def_write_space() does it, and may help to minimize context switches. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit b075cfdb666d6fa90c55c8619186398a3c4fd865 Author: Andy Grover Date: Thu Mar 11 13:49:57 2010 +0000 RDS: update copy_to_user state in tcp transport Other transports use rds_page_copy_user, which updates our s_copy_to_user counter. TCP doesn't, so it needs to explicity call rds_stats_add(). Reported-by: Richard Frank Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 1123fd734df6ad82373a5a27f0f2ed3115555b9d Author: Andy Grover Date: Thu Mar 11 13:49:56 2010 +0000 RDS: sendmsg() should check sndtimeo, not rcvtimeo Most likely cut n paste error - sendmsg() was checking sock_rcvtimeo. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 735f61e62611161588123930823af6e6a9fd5c2c Author: Andy Grover Date: Thu Mar 11 13:49:55 2010 +0000 RDS: Do not BUG() on error returned from ib_post_send BUGging on a runtime error code should be avoided. This patch also eliminates all other BUG()s that have no real reason to exist. Signed-off-by: Andy Grover Signed-off-by: David S. Miller commit 61f8603d93fa0b0e2f73be7a4f048696417a24a3 Author: NeilBrown Date: Wed Feb 3 17:31:31 2010 +1100 nfsd: factor out hash functions for export caches. Both the _lookup and the _update functions for these two caches independently calculate the hash of the key. So factor out that code for improved reuse. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 09a08cff3d13315c948e6aee5cf912f8f1db54e7 Author: Bruno Randolf Date: Wed Mar 3 18:45:42 2010 +0900 mac80211: (really) fix rates setup on IBSS merge when an IBSS merge happened, the supported rates for the newly added station were left empty, causing the rate control module to be initialized with only the basic rates. the section of the ibss code which deals with updating supported rates for an already existing station failed to inform the rate control module about the new rates. as both minstrel and pid don't have an update function i just use the init function. also remove unnecessary (unsigned long long) casts and edit debug message. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 819386dfc67e770b4a0b59983f7948f8ddaa357e Author: John W. Linville Date: Tue Mar 16 15:02:35 2010 -0400 Revert "mac80211: fix rates setup on IBSS merge" I accidentally merged an incomplete version of the patch... This reverts commit b4d59a9317e41faec3d0b6a03f0454d1e8abb710. Signed-off-by: John W. Linville commit bf18723d50206a0b485e438f14c22faf91a3908f Author: Alban Browaeys Date: Sun Feb 28 17:14:40 2010 +0100 rt2x00: Fix TX status reporting for rt2800pci. After testing, we found that TX_STA_FIFO_MCS is the last MCS value tried. If the transmission failed, 8 frames have been transmitted. If the transmission succeed, we can easily compute the number of retry. This patch fix the way status is reported to mac80211 rate control. It has 2 bugs : 1. mcs can contain the short preamble flag and it will lead to wrong computations. 2. minstrel nearly always say that 54 Mbits is the best rate, even if we are very far from the AP Signed-off-by: Benoit Papillault Signed-off-by: Alban Browaeys Acked-by: Ivo van Doorn Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 632dd959d13d7b96b8eeb2af77b4511053c04633 Author: Alban Browaeys Date: Fri Feb 26 23:19:59 2010 +0100 rt2x00: txdone implementation supporting hw encryption. This is an implementation that support WCID being the encryption key. Wireless Cli Id was set to be the encryption key in rt2800pci_write_tx_desc and read (TX_STA_FIFO_WCID) as the current queue entry index. Signed-off-by: Benoit Papillault Signed-off-by: Alban Browaeys Acked-by: Ivo van Doorn Signed-off-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit fbc2dae854da5fc44e2ce2f97446c8bd283c7e17 Author: Mark Brown Date: Tue Mar 16 14:26:45 2010 +0000 ASoC: Support GPIO based microphone detection for WM8904 The WM8904 allows microphone detection signals to be brought out as alternate functions of the GPIO signals which can be detected using interrupt inputs on the CPU. Allow this to be configured using platform data. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit cdce4e9ba7ff86a5f43b971a9af88b25a3f6c9a4 Author: Mark Brown Date: Tue Mar 16 12:01:28 2010 +0000 ASoC: Allow configuration of WM8904 GPIO pin functions Provide platform data allowing the configuration of the GPIO pins on the WM8904 to be selected, allowing alternate functions to be enabled. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7245387e36e16ae918467685c34510606fd74b7c Author: Mark Brown Date: Mon Mar 15 21:22:58 2010 +0000 ASoC: Implement interrupt driven microphone detection for WM8903 Support use of the WM8903 IRQ for reporting of microphone presence and short detection. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 8abd16a65d81756706016720e2cc7eeb81d06a2e Author: Mark Brown Date: Mon Mar 15 18:25:26 2010 +0000 ASoC: Add WM8903 interrupt support Currently used to detect completion of the write sequencer. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 37f88e8407f75fc6ced5cefb633c314556de3ad1 Author: Mark Brown Date: Mon Mar 15 18:14:34 2010 +0000 ASoC: Initial WM8903 microphone bias and short detection Provide support for WM8903 microphone presence and short detection using the GPIOs to route out a logic signal suitable for handling using snd_soc_jack_add_gpios() on the processor GPIOs. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 73b34ead7429789f35eea147a3e185abd61c7d94 Author: Mark Brown Date: Mon Mar 15 17:46:02 2010 +0000 ASoC: Add GPIO configuration support for WM8903 Allow users to pass in a default configuration for the GPIOs of the WM8903 as platform data. This allows configuration of the pin muxing of the device. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit da34183e640ed380f708bf9ebcd592afda619028 Author: Mark Brown Date: Mon Mar 15 19:23:37 2010 +0000 ASoC: Allow pins to be force enabled Allow pins to be forced on regardless of their power state. This is intended for use with microphone bias supplies which need to be enabled in order to support microphone detection - in systems without appropriate hardware leaving the microphone unbiased when not in use saves power. The force done at power check time in order to avoid disrupting other power detection logic. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e82f5cfa6389893e3e17f928d4c4f402b10c79eb Author: Mark Brown Date: Mon Mar 15 18:28:45 2010 +0000 ASoC: Remove unused 'muted' flag from DAPM widgets Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 88393161210493e317ae391696ee8ef463cb3c23 Author: Thomas Weber Date: Tue Mar 16 11:47:56 2010 +0100 Fix typos in comments [Ss]ytem => [Ss]ystem udpate => update paramters => parameters orginal => original Signed-off-by: Thomas Weber Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina commit 5cc718b9dad682329a60e73547c6e708faa5bbe4 Author: Masami Hiramatsu Date: Mon Mar 15 13:00:54 2010 -0400 kprobes: Hide CONFIG_OPTPROBES and set if arch supports optimized kprobes Hide CONFIG_OPTPROBES and set if the arch supports optimized kprobes (IOW, HAVE_OPTPROBES=y), since this option doesn't change the major behavior of kprobes, and workarounds for minor changes are documented. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Dieter Ries Cc: Ananth N Mavinakayanahalli Cc: OGAWA Hirofumi Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <20100315170054.31593.3153.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 6427462bfa50f50dc6c088c07037264fcc73eca1 Author: Dan Carpenter Date: Mon Mar 15 11:21:48 2010 +0300 sched: Remove some dead code This was left over from "7c9414385e sched: Remove USER_SCHED" Signed-off-by: Dan Carpenter Acked-by: Dhaval Giani Cc: Kay Sievers Cc: Greg Kroah-Hartman LKML-Reference: <20100315082148.GD18181@bicker> Signed-off-by: Ingo Molnar commit 8ea7f544100844307072cae2f5fc108afdef999a Author: Lin Ming Date: Tue Mar 16 10:12:36 2010 +0800 x86, perf: Fix comments in Pentium-4 PMU definitions Reported-by: Cyrill Gorcunov Signed-off-by: Lin Ming Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1268705556.3379.8.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit 1d199b1ad606ae8b88acebd295b101c4e1cf2a57 Author: Frederic Weisbecker Date: Tue Mar 16 01:05:02 2010 +0100 perf: Fix unexported generic perf_arch_fetch_caller_regs perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should not have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! -v2: And also only build it if trace events are enabled. -v3: Fix changelog mistake Reported-by: Stephen Rothwell Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Xiao Guangrong Cc: Paul Mackerras LKML-Reference: <1268697902-9518-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 310de047eef6685274045db1e6b39c9f313df428 Author: James Morris Date: Tue Mar 16 08:47:36 2010 +1100 selinux: fix warning in genheaders Fix const warning in the genheaders script as a result of changes to the headers, as noted here: http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-03/msg03977.html Reported-by: Stephen Rothwell Signed-off-by: James Morris commit 77c160e7798b4141a0705c734397a9236bb0e726 Author: Stephen Smalley Date: Mon Mar 15 10:42:11 2010 -0400 SELinux: Reduce max avtab size to avoid page allocation failures Reduce MAX_AVTAB_HASH_BITS so that the avtab allocation is an order 2 allocation rather than an order 4 allocation on x86_64. This addresses reports of page allocation failures: http://marc.info/?l=selinux&m=126757230625867&w=2 https://bugzilla.redhat.com/show_bug.cgi?id=570433 Reported-by: Russell Coker Signed-off-by: Stephen D. Smalley Acked-by: Eric Paris Signed-off-by: James Morris commit d6e36ec1d04edec73fedeea89ec8027e3d215dcb Author: Helmut Schaa Date: Mon Mar 15 17:22:26 2010 +0100 rt2x00: fix warning when building rt2800pci with just soc support Fix compile warning "rt2800pci.c:1248: warning: 'rt2800pci_device_table' defined but not used" when building rt2800pci with only soc support (without pci). Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 27ae60f8f7aac221b428422eecafddaa7aff9549 Author: Pavel Roskin Date: Fri Mar 12 00:01:22 2010 -0500 ipw2x00: replace "ieee80211" with "libipw" where appropriate "ieee80211" was the old name of the common library for ipw2100 and ipw2200. It was renamed to "libipw", but some occurrences of the old name remained. Rename alloc_ieee80211() to alloc_libipw() and free_ieee80211() to free_libipw(). Adjust comments and label names. Change prefixes in diagnostic messages. Keep /proc/net/ieee80211 under the original name to avoid breaking user interface. Move the affected EXPORT_SYMBOL macros to their proper places. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 484b4dd582867c6cfec3a1feb128d60af21c4978 Author: Pavel Roskin Date: Thu Mar 11 23:13:28 2010 -0500 orinoco: disable support for prism chipset by default The hostap driver provides better support for Prism chipset. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 1e3f7ac81ef81f25d8d8d902b73d884f97e6aa21 Author: Grazvydas Ignotas Date: Thu Mar 11 17:45:07 2010 +0200 wl1251: reduce eeprom read wait time 4sec wait is way too pessimistic, TI driver uses 40ms here, and testing shows that is ebough, so let's also use that. While at it, add useful sounding comment from the TI driver. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit 3f9e750d130b4a4d9f8226642b46ed17d8357f40 Author: Grazvydas Ignotas Date: Thu Mar 11 17:44:57 2010 +0200 wl1251: fix ELP_CTRL register accesses when using SDIO For some unknown reason ELP_CTRL can't be accesed using sdio_memcpy_* functions (any attemts to do so result in timeouts): wl1251: ERROR sdio write failed (-110) wl1251: ERROR sdio read failed (-110) wl1251: WARNING WLAN not ready To fix this, add special IO functions for ELP_CTRL access that are using sdio_readb/sdio_writeb. Similar handling is done in TI reference driver from Android code drop. Signed-off-by: Grazvydas Ignotas Cc: Bob Copeland Acked-by: Kalle Valo Signed-off-by: John W. Linville commit 3c9cb9c38a1368b1e3f187f23c1a56883ec656c2 Author: Grazvydas Ignotas Date: Fri Mar 12 12:28:41 2010 +0200 wl1251: make local symbols static Make local functions and data static, also constify some structures. While at it, clean up unneeded includes. Signed-off-by: Grazvydas Ignotas Cc: Bob Copeland Acked-by: Kalle Valo Signed-off-by: John W. Linville commit eaf55530c94cb7adcd320c28ed6c7d463c9a3727 Author: Felix Fietkau Date: Thu Mar 11 16:28:24 2010 +0100 mac80211: optimize tx status processing When a cooked monitor interface is active, ieee80211_tx_status() generates a radiotap header for every single frame, even if it wasn't injected and thus won't be sent to a monitor interface. This patch reduces cpu utilization by moving the cooked monitor check a bit earlier, before it generates the rtap header. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 819cf15e7cde0a1b0fa4f831478f792434f55679 Author: Stewart Malik Date: Thu Mar 11 20:28:29 2010 +1030 DRIVER: Libertas: Fixed coding style in rx.c Signed-off-by: John W. Linville commit 200763bb7503102aa364658e2b32cb2463a08d91 Author: John W. Linville Date: Wed Mar 10 11:08:50 2010 -0500 ath5k: remove unused beacon timer code Signed-off-by: John W. Linville commit a93b7aec657e3bd01ef043dff46d3c27dba26bb3 Author: John W. Linville Date: Wed Mar 10 11:08:49 2010 -0500 ath5k: remove dead source in ath5k_combine_linear_pcdac_curves This code was commented-out when it was added about a year ago and remains unchanged -- seems as if we don't need it... Signed-off-by: John W. Linville commit 6fe10e760bcde8c29b84ad16f54015af5ef59ff5 Author: John W. Linville Date: Wed Mar 10 11:08:48 2010 -0500 ath5k: remove some dead functions "ath5k: remove stale function declarations, make some functions static" commented-out some unused functions. This removes them. Signed-off-by: John W. Linville Acked-by: Bob Copeland commit f3a981ffddcc9671505b85ead976630878116434 Author: matthieu castet Date: Sun Feb 28 15:42:54 2010 +0100 airo : Print of firmware version For the firmware version 5.30.17 the log file shows: Firmware version 5.30.11 The variable softSubVer is binary. Signed-off-by: Matthieu CASTET Signed-off-by: Jose Alonso Signed-off-by: John W. Linville commit 3bc819e8d4dd385e481137b2dbe3b7d23314319e Author: matthieu castet Date: Sun Feb 28 15:31:21 2010 +0100 airo : fix printing status info For some status, reason is encoded in the low byte, but airo_print_status forgot tp mask low byte in status parsing. This make it only work when reason is 0. Signed-off-by: Matthieu CASTET Signed-off-by: John W. Linville commit 1da05f50f6a766c7611102382f85183b4db96c2d Author: Joe Perches Date: Mon Mar 15 18:03:05 2010 +0100 netfilter: net/netfilter/ipvs/ip_vs_ftp.c: Remove use of NIPQUAD NIPQUAD has very few uses left. Remove this use and make the code have the identical form of the only other use of "%u,%u,%u,%u,%u,%u" in net/ipv4/netfilter/nf_nat_ftp.c Signed-off-by: Joe Perches Acked-by: Simon Horman Signed-off-by: Patrick McHardy commit d06d92b7c9b99ea52bdaeb13f544675529891b8a Author: Arnaldo Carvalho de Melo Date: Mon Mar 15 13:04:33 2010 -0300 perf annotate: Properly notify the user that vmlinux is missing Before this patch we would not find a vmlinux, then try to pass objdump "[kernel.kallsyms]" as the filename, it would get confused and produce no output: [root@doppio ~]# perf annotate n_tty_write ------------------------------------------------ Percent | Source code & Disassembly of [kernel.kallsyms] ------------------------------------------------ Now we check that and emit meaningful warning: [root@doppio ~]# perf annotate n_tty_write Can't annotate n_tty_write: No vmlinux file was found in the path: [0] vmlinux [1] /boot/vmlinux [2] /boot/vmlinux-2.6.34-rc1-tip+ [3] /lib/modules/2.6.34-rc1-tip+/build/vmlinux [4] /usr/lib/debug/lib/modules/2.6.34-rc1-tip+/vmlinux [root@doppio ~]# This bug was introduced when we added automatic search for vmlinux, before that time the user had to specify a vmlinux file. v2: Print the warning just for the first symbol found when no symbol name is specified, otherwise it will spam the screen repeating the warning for each symbol. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: LKML-Reference: <1268669073-6856-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b0a9ab62ab96e258a0ddd81d7fe2719c3db36006 Author: Arnaldo Carvalho de Melo Date: Mon Mar 15 11:46:58 2010 -0300 perf top: Properly notify the user that vmlinux is missing Before this patch this message would very briefly appear on the screen and then the screen would get updates only on the top, for number of interrupts received, etc, but no annotation would be performed: [root@doppio linux-2.6-tip]# perf top -s n_tty_write > /tmp/bla objdump: '[kernel.kallsyms]': No such file Now this is what the user gets: [root@doppio linux-2.6-tip]# perf top -s n_tty_write Can't annotate n_tty_write: No vmlinux file was found in the path: [0] vmlinux [1] /boot/vmlinux [2] /boot/vmlinux-2.6.33-rc5 [3] /lib/modules/2.6.33-rc5/build/vmlinux [4] /usr/lib/debug/lib/modules/2.6.33-rc5/vmlinux [root@doppio linux-2.6-tip]# This bug was introduced when we added automatic search for vmlinux, before that time the user had to specify a vmlinux file. Reported-by: David S. Miller Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: LKML-Reference: <1268664418-28328-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit bedbfdea31daf3880745001d56450c683959ee7e Author: Eric B Munson Date: Mon Mar 15 11:46:57 2010 -0300 perf record: Enable the enable_on_exec flag if record forks the target When forking its target, perf record can capture data from before the target application is started. Perf stat uses the enable_on_exec flag in the event attributes to keep from displaying events from before the target program starts, this patch adds the same functionality to perf record when it is will fork the target process. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <1268664418-28328-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 932fb06b0898f5883200f1da2e00075f0d70ba9c Author: Robert P. J. Day Date: Sat Mar 13 07:58:13 2010 -0500 kobj: kref.h incorrectly describes itself as kref.c. Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina commit 108afd0491e5bc2abda08645685da69d36688cb6 Author: Huang Weiyi Date: Mon Mar 15 15:34:03 2010 +0100 omfs: remove unused version.h include Signed-off-by: Huang Weiyi Signed-off-by: Bob Copeland Signed-off-by: Jiri Kosina commit 30c96ce56a195963764de9521087202ba73e9bff Author: Jani Nikula Date: Thu Mar 11 18:15:53 2010 +0200 powerpc/BSR: fix device_create() return value check Use IS_ERR() instead of comparing to NULL. Signed-off-by: Jani Nikula Acked-by: Sonny Rao Signed-off-by: Jiri Kosina commit 3e21ec224f0acbd2e9beeb3dea04edc1d36dbe1f Author: Robert P. J. Day Date: Thu Mar 11 06:32:44 2010 -0500 kobj: add comment and multiple inclusion protection Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina commit 320cc51d90832231cece478f0db6550ef367f8f3 Author: Greg Thelen Date: Mon Mar 15 15:27:28 2010 +0100 mm: fix typo in refill_stock() comment Change refill_stock() comment: s/consumt_stock()/consume_stock()/ Signed-off-by: Greg Thelen Acked-by: Daisuke Nishimura Signed-off-by: Jiri Kosina commit 32e688b8c1afafa389223a4813b97e8c128a1636 Author: Rob Landley Date: Mon Mar 15 15:21:31 2010 +0100 Documentation/filesystems/proc.txt typo fix. Typo fix for a filename in procfs documentation. Signed-off-by: Rob Landley Signed-off-by: Jiri Kosina commit 31a2d31dbd01a7d530a748e6f708ba047c37fb90 Author: Thomas Weber Date: Fri Feb 19 12:43:44 2010 +0100 kconfig: util: Fix typo in comment sting replaced with string Signed-off-by: Thomas Weber Signed-off-by: Jiri Kosina commit b4452d1fbf3fe30435850d2971d700e0ab3852b6 Author: Mark Brown Date: Sun Mar 14 22:05:40 2010 +0000 ASoC: Remove version display from WM8750 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 12b8aeee3e51654fb95a3baff2e093f2513bb87d Merge: 2526849 a3d3203 Author: Ingo Molnar Date: Mon Mar 15 08:17:33 2010 +0100 Merge branch 'linus' into timers/core Conflicts: Documentation/feature-removal-schedule.txt Merge reason: Resolve the conflict, update to upstream. Signed-off-by: Ingo Molnar commit e4495262826d1eabca3529fa6ac22394eb348132 Author: Cyrill Gorcunov Date: Mon Mar 15 12:58:22 2010 +0800 perf, x86: Enable not tagged retired instruction counting on P4s This should turn on instruction counting on P4s, which was missing in the first version of the new PMU driver. It's inaccurate for now, we still need dependant event to tag mops before we can count them precisely. The result is that the number of instruction may be lifted up. Signed-off-by: Cyrill Gorcunov Signed-off-by: Lin Ming Cc: Peter Zijlstra LKML-Reference: <1268629102.3355.11.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar commit d202cce8963d9268ff355a386e20243e8332b308 Author: NeilBrown Date: Wed Feb 3 17:31:31 2010 +1100 sunrpc: never return expired entries in sunrpc_cache_lookup If sunrpc_cache_lookup finds an expired entry, remove it from the cache and return a freshly created non-VALID entry instead. This ensures that we only ever get a usable entry, or an entry that will become usable once an update arrives. i.e. we will never need to repeat the lookup. This allows us to remove the 'is_expired' test from cache_check (i.e. from cache_is_valid). cache_check should never get an expired entry as 'lookup' will never return one. If it does happen - due to inconvenient timing - then just accept it as still valid, it won't be very much past it's use-by date. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 2f50d8b63dd6e5320a9d223298df19df3502da29 Author: NeilBrown Date: Wed Feb 3 17:31:31 2010 +1100 sunrpc/cache: factor out cache_is_expired This removes a tiny bit of code duplication, but more important prepares for following patch which will perform the expiry check in cache_lookup and the rest of the validity check in cache_check. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 3af4974eb2c7867d6e160977195dfde586d0e564 Author: NeilBrown Date: Wed Feb 3 17:31:31 2010 +1100 sunrpc: don't keep expired entries in the auth caches. currently expired entries remain in the auth caches as long as there is a reference. This was needed long ago when the auth_domain cache used the same cache infrastructure. But since that (being a very different sort of cache) was separated, this test is no longer needed. So remove the test on refcnt and tidy up the surrounding code. This allows the cache_dequeue call (which needed to be there to drop a potentially awkward reference) can be moved outside of the spinlock which is a better place for it. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 8576e1971663ffdb6139041de97cdd2e1d4791cc Author: Cyrill Gorcunov Date: Sat Mar 13 11:11:16 2010 +0300 x86, perf: Unmask LVTPC only if we have APIC supported Ingo reported: | | There's a build failure on -tip with the P4 driver, on UP 32-bit, if | PERF_EVENTS is enabled but UP_APIC is disabled: | | arch/x86/built-in.o: In function `p4_pmu_handle_irq': | perf_event.c:(.text+0xa756): undefined reference to `apic' | perf_event.c:(.text+0xa76e): undefined reference to `apic' | So we have to unmask LVTPC only if we're configured to have one. Reported-by: Ingo Molnar Signed-off-by: Cyrill Gorcunov CC: Lin Ming CC: Peter Zijlstra LKML-Reference: <20100313081116.GA5179@lenovo> Signed-off-by: Ingo Molnar commit 567e54790e5c07152a93b6de4d0210af8b77da87 Author: Arnaldo Carvalho de Melo Date: Fri Mar 12 21:05:10 2010 -0300 perf tools: Fix non-newt build The use_browser needs to be in a file that is always built and also we need a browser__show_help stub in that case. Reported-by: Anton Blanchard Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268438710-32697-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit f5c9c9be267f73eda6a668ac81ddde56ed7fa793 Author: John Stultz Date: Wed Mar 3 19:57:27 2010 -0800 sparc: Convert sparc to use read/update_persistent_clock This patch converts the sparc architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. [ davem: compile fix: Here's a version that compiles, you have to get rid of the now unused variably last_rtc_update since we build with -Werror ] Signed-off-by: John Stultz Acked-by: David S. Miller Cc: Andrew Morton Cc: sparclinux@vger.kernel.org Signed-off-by: Thomas Gleixner commit 8eff8a5c1d3a1de7a2d173e0effc6cc9bcbb5177 Author: John Stultz Date: Wed Mar 3 19:57:28 2010 -0800 cris: Convert cris to use read/update_persistent_clock This patch converts the cris architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Mikael Starvik Cc: Jesper Nilsson Cc: Andrew Morton LKML-Reference: <1267675049-12337-14-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit ffbcad49e79cd82428010b44a87401446ea7f370 Author: John Stultz Date: Wed Mar 3 19:57:26 2010 -0800 m68k: Convert m68k to use read/update_persistent_clock This patch converts the m68k architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Geert Uytterhoeven Cc: Andrew Morton LKML-Reference: <1267675049-12337-12-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 944694716d6ea3c274a73c830bf33e194bad4bcd Author: John Stultz Date: Wed Mar 3 19:57:25 2010 -0800 m32r: Convert m32r to use read/update_peristent_clock This patch converts the m32r architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Hirokazu Takata Cc: Andrew Morton LKML-Reference: <1267675049-12337-11-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit cb0e996378900fa05d5c779d6bfa52d55ebc3407 Author: John Stultz Date: Wed Mar 3 19:57:24 2010 -0800 blackfin: Convert blackfin to use read/update_persistent_clock This patch converts the blackfin architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Mike Frysinger Cc: Andrew Morton LKML-Reference: <1267675049-12337-10-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 6ffdc5774a9ef80e58db398a8307d5b2db2644ce Author: John Stultz Date: Wed Mar 3 19:57:22 2010 -0800 ia64: Convert ia64 to use read/update_persistent_clock This patch converts the ia64 architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Tony Luck Cc: Fenghua Yu Cc: Andrew Morton LKML-Reference: <1267675049-12337-8-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit e2032a4a7237e97cd2ee36e2d806c5742ace189f Author: John Stultz Date: Wed Mar 3 19:57:21 2010 -0800 avr32: Convert avr32 to use read/update_persistent_clock This patch converts the avr32 architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Haavard Skinnemoen Cc: Andrew Morton LKML-Reference: <1267675049-12337-7-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 12833c1e373ad2b12667ca159d335fae29968473 Author: John Stultz Date: Wed Mar 3 19:57:20 2010 -0800 h8300: Convert h8300 to use read/update_persistent_clock This patch converts the h8300 architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: Yoshinori Sato Cc: Andrew Morton LKML-Reference: <1267675049-12337-6-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 739b27116a0e6903d6c85d6769e69f43d8fa4128 Author: John Stultz Date: Wed Mar 3 19:57:18 2010 -0800 frv: Convert frv to use read/update_persistent_clock This patch converts the frv architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: David Howells Cc: Andrew Morton LKML-Reference: <1267675049-12337-4-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit f7a56575fa4e62e94a644f72ef8c5d423c073982 Author: John Stultz Date: Wed Mar 3 19:57:17 2010 -0800 mn10300: Convert mn10300 to use read/update_persistent_clock This patch converts the mn10300 architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Cc: David Howells Cc: Koichi Yasutake Cc: Andrew Morton LKML-Reference: <1267675049-12337-3-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 1e871be1aa97babb467a929d6adcb1960659928b Author: John Stultz Date: Wed Mar 3 19:57:16 2010 -0800 alpha: Convert alpha to use read/update_persistent_clock This patch converts the alpha architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. igned-off-by: John Stultz Cc: Richard Henderson Cc: Andrew Morton LKML-Reference: <1267675049-12337-2-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 104f9c471ffb425fd081074ef31521b38d77592a Author: John Stultz Date: Thu Mar 11 14:11:39 2010 -0800 xtensa: Fix unnecessary setting of xtime xtensa supports read_persisitent_clock(), so there is no reason for the arch specific code to be setting xtime. Setting xtime will be done by the generic timekeeping code. Signed-off-by: John Stultz Cc: Chris Zankel Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit c4507257764ae0387f0d8c2ca57808f37e4c9439 Author: John Stultz Date: Thu Mar 11 14:04:47 2010 -0800 time: Clean up direct xtime usage in xen Cleanup xen's direct use of internal timekeeping values. Signed-off-by: John Stultz Acked-by: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 25268498c9e07870323aead10751b7c6e99a3a78 Author: John Stultz Date: Fri Mar 12 14:56:00 2010 -0800 time: Add xtime, wall_to_monotonic to feature-removal-schedule They aren't really features, but fair warning to out of tree driver folks who might be accessing these variables. Signed-off-by: John Stultz CC: Ingo Molnar LKML-Reference: <1268434560-2677-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit fdb19a6cb48407c59a2007063f4005c9384603c3 Author: Jens Rottmann Date: Thu Mar 11 14:04:44 2010 -0800 cs5535-clockevt: Free timer in IRQ setup error path Due to a hardware limitation cs5535_mfgpt_free_timer() cannot actually release the timer hardware, but it will at least free the now unreferenced struct associated with it so calling it is the cleaner thing to do. Signed-off-by: Jens Rottmann Acked-by: Andres Salomon Cc: Jordan Crouse Cc: Ingo Molnar Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 802702e0c2618465b813242d4dfee6a233ba0beb Author: Thomas Gleixner Date: Fri Mar 12 20:13:23 2010 +0100 timer: Try to survive timer callback preempt_count leak If a timer callback leaks preempt_count we currently assert a BUG(). That makes it unnecessarily hard to retrieve information about the problem especially on laptops and headless stations. There is a decent chance to survive the preempt_count leak by restoring the preempt_count to the value before the callback. That allows in many cases to get valuable information about the root cause of the problem. We carried that fixup in preempt-rt for years and were able to decode such wreckage quite a few times. Signed-off-by: Thomas Gleixner Cc: Linux Torvalds Cc: Andrew Morton Cc: Arjan van de Veen commit 576da126a6c7364d70dfd58d0bbe43d05cf5859f Author: Thomas Gleixner Date: Fri Mar 12 21:10:29 2010 +0100 timer: Split out timer function call The ident level is starting to be annoying. More white space than actual code. Split out the timer function call into its own function. Signed-off-by: Thomas Gleixner commit 06f71b922ce5a05352acd706564ca4ae1f2add0e Author: Uwe Kleine-König Date: Thu Mar 11 14:04:46 2010 -0800 timer: Print function name for timer callbacks modifying preemption count A function scheduled with a timer must not exit with a different preempt count than it was entered. To make helping users running into the corresponding BUG() easier also print the name of the bad function not only its address. [ tglx: Sanitized printk ] Signed-off-by: Uwe Kleine-König Cc: johnstul@us.ibm.com Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 64ce4c2f5252f25798117fa80a027993163d6d84 Author: John Stultz Date: Thu Mar 11 14:04:47 2010 -0800 time: Clean up warp_clock() warp_clock() currently accesses timekeeping internal state directly, which is unnecessary. Convert it to use the proper timekeeping interfaces. Signed-off-by: John Stultz Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit c28739375bf0d6e239b4fa939ec8372aa2c707d2 Author: Stanislaw Gruszka Date: Thu Mar 11 14:04:42 2010 -0800 cpu-timers: Avoid iterating over all threads in fastpath_timer_check() Spread p->sighand->siglock locking scope to make sure that fastpath_timer_check() never iterates over all threads. Without locking there is small possibility that signal->cputimer will stop running while we write values to signal->cputime_expires. Calling thread_group_cputime() from fastpath_timer_check() is not only bad because it is slow, also it is racy with __exit_signal() which can lead to invalid signal->{s,u}time values. Signed-off-by: Stanislaw Gruszka Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 1f169f84d25a74fb2dc67274d31d082ce30c60fb Author: Stanislaw Gruszka Date: Thu Mar 11 14:04:41 2010 -0800 cpu-timers: Change SIGEV_NONE timer implementation When user sets up a timer without associated signal and process does not use any other cpu timers and does not exit, tsk->signal->cputimer is enabled and running forever. Avoid running the timer for no reason. I used below program to check patch does not break current user space visible behavior. #include #include #include #include #include #include #include #include void consume_cpu(void) { int i = 0; int count = 0; for(i=0; i<100000000; i++) count++; } int main(void) { int i; struct sigaction act; struct sigevent evt = { }; timer_t tid; struct itimerspec spec = { }; evt.sigev_notify = SIGEV_NONE; assert(timer_create(CLOCK_PROCESS_CPUTIME_ID, &evt, &tid) == 0); spec.it_value.tv_sec = 10; assert(timer_settime(tid, 0, &spec, NULL) == 0); for (i = 0; i < 30; i++) { consume_cpu(); memset(&spec, 0, sizeof(spec)); assert(timer_gettime(tid, &spec) == 0); printf("%lu.%09lu\n", (unsigned long) spec.it_value.tv_sec, (unsigned long) spec.it_value.tv_nsec); } assert(timer_delete(tid) == 0); return 0; } Signed-off-by: Stanislaw Gruszka Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit ae1a78eecc45fe41215d9dbfd7079999455772d6 Author: Stanislaw Gruszka Date: Thu Mar 11 14:04:39 2010 -0800 cpu-timers: Return correct previous timer reload value According POSIX we need to correctly set old timer it_interval value when user request that in timer_settime(). Tested using below program. #include #include #include #include #include #include #include int main(void) { struct sigaction act; struct sigevent evt = { }; timer_t tid; struct itimerspec spec, u_spec, k_spec; evt.sigev_notify = SIGEV_SIGNAL; evt.sigev_signo = SIGPROF; assert(timer_create(CLOCK_PROCESS_CPUTIME_ID, &evt, &tid) == 0); spec.it_value.tv_sec = 1; spec.it_value.tv_nsec = 2; spec.it_interval.tv_sec = 3; spec.it_interval.tv_nsec = 4; u_spec = spec; assert(timer_settime(tid, 0, &spec, NULL) == 0); spec.it_value.tv_sec = 5; spec.it_value.tv_nsec = 6; spec.it_interval.tv_sec = 7; spec.it_interval.tv_nsec = 8; assert(timer_settime(tid, 0, &spec, &k_spec) == 0); #define PRT(val) printf(#val ":\t%d/%d\n", (int) u_spec.val, (int) k_spec.val) PRT(it_value.tv_sec); PRT(it_value.tv_nsec); PRT(it_interval.tv_sec); PRT(it_interval.tv_nsec); return 0; } Signed-off-by: Stanislaw Gruszka Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 5eb9aa6414bdab6d075a8763bc3b647181ef3aab Author: Stanislaw Gruszka Date: Thu Mar 11 14:04:38 2010 -0800 cpu-timers: Cleanup arm_timer() Signed-off-by: Stanislaw Gruszka Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit f55db609042faecd5e518ce372b87f846659b32e Author: Stanislaw Gruszka Date: Thu Mar 11 14:04:37 2010 -0800 cpu-timers: Simplify RLIMIT_CPU handling Let always set signal->cputime_expires expiration cache when setting new itimer, POSIX 1.b timer, and RLIMIT_CPU. Since we are initializing prof_exp expiration cache during fork(), this allows to remove "RLIMIT_CPU != inf" check from fastpath_timer_check() and do some other cleanups. Checked against regression using test cases from: http://marc.info/?l=linux-kernel&m=123749066504641&w=4 http://marc.info/?l=linux-kernel&m=123811277916642&w=2 Signed-off-by: Stanislaw Gruszka Cc: Ingo Molnar Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Hidetoshi Seto Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 0308635917273030db6121d67c41ef2279b30340 Merge: 3997d37 0b86122 Author: Ingo Molnar Date: Fri Mar 12 21:06:35 2010 +0100 Merge branch 'perf/x86' into perf/core Merge reason: The new P4 driver is stable and ready now for more testing. Signed-off-by: Ingo Molnar commit 3997d3776a6e89586e76a0ef355bfbbd8a76966c Author: Arnaldo Carvalho de Melo Date: Fri Mar 12 12:46:48 2010 -0300 perf hist: Don't fprintf the callgraph unconditionally [root@doppio ~]# perf report -i newt.data | head -10 # Samples: 11999679868 # # Overhead Command Shared Object Symbol # ........ ....... ............................. ...... # 63.61% perf libslang.so.2.1.4 [.] SLsmg_write_chars 6.30% perf perf [.] symbols__find 2.19% perf libnewt.so.0.52.10 [.] newtListboxAppendEntry 2.08% perf libslang.so.2.1.4 [.] SLsmg_write_chars@plt 1.99% perf libc-2.10.2.so [.] _IO_vfprintf_internal [root@doppio ~]# Not good, the newt form for report works, but slang has to eat the cost of the additional callgraph lines everytime it prints a line, and the callgraph doesn't appear on the screen, so move the callgraph printing to a separate function and don't use it in newt.c. Newt tree widgets are being investigated to properly support callgraphs, but till that gets merged, lets remove this huge overhead and show at least the symbol overheads for a callgraph rich perf.data with good performance. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268408808-13595-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cb7afb7092bc502b890f0a897ffd67c2b078d347 Author: Arnaldo Carvalho de Melo Date: Fri Mar 12 12:46:47 2010 -0300 perf newt: Use newtGetScreenSize For consistency, use the newt API more fully. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268408808-13595-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 7081e087b90d4eb4348f7970bd6b266d837321ef Author: Arnaldo Carvalho de Melo Date: Fri Mar 12 10:48:12 2010 -0300 perf newt: Add 'Q', 'q' and Ctrl+C as ways to exit from forms These are keys people expect when pressed to exit the current widget, so have associate all of them to this semantic. Suggested-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268401692-9361-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 23caaf19b11eda7054348452e1618d4512a86907 Author: Daniel Mack Date: Thu Mar 11 21:13:25 2010 +0100 ALSA: usb-mixer: Add support for Audio Class v2.0 USB Audio Class v2.0 compliant devices have different descriptors and a different way of setting/getting min/max/res/cur properties. This patch adds support for them. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 99fc86450c439039d2ef88d06b222fd51a779176 Author: Daniel Mack Date: Thu Mar 11 21:13:24 2010 +0100 ALSA: usb-mixer: parse descriptors with structs Introduce a number of new structs for mixer, selector, feature and processing units and some static inline helpers to access fields which have dynamic offsets. Use them in mixer.c to parse the descriptors. This is necessary for the upcoming audio v2 parsers. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit f0b5e634ff25e02a64676022ee13284a9c810879 Author: Daniel Mack Date: Thu Mar 11 21:13:23 2010 +0100 ALSA: usbmixer: rename usbmixer.[ch] -> mixer.[ch] For clearer namespace, also rename usbmixer_maps.c -> mixer_maps.c Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 7b1eda223debcba706ab989a09c4eecb327aebdf Author: Daniel Mack Date: Thu Mar 11 21:13:22 2010 +0100 ALSA: usb-mixer: factor out quirks Move all non-standard mixer controls and vendor-specific extensions to a separate file. Some structs need to be exported now. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 45d760567a7d773237b8996584a4ae0440d5e369 Author: Daniel Mack Date: Thu Mar 11 21:13:21 2010 +0100 ALSA: usb-mixer: use defines from audio.h No need for the private enum. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 7e847894039d7590321de306fca2b1ae58662f29 Author: Daniel Mack Date: Thu Mar 11 21:13:20 2010 +0100 linux/usb/audio.h: split header - Split the audio.h file in two to clearly denote the differences between the standards. - Add many more defines to audio-v2.h. Most of them are not currently used. - Replaced a magic value with a proper define Signed-off-by: Daniel Mack Acked-by: Greg Kroah-Hartman Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 75581d2459d3e6e5e796a42b362e4abb612bc958 Author: Peter Ujfalusi Date: Wed Mar 3 15:08:09 2010 +0200 ASoC: OMAP3: Report delay caused by the internal FIFO Use the new delay calback function to report the delay through ALSA for application caused by the internal FIFO. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7dc976ed38a927fc9880bd3dc498a6a903d1ba74 Author: Peter Ujfalusi Date: Wed Mar 3 15:08:08 2010 +0200 OMAP3: McBSP: Add interface for FIFO caused delay query New functions for querying the FIFO caused delay on both TX and RX path. On TX path the return value shows the number of used locations in the FIFO. On RX papth it returns the number of locations to be filled to reach the threshold value (DMA will be triggered to read the data out from the FIFO). Signed-off-by: Peter Ujfalusi Acked-by: Tony Lindgren Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit eeb309a8a6ff86ce462e072bc95ecbe85618505e Author: Peter Ujfalusi Date: Thu Mar 11 16:26:22 2010 +0200 ASoC: tlv320dac33: Add option for keeping the BCLK running Platform data option for the codec to keep the BCLK clock continuously running in FIFO modes (codec master). OMAP3 McBSP when in slave mode needs continuous BCLK running on the serial bus in order to operate correctly. Since in FIFO mode the DAC33 can also shut down the BCLK clock and enable it only when it is needed, let the platforms decide if the CPU side needs the BCLK running or not. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c3746a07f13f8711885fd3909c03477a1b47ab82 Author: Peter Ujfalusi Date: Thu Mar 11 16:26:21 2010 +0200 ASoC: tlv320dac33: Start/stop sequence change To avoid race condition especially in FIFO modes the sequence for enabling and disabling the codec need to be changed. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit aa9b88ee80d3985ebae9567a8f4e0d07ce15b5a7 Author: Miguel Aguilar Date: Thu Mar 11 09:33:40 2010 -0600 DaVinci: DM365: Voice Codec support for the DM365 EVM The DM365 EVM has two codecs: the Audio Codec (AIC3x) and the Voice Codec, the idea is to have both enabled in the same kernel simultaneously. However, the current soc-core doesn't support simultaneous codecs, once that support will have added, a patch will be posted to enable both codecs in the DM365 EVM. Signed-off-by: Miguel Aguilar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b56e972b75a945e97818437720551859c7ef2d53 Author: Miguel Aguilar Date: Thu Mar 11 09:32:59 2010 -0600 ASoC: DaVinci: CQ93VC Voice Codec Currently the DM365 is the only SoC that includes this Voice Codec. Signed-off-by: Miguel Aguilar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e155fcc23c918f5d78a35d1eb6f3f0d523f51991 Author: Miguel Aguilar Date: Thu Mar 11 09:32:42 2010 -0600 ASoC: DaVinci: Voice Codec Interface This patch adds the support for the interface needed by the DaVinci Voice Codec CQ93VC. Signed-off-by: Miguel Aguilar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit ca26308c2223cb424c297a70fb7b6c7530a563ba Author: Miguel Aguilar Date: Thu Mar 11 09:32:21 2010 -0600 MFD: DaVinci Voice Codec This is the MFD driver for the DaVinci Voice codec, it has two clients: * Voice codec interface * Voice codec CQ93VC Signed-off-by: Miguel Aguilar Acked-by: Samuel Ortiz Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d9ad6296ec3b4a55ba25f2c5e4824be487242e1f Author: Jassi Brar Date: Fri Mar 12 13:38:52 2010 +0900 ASoC: PCM_RATE: Check for KNOT and CONTINUOUS flags For ASoC, if either CPU or CODEC driver has set the flag, the MACHINE driver should be given a chance to figure out if the dai, that set the flag, can accomodate a rate that it does not explicitly specify but is specified by the dai at the other end of the link. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f9224c5c944b60cf709db4adf1f5195264b8d194 Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 20:12:44 2010 -0300 perf report: Implement initial UI using newt Newt has widespread availability and provides a rather simple API as can be seen by the size of this patch. The work needed to support it will benefit other frontends too. In this initial patch it just checks if the output is a tty, if not it falls back to the previous behaviour, also if newt-devel/libnewt-dev is not installed the previous behaviour is maintaned. Pressing enter on a symbol will annotate it, ESC in the annotation window will return to the report symbol list. More work will be done to remove the special casing in color_fprintf, stop using fmemopen/FILE in the printing of hist_entries, etc. Also the annotation doesn't need to be done via spawning "perf annotate" and then browsing its output, we can do better by calling directly the builtin-annotate.c functions, that would then be moved to tools/perf/util/annotate.c and shared with perf top, etc But lets go by baby steps, this patch already improves perf usability by allowing to quickly do annotations on symbols from the report screen and provides a first experimentation with libnewt/TUI integration of tools. Tested on RHEL5 and Fedora12 X86_64 and on Debian PARISC64 to browse a perf.data file collected on a Fedora12 x86_64 box. Signed-off-by: Arnaldo Carvalho de Melo Cc: Avi Kivity Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268349164-5822-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit dd2ee78dd8e4c6d6f1a333fd60c3dd27d1b07042 Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 20:12:43 2010 -0300 perf tools: Add missing bytes printed in hist_entry__fprintf We need those to properly size the browser widht in the newt TUI. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268349164-5822-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit b4f5296f0eec2aa7061dfd8bb8c0744f095f9bd1 Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 20:12:42 2010 -0300 perf tools: Use eprintf for pr_{err,warning,info} too Just like we do for pr_debug, so that we can have a single point where to redirect to the currently used output system, be it stdio or newt. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268349164-5822-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 895f0edc3cd04a2a3de2c608ba20821b832a8abb Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 20:12:41 2010 -0300 perf top: Export get_window_dimensions Will be used by the newt code too. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268349164-5822-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit fe2197b8bb2f318c1e0b0f589f24f781dd27d1f2 Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 20:12:40 2010 -0300 perf symbols: Bump plt synthesizing warning debug level Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268349164-5822-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 937779db13fb6cb621e28d9ae0a6cf1d05b57d05 Merge: 6230f2c 9f591fd Author: Ingo Molnar Date: Fri Mar 12 10:20:57 2010 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: We want to queue up a dependent patch. Signed-off-by: Ingo Molnar commit 0b861225a5890f22445f08ca9cc7a87cff276ff7 Author: Cyrill Gorcunov Date: Fri Mar 12 00:50:16 2010 +0300 x86, perf: Fix NULL deref on not assigned x86_pmu In case of not assigned x86_pmu and software events NULL dereference may being hit via x86_pmu::schedule_events method. Fix it by checking if x86_pmu is initialized at all. Signed-off-by: Cyrill Gorcunov Cc: Lin Ming Cc: Arnaldo Carvalho de Melo Cc: Stephane Eranian Cc: Robert Richter Cc: Frederic Weisbecker Cc: Peter Zijlstra LKML-Reference: <20100311215016.GG25162@lenovo> Signed-off-by: Ingo Molnar commit 6230f2c7ef01a69e2ba9370326572c287209d32a Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 15:53:12 2010 -0300 perf record: Mention paranoid sysctl when failing to create counter [acme@mica linux-2.6-tip]$ perf record -a -f Fatal: Permission error - are you root? Consider tweaking /proc/sys/kernel/perf_event_paranoid. [acme@mica linux-2.6-tip]$ Suggested-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268333592-30872-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit a072738e04f0eb26370e39ec679e9a0d65e49aea Author: Cyrill Gorcunov Date: Thu Mar 11 19:54:39 2010 +0300 perf, x86: Implement initial P4 PMU driver The netburst PMU is way different from the "architectural perfomance monitoring" specification that current CPUs use. P4 uses a tuple of ESCR+CCCR+COUNTER MSR registers to handle perfomance monitoring events. A few implementational details: 1) We need a separate x86_pmu::hw_config helper in struct x86_pmu since register bit-fields are quite different from P6, Core and later cpu series. 2) For the same reason is a x86_pmu::schedule_events helper introduced. 3) hw_perf_event::config consists of packed ESCR+CCCR values. It's allowed since in reality both registers only use a half of their size. Of course before making a real write into a particular MSR we need to unpack the value and extend it to a proper size. 4) The tuple of packed ESCR+CCCR in hw_perf_event::config doesn't describe the memory address of ESCR MSR register so that we need to keep a mapping between these tuples used and available ESCR (various P4 events may use same ESCRs but not simultaneously), for this sake every active event has a per-cpu map of hw_perf_event::idx <--> ESCR addresses. 5) Since hw_perf_event::idx is an offset to counter/control register we need to lift X86_PMC_MAX_GENERIC up, otherwise kernel strips it down to 8 registers and event armed may never be turned off (ie the bit in active_mask is set but the loop never reaches this index to check), thanks to Peter Zijlstra Restrictions: - No cascaded counters support (do we ever need them?) - No dependent events support (so PERF_COUNT_HW_INSTRUCTIONS doesn't work for now) - There are events with same counters which can't work simultaneously (need to use intersected ones due to broken counter 1) - No PERF_COUNT_HW_CACHE_ events yet Todo: - Implement dependent events - Need proper hashing for event opcodes (no linear search, good for debugging stage but not in real loads) - Some events counted during a clock cycle -- need to set threshold for them and count every clock cycle just to get summary statistics (ie to behave the same way as other PMUs do) - Need to swicth to use event_constraints - To support RAW events we need to encode a global list of P4 events into p4_templates - Cache events need to be added Event support status matrix: Event status ----------------------------- cycles works cache-references works cache-misses works branch-misses works bus-cycles partially (does not work on 64bit cpu with HT enabled) instruction doesnt work (needs dependent event [mop tagging]) branches doesnt work Signed-off-by: Cyrill Gorcunov Signed-off-by: Lin Ming Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Stephane Eranian Cc: Robert Richter Cc: Frederic Weisbecker LKML-Reference: <20100311165439.GB5129@lenovo> Signed-off-by: Ingo Molnar commit beac4c7e4a1cc6d57801f690e5e82fa2c9c245c8 Author: Mike Galbraith Date: Thu Mar 11 17:17:20 2010 +0100 sched: Remove AFFINE_WAKEUPS feature Disabling affine wakeups is too horrible to contemplate. Remove the feature flag. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301890.6785.50.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 13814d42e45dfbe845a0bbe5184565d9236896ae Author: Mike Galbraith Date: Thu Mar 11 17:17:04 2010 +0100 sched: Remove ASYM_GRAN feature This features has been enabled for quite a while, after testing showed that easing preemption for light tasks was harmful to high priority threads. Remove the feature flag. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301675.6785.44.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit c6ee36c423c3ed1fb86bb3eabba9fc256a300d16 Author: Mike Galbraith Date: Thu Mar 11 17:16:43 2010 +0100 sched: Remove SYNC_WAKEUPS feature Sync wakeups are critical functionality with a long history. Remove it, we don't need the branch or icache footprint. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301817.6785.47.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit f2e74eeac03ffb779d64b66a643c5e598145a28b Author: Mike Galbraith Date: Thu Mar 11 17:17:18 2010 +0100 sched: Remove WAKEUP_SYNC feature This feature never earned its keep, remove it. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301591.6785.42.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 5ca9880c6f4ba4c84b517bc2fed5366adf63d191 Author: Mike Galbraith Date: Thu Mar 11 17:17:17 2010 +0100 sched: Remove FAIR_SLEEPERS feature Our preemption model relies too heavily on sleeper fairness to disable it without dire consequences. Remove the feature, and save a branch or two. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301520.6785.40.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 6bc6cf2b61336ed0c55a615eb4c0c8ed5daf3f08 Author: Mike Galbraith Date: Thu Mar 11 17:17:17 2010 +0100 sched: Remove NORMALIZED_SLEEPER This feature hasn't been enabled in a long time, remove effectively dead code. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301447.6785.38.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 8b911acdf08477c059d1c36c21113ab1696c612b Author: Mike Galbraith Date: Thu Mar 11 17:17:16 2010 +0100 sched: Fix select_idle_sibling() Don't bother with selection when the current cpu is idle. Recent load balancing changes also make it no longer necessary to check wake_affine() success before returning the selected sibling, so we now always use it. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301369.6785.36.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 21406928afe43f1db6acab4931bb8c886f4d04ce Author: Mike Galbraith Date: Thu Mar 11 17:17:15 2010 +0100 sched: Tweak sched_latency and min_granularity Allow LAST_BUDDY to kick in sooner, improving cache utilization as soon as a second buddy pair arrives on scene. The cost is latency starting to climb sooner, the tbenefit for tbench 8 on my Q6600 box is ~2%. No detrimental effects noted in normal idesktop usage. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301285.6785.34.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit a64692a3afd85fe048551ab89142fd5ca99a0dbd Author: Mike Galbraith Date: Thu Mar 11 17:16:20 2010 +0100 sched: Cleanup/optimize clock updates Now that we no longer depend on the clock being updated prior to enqueueing on migratory wakeup, we can clean up a bit, placing calls to update_rq_clock() exactly where they are needed, ie on enqueue, dequeue and schedule events. In the case of a freshly enqueued task immediately preempting, we can skip the update during preemption, as the clock was just updated by the enqueue event. We also save an unneeded call during a migratory wakeup by not updating the previous runqueue, where update_curr() won't be invoked. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301199.6785.32.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit e12f31d3e5d36328c7fbd0fce40a95e70b59152c Author: Mike Galbraith Date: Thu Mar 11 17:15:51 2010 +0100 sched: Remove avg_overlap Both avg_overlap and avg_wakeup had an inherent problem in that their accuracy was detrimentally affected by cross-cpu wakeups, this because we are missing the necessary call to update_curr(). This can't be fixed without increasing overhead in our already too fat fastpath. Additionally, with recent load balancing changes making us prefer to place tasks in an idle cache domain (which is good for compute bound loads), communicating tasks suffer when a sync wakeup, which would enable affine placement, is turned into a non-sync wakeup by SYNC_LESS. With one task on the runqueue, wake_affine() rejects the affine wakeup request, leaving the unfortunate where placed, taking frequent cache misses. Remove it, and recover some fastpath cycles. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301121.6785.30.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit b42e0c41a422a212ddea0666d5a3a0e3c35206db Author: Mike Galbraith Date: Thu Mar 11 17:15:38 2010 +0100 sched: Remove avg_wakeup Testing the load which led to this heuristic (nfs4 kbuild) shows that it has outlived it's usefullness. With intervening load balancing changes, I cannot see any difference with/without, so recover there fastpath cycles. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301062.6785.29.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 39c0cbe2150cbd848a25ba6cdb271d1ad46818ad Author: Mike Galbraith Date: Thu Mar 11 17:17:13 2010 +0100 sched: Rate-limit nohz Entering nohz code on every micro-idle is costing ~10% throughput for netperf TCP_RR when scheduling cross-cpu. Rate limiting entry fixes this, but raises ticks a bit. On my Q6600, an idle box goes from ~85 interrupts/sec to 128. The higher the context switch rate, the more nohz entry costs. With this patch and some cycle recovery patches in my tree, max cross cpu context switch rate is improved by ~16%, a large portion of which of which is this ratelimiting. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1268301003.6785.28.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 9b33fa6ba0e2f90fdf407501db801c2511121564 Author: eranian@google.com Date: Wed Mar 10 22:26:05 2010 -0800 perf_events: Improve task_sched_in() This patch is an optimization in perf_event_task_sched_in() to avoid scheduling the events twice in a row. Without it, the perf_disable()/perf_enable() pair is invoked twice, thereby pinned events counts while scheduling flexible events and we go throuh hw_perf_enable() twice. By encapsulating, the whole sequence into perf_disable()/perf_enable() we ensure, hw_perf_enable() is going to be invoked only once because of the refcount protection. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1268288765-5326-1-git-send-email-eranian@google.com> Signed-off-by: Ingo Molnar commit 41acab8851a0408c1d5ad6c21a07456f88b54d40 Author: Lucas De Marchi Date: Wed Mar 10 23:37:45 2010 -0300 sched: Implement group scheduler statistics in one struct Put all statistic fields of sched_entity in one struct, sched_statistics, and embed it into sched_entity. This change allows to memset the sched_statistics to 0 when needed (for instance when forking), avoiding bugs of non initialized fields. Signed-off-by: Lucas De Marchi Signed-off-by: Peter Zijlstra LKML-Reference: <1268275065-18542-1-git-send-email-lucas.de.marchi@gmail.com> Signed-off-by: Ingo Molnar commit 6f4edd69e40aba4f45bf9558c1e9a950d79ab4e4 Author: Jack Steiner Date: Wed Mar 10 14:44:58 2010 -0600 x86, UV: Clean up UV headers for MMR definitions Update UV mmr definitions header file. Eliminate definitions no longer needed. Move 2 definitions from tlb_uv.c into the header file where they belong. Signed-off-by: Jack Steiner LKML-Reference: <20100310204458.GA28835@sgi.com> Signed-off-by: Ingo Molnar commit 938179b4f8cf8a4f11234ebf2dff2eb48400acfe Author: Dimitri Sivanich Date: Fri Mar 5 11:42:03 2010 -0600 x86: Improve Intel microcode loader performance We've noticed that on large SGI UV system configurations, running microcode.ctl can take very long periods of time. This is due to the large number of vmalloc/vfree calls made by the Intel generic_load_microcode() logic. By reusing allocated space, the following patch reduces the time to run microcode.ctl on a 1024 cpu system from approximately 80 seconds down to 1 or 2 seconds. Signed-off-by: Dimitri Sivanich Acked-by: Dmitry Adamushko Cc: Avi Kivity Cc: Bill Davidsen LKML-Reference: <20100305174203.GA19638@sgi.com> Signed-off-by: Ingo Molnar commit 960b3b4b4cb6d22d55ad0ebb280dac9876937fa0 Author: Kuninori Morimoto Date: Thu Mar 11 11:37:44 2010 +0900 ASoC: da7210: Add 11025/22050/44100/88200 rate support This driver USE PLL for 11025/22050/44100/88200 rate. To enable switching to bypass mode, PLL is always turned on. Special thanks to Phil Signed-off-by: Phil Edworthy Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 85373ee817f95e4b9ad50822ec0c1d8a6f1f7a7f Author: Larry Finger Date: Wed Mar 10 10:41:32 2010 -0600 ssb: Export ssb_chipco_gpio_control - needed by N PHY code The latest changes in the N PHY core require the symbol ssb_chipco_gpio_control to be exported. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit e9f08381cb117d66ad14474228ce02a27d6f62ae Author: Andrew Blaich Date: Mon Mar 1 10:30:40 2010 -0500 ath5k: fixing retries in ath5k_hw_setup_4word_tx_desc The rate control algorithm, default is Minstrel for ath5k, determines the number of retries to use for each rate. However, there exists in ath5k_hw_setup_4word_tx_desc (which is called for AR5212 like devices) a set number of retries defined by AR5K_TUNE_HWTXTRIES. The set number of tries is added to the tx_tries0 variable setup by the rate control algorithm. This changes the number of retries the rate control algorithm considers necessary. By removing the AR5K_TUNE_HWTXTRIES from the retry calculation the rate control algorithm is given control over the number of retries. Signed-off-by: Andrew Blaich Signed-off-by: John W. Linville commit d969847c2202f82b3f6755d16909925e64e354e5 Author: Felix Fietkau Date: Mon Mar 1 13:32:11 2010 +0100 ath9k: fix rate control tx status handling for A-MPDU Currently the rate control tx status update gets called for every subframe of an A-MPDU, and ath9k marks the frame with the relevant status update with an internal flag. This not suitable for rate control algorithms using the standard mac80211 rate control API, so fix this by using IEEE80211_TX_STAT_AMPDU for marking the correct frames that should be processed. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7c3c76a82f3a6d52bbeabf48dd32109cc951a7cf Author: Teemu Paasikivi Date: Wed Mar 10 13:22:31 2010 +0200 wl1271: Changed wl1271_sdio to be selectable only on ARM As wl1271_sdio implementation depends on ARM GPIO impelementation it is not directly usable on other architectures at the moment. Added ARM dependency to kernel configuration option. Reported-by: Stephen Rothwell Signed-off-by: Teemu Paasikivi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho Signed-off-by: John W. Linville commit 687c8ff12df6b469c662a6cc288ea35989ee0704 Author: Bruno Randolf Date: Tue Mar 9 16:56:21 2010 +0900 ath5k: Minor EEPROM documentation updates Here are some minor updates for EEPROM, mostly documentation and some small fixes which have no effect at the moment. - fixed_bias is not available for B mode. - AR5K_EEPROM_[RT]X_CHAIN_DIS is 3 bit. this is MIMO and will not be used in ath5k, but just to be correct. - AR5K_EEPROM_JAP_MID_EN added, and shift of following flags adapted. - added some documentation for EEPROM values and some comments. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 49a85d211a63ad1d565842ebc535c5168d85d86a Author: Bruno Randolf Date: Tue Mar 9 16:56:15 2010 +0900 ath5k: IQ calibration for AR5211 is slightly different according to the HAL sources the calculation of the Q value is slightly different for AR5211 chips. i couldn't test this since IQ calibration never finishes on older parts. this is a different problem... Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 7644395f8df9aa5b42af268a485b83e44bba2784 Author: Bruno Randolf Date: Tue Mar 9 16:56:00 2010 +0900 ath5k: add debugfs file frameerrors add a debugfs file to see different RX and TX errors as reported in our status descriptors. this can help to diagnose driver problems. statistics can be cleared by writing 'clear' into the frameerrors file. example: # cat /sys/kernel/debug/ath5k/phy0/frameerrors RX --------------------- CRC 27 (11%) PHY 3 (1%) FIFO 0 (0%) decrypt 0 (0%) MIC 0 (0%) process 0 (0%) jumbo 0 (0%) [RX all 245] TX --------------------- retry 2 (9%) FIFO 0 (0%) filter 0 (0%) [TX all 21] Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 919154540aa26e8c333c420b5b930e94ef7a6839 Author: Bruno Randolf Date: Tue Mar 9 16:55:55 2010 +0900 ath5k: remove ah_gpio_npins it's never used and we have a newer implementation in gpio.c. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit a71bcebcb776e84dd765d2c7da51ed45a714e3ea Author: Bruno Randolf Date: Tue Mar 9 16:55:49 2010 +0900 ath5k: remove ah_mac_revision it's not used, and we have ah_mac_srev. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit ff5d96ce622271df430c715ebe3e0b7400059dc1 Author: Bruno Randolf Date: Tue Mar 9 16:55:44 2010 +0900 ath5k: remove ah_magic it's never used. probably a leftover from the old OpenHAL days... Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit ccfe5552aeb18c87a4d0ecb8cb7512280435bfdd Author: Bruno Randolf Date: Tue Mar 9 16:55:38 2010 +0900 ath5k: remove double opmode definition opmode (operating mode) was defined in struct ath5k_hw and struct ath5k_softc. remove it from ath5k_hw and use only from ath5k_softc (sc->opmode). (btw: what's the meaning of opmode when we have multiple interfaces?) Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit caec9112d6cb07cb5b82a967a448c3b15b257654 Author: Bruno Randolf Date: Tue Mar 9 16:55:28 2010 +0900 ath5k: preserve antenna settings save antenna settings and preserve across resets. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 604eeadd1880bddfb155369491cc13fb8d3f9df6 Author: Bruno Randolf Date: Tue Mar 9 16:55:17 2010 +0900 ath5k: add antenna statistics and debugfs file for antenna settings keep statistics about which antenna was used for TX and RX. this is used only for debugging right now, but might have other applications later. add a new file 'antenna' in debugfs (/sys/kernel/debug/ath5k/phy0/antenna) to show antenna use statistics and antenna diversity related register values. it can also be used to set the antenna mode until we have proper support for that in iw: - echo diversity > antenna: use default antenna mode (RX and TX diversity) - echo fixed-a > antenna: use fixed antenna A for RX and TX - echo fixed-b > antenna: use fixed antenna B for RX and TX - echo clear > antenna: reset antenna statistics Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 5a7d05830de1ecfdaf0a9fb43e4aa08abbdbfe9f Author: Jussi Kivilinna Date: Thu Mar 4 18:27:36 2010 +0200 rndis_wlan: Implement cfg80211 PMKSA API Add support for cfg80211 set_pmksa/del_pmksa/flush_pmksa. Updating PMKID entry list is done on driver side since NDIS API requires full list update. v2: - fixed to use new netdev_dbg/warn/etc instead of old devdbg/warn/etc - fixed false padding from struct ndis_80211_bssid_info Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 0308383f9591c991b3eb865c4f5ea2a87242afac Author: Jussi Kivilinna Date: Thu Mar 4 18:27:24 2010 +0200 rndis_wlan: get max_num_pmkids from device Extend rndis_wlan_get_caps() to get 802.11 capabilities and maximum supported number of PMKIDs by device. v2: fixed to use new netdev_dbg/warn/etc instead of old devdbg/warn/etc Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit ea29d65ea4e7585a5ac94f7ec0069d384315bd77 Author: Jussi Kivilinna Date: Thu Mar 4 18:27:12 2010 +0200 rndis_wlan: remove unused variables from priv structure Some variables were left unused after cfg80211 conversion. Remove those and related deadcode. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 80f8c5b434f94926c6489d7350d58aecb53ab70f Author: Jussi Kivilinna Date: Thu Mar 4 18:27:02 2010 +0200 rndis_wlan: copy only useful data from rndis_command respond rndis_query_oid() uses full output buffer size to copy response buffer from rndis_command()/device. This doesn't cause problems as response buffer is sized based on output buffer but does copy extra unset bytes. So change rndis_query_oid() so that only meaningful bytes are being copied. Also in case of malfunctioning device/cable/etc returned data offset from device might be wrong so bound check memory access correctly, so add checks for this. v2: fixed to use new netdev_dbg/warn/etc instead of old devdbg/warn/etc Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit eae44756d60c4e938259358090dba5df675dced0 Author: Felix Fietkau Date: Mon Mar 1 22:21:40 2010 +0100 minstrel: make the rate control ops reusable from another rc implementation This patch makes it possible to reuse the minstrel rate control ops from another rate control module. This is useful in preparing for the new 802.11n implementation of minstrel, which will reuse the old code for legacy stations. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 44ac91ea8450b0e7a27b4a1fd64aefd35a144728 Author: Felix Fietkau Date: Mon Mar 1 22:17:38 2010 +0100 minstrel: simplify and fix debugfs code This patch cleans up the debugfs read function for the statistics by using simple_read_from_buffer instead of its own semi-broken hack. Also removes a useless member of the minstrel debugfs info struct. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8127fbdc417b5916b82e91400a4be1d9555feee7 Author: Benoit Papillault Date: Sat Feb 27 23:05:26 2010 +0100 ath5k: Fix TX/RX padding for all frames Currently, the padding position is based on ieee80211_get_hdrlen_from_skb(). This is not correct since the HW does padding on RX (and expect the same padding to be present on TX) at the following position : - management : 24 + 6 if 4-addr format - control : 24 + 6 if 4-addr format - data : 24 + 6 if 4-addr format + 2 if QoS - invalid : 24 + 6 if 4-addr format whereas ieee80211_get_hdrlen_from_skb() is : - management : 24 - control : 16 except for ACK/CTS where it is 10 - data : 24 + 6 if 4-addr format + 2 if QoS + 2 if QoS & order - invalid : 24 So, correct frames are not affected : management frames do not use 4-addr format, control frames have no body and invalid frames are ... not valid by definition. However, in order to use monitor interface for debugging purpose, one must be able to send/receive any frames, be it correct or not. Such frames are affected by incorrect padding. Moreover, since padding is added on TX, we need to remove it before calling ieee80211_tx_status. This affect TX packets received by monitor interfaces. It has been tested between an ath5k based card (AR5212) and an ar9170usb based card (netgear WNDA3100) using a frame generator and a monitor interface for each card. v2: Added ath5k_add_padding / ath5k_remove_padding Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville commit c2ef355bf3ef0b8006b96128726684fba47ac928 Author: Andres Salomon Date: Thu Feb 25 19:18:47 2010 -0500 mac80211: give warning if building w/out rate ctrl algorithm I discovered that if EMBEDDED=y, one can accidentally build a mac80211 stack and drivers w/ no rate control algorithm. For drivers like RTL8187 that don't supply their own RC algorithms, this will cause ieee80211_register_hw to fail (making the driver unusable). This will tell kconfig to provide a warning if no rate control algorithms have been selected. That'll at least warn the user; users that know that their drivers supply a rate control algorithm can safely ignore the warning, and those who don't know (or who expect to be using multiple drivers) can select a default RC algorithm. Signed-off-by: Andres Salomon Cc: stable@kernel.org Signed-off-by: John W. Linville commit 1da3f88222579135569ad52d1c82a7393cf87178 Author: Zhu Yi Date: Thu Feb 25 14:15:31 2010 +0800 iwmc3200wifi: typo fix and code cleanup Fix wrong IWM_RX_TICKET_DROP_REASON_MSK macro define, typo and other small cleanups. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d281fd461dcb9b3d0dc46180bf6e90da3913079d Author: Zhu Yi Date: Thu Feb 25 14:15:30 2010 +0800 iwmc3200wifi: mark some pmksa functions static This fixes the sparse warnings. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 880f8bdd396ef0548d5967db55e45ce2135fbb2b Author: Zhu Yi Date: Thu Feb 25 14:15:29 2010 +0800 iwmc3200wifi: increase concatenated buffer Increase concatenated buffer from 8K to 32K to get better performance. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c03c6aefdc2c1f5785a5b0d1a3f7e48eeaae3505 Author: Zhu Yi Date: Thu Feb 25 14:15:28 2010 +0800 iwmc3200wifi: protect rx_tickets and rx_packets[] lists Protect rx_tickets and rx_packets[] lists with spinlocks to fix the race condition for concurrent list operations. In iwmc3200wifi both sdio_isr_worker and rx_worker workqueues can access the rx ticket and packets lists at the same time under high rx load. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 34dd5feb8b8b15654714731e1dbb34a6d37fb34e Author: Zhu Yi Date: Thu Feb 25 14:15:27 2010 +0800 iwmc3200wifi: add ftrace event tracing support Add event tracer for iwmc3200wifi driver. When enabled, all the commands and responses between the driver and firmware (also including Tx/Rx frames) will be recorded in the ftrace ring buffer. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 04d1c22761f33ac8f345665e7ef809c875142425 Author: Zhu Yi Date: Thu Feb 25 14:15:26 2010 +0800 iwmc3200wifi: remove "_safe" for some list_for_each_entry usage Use list_for_each_entry instead of list_for_each_entry_safe in places iteration against list entry removal is not required. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 7d49c6111c27f0e68b0310aeececf7ded53f7f94 Author: Zhu Yi Date: Thu Feb 25 14:15:25 2010 +0800 iwmc3200wifi: refuse to associate on unallowed channels We need to make sure we don't associate with APs on unallowed channels (according to regulatory setting). This could happen when the channel is not specified (auto-select) within the connection request. In this case we get the AP's channel until the firmware indicates the association succeeded later. We need to verify the associated channel. If the channel is disabled by regulatory, we have to disassociate with the AP. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 6c26361e4be3cf0dad7083e38ca52001a987e3e6 Author: florian@mickler.org Date: Fri Feb 26 12:01:34 2010 +0100 enhance sysfs rfkill interface This commit introduces two new sysfs knobs. /sys/class/rfkill/rfkill[0-9]+/blocked_hw: (ro) hardblock kill state /sys/class/rfkill/rfkill[0-9]+/blocked_sw: (rw) softblock kill state Signed-off-by: Florian Mickler Signed-off-by: John W. Linville commit 69c86373c6ea1149aa559e6088362d58d8ec8835 Author: florian@mickler.org Date: Wed Feb 24 12:05:16 2010 +0100 Document the rfkill sysfs ABI This moves sysfs ABI info from Documentation/rfkill.txt to the ABI subfolder and reformats it. This also schedules the deprecated sysfs parts to be removed in 2012 (claim file) and 2014 (state file). Signed-off-by: Florian Mickler Signed-off-by: John W. Linville commit 9c9b125736db934b98aa7e16b675767ed4fcf5ce Author: Jassi Brar Date: Wed Mar 10 16:48:58 2010 +0900 ASoC: S3C: I2Sv2: Segregate hw_params callback Towards having build for multiple SoCs segregate hw_params callback for s3c2412 and s3c64xx. Since, all new SoCs have s3c64xx like register map, we keep that as default implementation if no SoC specific callback is already defined. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit bf3288260288160e22f85bbf00b281523c14b587 Author: Jassi Brar Date: Wed Mar 10 16:48:52 2010 +0900 ASoC: S3C64XX: I2S: Make BCLK independent of sample size For some CPU-CODEC and source clock combination we might need to set BCLK to N*Sample_size*LRCLK, where N may be even 3 or 4, not just 2. We can simply remove the dependency of BCLK on sample size as there is already a callback(S3C_I2SV2_DIV_BCLK) available to set required BCLK. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fad837c16cdd856c68ce2e1335ad0fe836ed8ecd Merge: 51c6ab1 57d5488 Author: Mark Brown Date: Wed Mar 10 15:02:37 2010 +0000 Merge commit 'v2.6.34-rc1' into for-2.6.35 commit 51c6ab130642ed975681df843c772dda48a1d2ed Author: Jassi Brar Date: Wed Mar 10 16:48:51 2010 +0900 ASoC: S3C: I2Sv2: Reject immidiate register value Towards generalizing CPU driver interface, do not accept direct field values for the BCLK and RCLK. The machine driver should simply request the FS-multiple and not provide the value to be set in divide field of IISMOD. [Confirmed by Jassi that no existing machine drivers are affected -- broonie] Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit caa0142d84ceb0fc83e28f0475d0a7316cb6df77 Author: Ingo Molnar Date: Sat Jun 6 13:58:12 2009 +0200 perf, x86: Fix the !CONFIG_CPU_SUP_INTEL build Fix typo. But the modularization here is ugly and should be improved. Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit ba7e4d13fc7e25af1d167d40e6f028298dfc55ad Author: Ingo Molnar Date: Sat Jun 6 13:58:12 2009 +0200 perf, x86: Add INSTRUCTION_DECODER config flag The PEBS+LBR decoding magic needs the insn_get_length() infrastructure to be able to decode x86 instruction length. So split it out of KPROBES dependency and make it enabled when either KPROBES or PERF_EVENTS is enabled. Cc: Peter Zijlstra Cc: Masami Hiramatsu Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit 63fb3f9b2312e131be5a0a2dddb63f2fb123db9b Author: Peter Zijlstra Date: Tue Mar 9 11:51:02 2010 +0100 perf, x86: Fix LBR read-out Don't decrement the TOS twice... Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit d80c7502ff63aa0d99d8c0c5803d28bbef67a74e Author: Peter Zijlstra Date: Tue Mar 9 11:41:02 2010 +0100 perf, x86: Fixup the PEBS handler for Core2 cpus Pull the core handler in line with the nhm one, also make sure we always drain the buffer. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 7645a24cbd01cbf4865d1273d5ddaa8d8c2ccb3a Author: Peter Zijlstra Date: Mon Mar 8 13:51:31 2010 +0100 perf, x86: Remove checking_{wr,rd}msr() usage We don't need checking_{wr,rd}msr() calls, since we should know what cpu we're running on and not use blindly poke at msrs. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit b83a46e7da4a948cc852ba7805dfb1a392dec861 Author: Peter Zijlstra Date: Mon Mar 8 13:51:12 2010 +0100 perf, x86: Don't reset the LBR as frequently If we reset the LBR on each first counter, simple counter rotation which first deschedules all counters and then reschedules the new ones will lead to LBR reset, even though we're still in the same task context. Reduce this by not flushing on the first counter but only flushing on different task contexts. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit ad0e6cfe2a2a61d7b5530188e571d508146cb43b Author: Peter Zijlstra Date: Sat Mar 6 19:49:06 2010 +0100 perf, x86: Fix silly bug in intel_pmu_pebs_{enable,disable} We need to use the actual cpuc->pebs_enabled value, not a local copy for the changes to take effect. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 12ab854d744f04bfc5c6c4db723b7e31fc03eb29 Author: Peter Zijlstra Date: Sat Mar 6 18:57:38 2010 +0100 perf, x86: Deal with multiple state bits for pebs-fmt1 Its unclear if the PEBS state record will have only a single bit set, in case it does not and accumulates bits, deal with that by only processing each event once. Also, robustify some of the code. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit d329527e47851f84b1e7944ed9601205f35f1b93 Author: Peter Zijlstra Date: Mon Mar 8 13:57:14 2010 +0100 perf, x86: Reorder intel_pmu_enable_all() The documentation says we have to enable PEBS before we enable the PMU proper. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 2df202bf7520eaffcbfb07e45dfa3cfb0aeee2c0 Author: Peter Zijlstra Date: Sat Mar 6 13:48:54 2010 +0100 perf, x86: Fix LBR enable/disable vs cpuc->enabled We should never call ->enable with the pmu enabled, and we _can_ have ->disable called with the pmu enabled. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 4807e3d5dc7bb7057dd6ca3abb09f3da2eb8c323 Author: Peter Zijlstra Date: Sat Mar 6 13:47:07 2010 +0100 perf, x86: Fix PEBS enable/disable vs cpuc->enabled We should never call ->enable with the pmu enabled, and we _can_ have ->disable called with the pmu enabled. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 8f4aebd2be9892bf8fb79a2d8576d3f3ee7f00f6 Author: Peter Zijlstra Date: Sat Mar 6 13:26:11 2010 +0100 perf, x86: Fix pebs drains I overlooked the perf_disable()/perf_enable() calls in intel_pmu_handle_irq(), (pointed out by Markus) so we should not explicitly disable_all/enable_all pebs counters in the drain functions, these are already disabled and enabling them early is confusing. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit cc7f00820b2f3be656569c41158d9323e425bcfe Author: Peter Zijlstra Date: Mon Mar 8 17:51:33 2010 +0100 perf, x86: Avoid double disable on throttle vs ioctl(PERF_IOC_DISABLE) Calling ioctl(PERF_EVENT_IOC_DISABLE) on a thottled counter would result in a double disable, cure this by using x86_pmu_{start,stop} for throttle/unthrottle and teach x86_pmu_stop() to check ->active_mask. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit a562b1871f7f7d2f3a835c3c1e07fa58d473cfb7 Author: Peter Zijlstra Date: Fri Mar 5 16:29:14 2010 +0100 perf, x86: Robustify PEBS fixup It turns out the LBR is massively unreliable on certain CPUs, so code the fixup a little more defensive to avoid crashing the kernel. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100305154129.042271287@chello.nl> Signed-off-by: Ingo Molnar commit 74846d35b24b6efd61bb88a0a750b6bb257e6e78 Author: Peter Zijlstra Date: Fri Mar 5 13:49:35 2010 +0100 perf, x86: Clear the LBRs on init Some CPUs have errata where the LBR is not cleared on Power-On. So always clear the LBRs before use. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100305154128.966563424@chello.nl> Signed-off-by: Ingo Molnar commit 3c44780b220e876b01e39d4028cd6f4205fbf5d6 Author: Peter Zijlstra Date: Thu Mar 4 21:49:01 2010 +0100 perf, x86: Disable PEBS on clovertown chips This CPU has just too many handycaps to be really useful. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100305154128.890278662@chello.nl> Signed-off-by: Ingo Molnar commit 3adaebd69557615c1bf0365ce5e32d93ac7d82af Author: Peter Zijlstra Date: Fri Mar 5 12:09:29 2010 +0100 perf, x86: Fix silly bug in data store buffer allocation Fix up the ds allocation error path, where we could free @buffer before we used it. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100305154128.813452402@chello.nl> Signed-off-by: Ingo Molnar commit 30a813ae035d3e220a89609adce878e045c49547 Author: Peter Zijlstra Date: Thu Mar 4 13:49:21 2010 +0100 x86: Move MAX_INSN_SIZE into asm/insn.h Since there's now two users for this, place it in a common header. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.923774125@chello.nl> Signed-off-by: Ingo Molnar commit 7e1a40dda619b0483fbe0740494ed2c2a1f05289 Author: Peter Zijlstra Date: Thu Mar 4 12:38:03 2010 +0100 perf, x86: Expose the full PEBS record using PERF_SAMPLE_RAW Expose the full PEBS record using PERF_SAMPLE_RAW Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.847218224@chello.nl> Signed-off-by: Ingo Molnar commit 8db909a7e3c888b5d45aef7650d74ccebe3ce725 Author: Peter Zijlstra Date: Wed Mar 3 17:07:40 2010 +0100 perf, x86: Clean up IA32_PERF_CAPABILITIES usage Saner PERF_CAPABILITIES support, which also exposes pebs_trap. Use that latter to make PEBS's use of LBR conditional since a fault-like pebs should already report the correct IP. ( As of this writing there is no known hardware that implements !pebs_trap ) Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.770650663@chello.nl> Signed-off-by: Ingo Molnar commit 1676b8a077c352085d52578fb4f29350b58b6e74 Author: Peter Zijlstra Date: Thu Mar 4 14:19:36 2010 +0100 perf-top: Show the percentage of successfull PEBS-fixups Use the PERF_RECORD_MISC_EXACT information to measure the success rate of the PEBS fix-up. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.694233760@chello.nl> Signed-off-by: Ingo Molnar commit ef21f683a045a79b6aa86ad81e5fdfc0d5ddd250 Author: Peter Zijlstra Date: Wed Mar 3 13:12:23 2010 +0100 perf, x86: use LBR for PEBS IP+1 fixup Use the LBR to fix up the PEBS IP+1 issue. As said, PEBS reports the next instruction, here we use the LBR to find the last branch and from that construct the actual IP. If the IP matches the LBR-TO, we use LBR-FROM, otherwise we use the LBR-TO address as the beginning of the last basic block and decode forward. Once we find a match to the current IP, we use the previous location. This patch introduces a new ABI element: PERF_RECORD_MISC_EXACT, which conveys that the reported IP (PERF_SAMPLE_IP) is the exact instruction that caused the event (barring CPU errata). The fixup can fail due to various reasons: 1) LBR contains invalid data (quite possible) 2) part of the basic block got paged out 3) the reported IP isn't part of the basic block (see 1) Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: "Zhang, Yanmin" Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.619375431@chello.nl> Signed-off-by: Ingo Molnar commit caff2befffe899e63df5cc760b7ed01cfd902685 Author: Peter Zijlstra Date: Wed Mar 3 12:02:30 2010 +0100 perf, x86: Implement simple LBR support Implement simple suport Intel Last-Branch-Record, it supports all hardware that implements FREEZE_LBRS_ON_PMI, but does not (yet) implement the LBR config register. The Intel LBR is a FIFO of From,To addresses describing the last few branches the hardware took. This patch does not add perf interface to the LBR, but merely provides an interface for internal use. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.544191154@chello.nl> Signed-off-by: Ingo Molnar commit 69fef0d2e2c2c049ef4207a52e78b50d527bd85a Author: Peter Zijlstra Date: Thu Mar 4 13:57:24 2010 +0100 perf: Add attr->precise support to raw event parsing Minimal userspace interface to the new 'precise' events flag. Can be used like "perf top -e r00c0p" which will use PEBS to sample retired instructions. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.468665803@chello.nl> Signed-off-by: Ingo Molnar commit ca037701a025334e724e5c61b3b1082940c8b981 Author: Peter Zijlstra Date: Tue Mar 2 19:52:12 2010 +0100 perf, x86: Add PEBS infrastructure This patch implements support for Intel Precise Event Based Sampling, which is an alternative counter mode in which the counter triggers a hardware assist to collect information on events. The hardware assist takes a trap like snapshot of a subset of the machine registers. This data is written to the Intel Debug-Store, which can be programmed with a data threshold at which to raise a PMI. With the PEBS hardware assist being trap like, the reported IP is always one instruction after the actual instruction that triggered the event. This implements a simple PEBS model that always takes a single PEBS event at a time. This is done so that the interaction with the rest of the system is as expected (freq adjust, period randomization, lbr, callchains, etc.). It adds an ABI element: perf_event_attr::precise, which indicates that we wish to use this (constrained, but precise) mode. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100304140100.392111285@chello.nl> Signed-off-by: Ingo Molnar commit fa6231e1738617a864869600f51c3feb9e1081c8 Author: Jassi Brar Date: Wed Mar 10 16:48:57 2010 +0900 ASoC: S3C64XX: I2S: Move RATE and FMT defines to header In order for the RATE and FMT defines to be reuseable in future by the i2sv4 driver, move the MACROs out to the header file. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 87b7eb266c0bcdb5a0f1e670a73f2de742da459f Author: Jassi Brar Date: Wed Mar 10 16:48:56 2010 +0900 ASoC: s3c64xx-i2s remove unncessary headers s3c64xx-i2s remove unncessary headers Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b568f84b30f2b690e5ef704835effd09a212cd72 Author: Jassi Brar Date: Wed Mar 10 16:48:55 2010 +0900 ASoC: s3c-i2s-v2 remove unnecessary headers s3c-i2s-v2 remove unnecessary headers Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4793d6afbd7d66d64799a9dd1881888c28c4e1d0 Author: Jassi Brar Date: Wed Mar 10 16:48:54 2010 +0900 ASoC: S3C: I2Sv2: Unify clock source IDs Rather than having the multiple definitions of the same clocks, define them in one common place and refer by SoC specific names. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 08226614789496dc395e3714115a3bcf2ca3baa2 Author: Jassi Brar Date: Wed Mar 10 16:48:50 2010 +0900 ASoC: S3C: I2Sv2: Add missing semicolon Add missing semicolon after s3c2412_i2s_delay Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f0d10f5aa3955fcd4a9a7f950c66b64666589d4d Author: Barry Song Date: Tue Mar 9 12:58:14 2010 -0500 ASoC: bf5xx-sport: use common SPORT code for MMR info No point in duplicating this structure layout in each driver. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4b527e2900531befd3d4df2e70c85029ea571f1a Author: Cliff Cai Date: Tue Mar 9 12:58:09 2010 -0500 ASoC: SSM2602: add SND control for mic boost2 and default it to off Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8d43d1bc81190ee8e4e694d805afa586339b0afc Author: Chaithrika U S Date: Wed Mar 10 14:48:33 2010 +0530 ASoC: DaVinci: Add hw_param callback for S/PDIF DIT link On TI DM6467 EVM, S/PDIF DIT codec fails to open as it is unable to install hardware params. This dummy codec has no set_fmt and set_sysclk implementations and calls from the application to these functions cause errors. This patch adds a new hardware params callback function for S/PDIF transciever codec. Signed-off-by: Chaithrika U S Tested-by: Anuj Aggarwal Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c7ed1ab3f7b2fe0dedebf34cbf40bf12cb5ae48b Author: Paul Mundt Date: Wed Mar 10 18:35:14 2010 +0900 serial: sh-sci: clkdev updates for MSTP gating. This fixes up some of the I/D/F clock ambiguity in the sh-sci driver. The interface clock in most cases just wraps back to the peripheral clock, while the function clock wraps in to the MSTP bits. As the logic was somewhat inverted, this cleans that up, and also enables all CPUs with SCI MSTP bits to match function clocks through clkdev lookup. As a result, this gets rid of the clk string abuse on the sh side, and the clock string will be killed off once the ARM code has had a chance to sync up. This also enables MSTP gating on CPUs like 7786 which had never wired it up before. Impacted CPUs are primarily all SH-Mobiles, SH7785, and SH7786. Signed-off-by: Paul Mundt commit 55c63bd256d41d79adbe1c3fc2325fb328419a18 Author: Daniel Glöckner Date: Tue Mar 9 12:57:52 2010 -0500 ALSA: provide a more useful get_unmapped_area handler for pcm Shared memory mappings on nommu machines require a get_unmapped_area file operation that suggests an address for the mapping. The current implementation returns 0 and thus forces the driver to implement an mmap handler that fixes up the start and end address of the vma. This patch returns the address of the dma buffer, so it should work out of the box for all drivers that use the snd_pcm_runtime->dma_area pointer. Addresses for mapping the status and control pages are returned as well, but to make those work the conditional compilation of snd_pcm_mmap_{status,control} would need to be revised. URL: http://thread.gmane.org/gmane.linux.alsa.devel/61230 Signed-off-by: Daniel Glöckner Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Signed-off-by: Takashi Iwai commit d28c145debb1bd53cde63ac8bccc192e3e00067e Merge: 2e733b3 ec0ffe2 Author: Paul Mundt Date: Wed Mar 10 16:41:57 2010 +0900 Merge branch 'sh/driver-core' into sh/clkfwk commit ec0ffe2ee0e0fb9da4409d86bfd72636450f32df Author: Paul Mundt Date: Wed Mar 10 16:28:16 2010 +0900 sh: Kill off all timer name clobbering. Now that dev_name() can be used early, we no longer require a static string. Kill off all of the superfluous timer names. Signed-off-by: Paul Mundt commit 214a607a4f5bf5a14dab0304ba350cdaf3916795 Author: Paul Mundt Date: Wed Mar 10 16:26:25 2010 +0900 clocksource: Use dev_name() universally across the SH drivers. There is no need to copy in the name from the sh timer config now that dev_name() is available early. We prefer the dev_name() variant for consistent naming. Signed-off-by: Paul Mundt commit a19c5bbefb37ebe22fb42bd3861a8d3b2a2652a1 Author: H Hartley Sweeten Date: Tue Mar 9 17:59:59 2010 -0600 security/ima: replace gcc specific __FUNCTION__ with __func__ As noted by checkpatch.pl, __func__ should be used instead of gcc specific __FUNCTION__. Signed-off-by: H Hartley Sweeten Signed-off-by: James Morris commit a636ee7fb35b731ba2b331f6294e809bb6be09c8 Author: Paul Mundt Date: Tue Mar 9 06:57:53 2010 +0000 driver core: Early dev_name() support. Presently early platform devices suffer from the fact they are unable to use dev_xxx() calls early on due to dev_name() and others being unavailable at the time ->probe() is called. This implements early init_name construction from the matched name/id pair following the semantics of the late device/driver match. As a result, matched IDs (inclusive of requested ones) are preserved when the handoff from the early platform code happens at kobject initialization time. Since we still require kmalloc slabs to be available at this point, using kstrdup() for establishing the init_name works fine. This subsequently needs to be tested from dev_name() prior to the init_name being cleared by the driver core. We don't kfree() since others will already have a handle on the string long before the kobject initialization takes place. This is also needed to permit drivers to use the clock framework early, without having to manually construct their own device IDs from the match id/name pair locally (needed by the early console and timer code on sh and arm). Signed-off-by: Paul Mundt Acked-by: Greg Kroah-Hartman commit 75a9a92625a7d7401d04209f4226061cd2674b59 Author: Abhijeet Kolekar Date: Fri Feb 26 15:17:01 2010 -0800 iwl3945: check ucode load error code Check successful completion of BSM loading. Give a chance to load BSM again. If BSM loading is unsuccessful we should exit and not initilize NIC. Before this checking even if the BSM loading failed driver tries to initilize the NIC which should not be the case. Signed-off-by: Abhijeet Kolekar Signed-off-by: Reinette Chatre commit edc1a3a090e83c48d4b33c23aa16c54b3b790ef5 Author: Johannes Berg Date: Wed Feb 24 01:57:19 2010 -0800 iwlwifi: clean up queue/fifo handling 4965 hardware has 7 queues reserved and the remaining ones used for aggregation, 5000 and higher need to have 10 reserved. This is not very clear in the code right now, unfortunately. Introduce a new IWL_TX_FIFO_UNUSED constant and make the queue/FIFO mapping arrays able to hold that value, and change the setup code to reserve all queues in the arrays (the queue number is the index) and use the new unused constant to not map those queues to any FIFO. Additionally, clear up the AC/queue mapping code to be more understandable. The mapping is the identity mapping right now, but with the mapping function I think it's easier to understand what happens there. Finally, HCCA isn't implemented at all and I think newer microcode removed it, so let's remove all mention of it in the code, some comments remain for 4965. Signed-off-by: Johannes Berg Acked-by: Shanyu Zhao Signed-off-by: Reinette Chatre commit 4f4d4088b05155d4904e29d5c00316395ce32f27 Author: Wey-Yi Guy Date: Wed Feb 24 08:28:30 2010 -0800 iwlwifi: add internal short scan support for 3945 Add internal short scan support for 3945 NIC, This allows 3945 NIC to support radio reset request like the other series of NICs. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 13115ba76b3200fca62d1bfd54f917f208e7d2e5 Author: Wey-Yi Guy Date: Tue Feb 23 14:36:13 2010 -0800 iwlwifi: remove unnecessary parameter in scan function small change to remove unnecessary "ret" parameter since it not being used. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 9856b7fa36a77d69e1413c63cb867514876796d2 Author: Wey-Yi Guy Date: Tue Feb 23 14:05:29 2010 -0800 iwlwifi: remove duplicate function "internal_scan" debugfs function serves the same propose of mode "0" of "force_reset" debugfs function. Remove it to avoid duplicate. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit f8e200de3af29c36ec93b72e3fc36350f8fbec84 Author: Reinette Chatre Date: Fri Feb 19 11:41:32 2010 -0800 iwlwifi: remove needlessly exported symbols iwl_apm_stop_master and iwl_internal_short_hw_scan are only used within iwlcore and thus do not need to be exported. Reported-by: Johannes Berg Signed-off-by: Reinette Chatre commit 72e15d71b02a21fd7b94ee1af4ba3a41f722b1f3 Author: Johannes Berg Date: Fri Feb 19 11:42:32 2010 -0800 iwlwifi: change WEP key protection to use mutex For later station notification support we would like WEP key setting to be done synchronously always. Currently all places from which WEP key is set can sleep, but the usage of sta_lock prevents it to do so. Modify the locking to use priv->mutex instead and thus enable this call to sleep. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 4967c31677cf3c6c49aadf205f1a31d15d7610da Author: Wey-Yi Guy Date: Thu Feb 18 15:22:07 2010 -0800 iwlwifi: remove un-necessary parameters small code cleanup to remove un-necessary parameters Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre commit 60987206cba0dbb547bce2d23c3a3338c5aaf5ac Author: Johannes Berg Date: Thu Feb 18 00:36:07 2010 -0800 iwlagn: move sysfs flags and filter_flags files to debugfs These files are incompatible with some changes I'm making, and don't really belong into sysfs anyway as they can only be used for debugging. Since writing them will probably crash the firmware, keep only the reading part and move them into debugfs. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit b55e75ed926ded110293b0d1e24eb6a878883115 Author: Johannes Berg Date: Wed Feb 17 04:54:08 2010 -0800 iwlwifi: remove STATUS_MODE_PENDING Since rfkill integration, mac80211 can no longer add an interface while the hardware is not ready, so STATUS_MODE_PENDING can never be set. Also, remove another superfluous channel sanity check and return the commit_rxon return value in case it failed. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 76c9cc18fd2c8cfa5a7f66d5496d469db00eaf54 Author: Johannes Berg Date: Wed Feb 17 01:43:41 2010 -0800 iwlwifi: remove alive start adhoc restart This code will never trigger, because when we call this during interface start, neither priv->vif nor priv->iw_mode conditions will be true, and when it happens during reset then priv->vif is also NULL. Also, in both cases the same code will be executed as part of iwl_bss_info_changed(), which contains a copy of this code. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 67d613aed70194387edb1f8bf990f9cf197d3717 Author: Johannes Berg Date: Wed Feb 17 02:39:19 2010 -0800 iwlwifi: move 3945 clip groups to 3945 data Only used on 3945, so it can be in the 3945-specific part of the data. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 949cd92c85fbdf9550582fc09271fa91cc802069 Author: Johannes Berg Date: Fri Jan 22 04:06:41 2010 -0800 iwlwifi: clear up AC/FIFO debug output Not all queues are mapped for frame transmission, so saying "AC" is misleading. They are all mapped to FIFOs, obviously, though, so use that term and also say AC/CMD instead of just AC for the queue type. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit fbc66daa82b0f0aaae393323bcb9766a8b64e632 Author: Johannes Berg Date: Thu Jan 21 07:31:07 2010 -0800 iwlwifi: remove sanity check iwl_mac_beacon_update can only be called when the operating mode is IBSS, so it doesn't need to verify that again. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit b2f30e8bdd8ef5f3b5a7ef9146509585a15347d3 Author: Johannes Berg Date: Thu Jan 21 07:32:20 2010 -0800 iwlwifi: remove IBSS channel sanity check mac80211 will always enforce using a channel that the driver allowed for IBSS use. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 4a02886bae3f2362d4e6efc6fb25dd3507bde8b9 Author: Johannes Berg Date: Thu Jan 21 11:33:19 2010 -0800 iwlwifi: remove priv->active_rate_basic This variable is assigned a default value, but then assigned zero as soon as mac80211 calls a change channel (which will happen right after the hw is started) and after that it never changes again. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 470ab2dd6a7b0719e59830e11d7bc2e710867b94 Author: Johannes Berg Date: Thu Jan 21 11:23:30 2010 -0800 iwlwifi: remove never-changing priv->rates_mask variable It's always just IWL_RATES_MASK. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit 254aebf3d0439e7b0a8318f1604b3fdb4144f689 Author: Johannes Berg Date: Thu Feb 18 10:56:57 2010 -0800 iwlwifi: remove frame dropping With some of the new code in mac80211, public action frames can be exchanged as non-injected frames even while not associated. Aside from that, dropping frames here is pointless since we do deal with arbitrary frames that were injected already, so let mac80211 make the decision about which frames to allow or not. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit b4665df448b316fd5282f4947e27eaf92dc105bb Author: Johannes Berg Date: Thu Jan 21 07:32:58 2010 -0800 iwlwifi: remove dead code from iwl_mac_reset_tsf iwl_mac_reset_tsf will only ever be called in IBSS mode, so checking for other modes is not useful and the code that depends on that will not be executed. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit d6bde7d9508f9ce9a5d57b1c0fa48f43fc5defa8 Author: Johannes Berg Date: Thu Jan 21 07:26:26 2010 -0800 iwlwifi: remove superfluous channel check mac80211 will not allow using channels not marked as allowing IBSS for IBSS mode. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit e99f168c7cc2f78c07c23250fe933362847cb3e0 Author: Johannes Berg Date: Tue Jan 19 10:04:28 2010 -0800 iwlagn: remove write-only variables Updating the variables last_rx_rssi, last_tsf and last_beacon_time needs a lot of code but they are not actually used in iwlagn (only in 3945) so we can move them to the 3945 specific data. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit a4c8b2a692601de0a7bcb032b69f806050944dff Author: Johannes Berg Date: Thu Jan 21 06:25:54 2010 -0800 iwlwifi: move ICT data to agn part of union Since the ICT data is all AGN specific, it can be the first data to create the _agn part of the device-specific union in the priv struct. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit ee525d13f501baeaa33209620398adaf0a820629 Author: Johannes Berg Date: Thu Jan 21 06:09:28 2010 -0800 iwlwifi: move 3945 specific data into union To be obviously correct, this patch only modifies 3945 files and the struct definition. A follow-up patch will create the AGN part of the union. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit a1175124f34a4b859b5064efb84a197e4f6794a6 Author: Johannes Berg Date: Thu Jan 21 06:21:10 2010 -0800 iwlagn: move ICT code into separate file All the ICT ISR code is iwlagn specific, and doesn't need to be in iwlcore. So create a new iwl-agn.h header file that will hold agn specific function declarations etc., and move the ICT code into a new iwl-agn-ict.c file that is linked into iwlagn. This also gets rid of exporting those symbols. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre commit e739cf1da48e841bc5d744a99764c1a668b4bdd2 Merge: e7b184f 57d5488 Author: J. Bruce Fields Date: Tue Mar 9 17:22:08 2010 -0500 Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming commit 512ea3bc30c0e052a961e1abce8e783f3e28c92a Author: Chihau Chau Date: Mon Mar 8 20:11:34 2010 -0300 Security: key: keyring: fix some code style issues This fixes to include instead and some code style issues like to put a else sentence below close brace '}' and to replace a tab instead of some space characters. Signed-off-by: Chihau Chau Acked-by: David Howells Signed-off-by: James Morris commit eff66c519e8087e18526a6e0c5ee3dd1de1bc792 Author: Rafał Miłecki Date: Sat Feb 27 13:03:41 2010 +0100 b43: N-PHY: switch to chanspec ops Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 1b69ec7bac9cc0688ecf1411d167d1b8a34aeb07 Author: Rafał Miłecki Date: Sat Feb 27 13:03:40 2010 +0100 b43: N-PHY: implement chanspec setup Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 7955de0caf70e4aefd51d68e42f78d4bd82f26a2 Author: Rafał Miłecki Date: Sat Feb 27 13:03:39 2010 +0100 b43: N-PHY: isloate 2055 radio setup Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d24019adaae5a6498c189b42431000cf24d4d355 Author: Rafał Miłecki Date: Sat Feb 27 13:03:38 2010 +0100 b43: N-PHY: adjust gain table Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 902db91d969c0eaf70245b6d3db5be5e3cff35f4 Author: Rafał Miłecki Date: Sat Feb 27 13:03:37 2010 +0100 b43: N-PHY: switch to chanspec struct Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 036cafe4212a7d71d415b2f02cc5d6cad690dc27 Author: Rafał Miłecki Date: Sat Feb 27 13:03:36 2010 +0100 b43: N-PHY: update post init of 2055 radio Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e5255cccb26e88d0c7dd2d25b5ec2f26a3c6301d Author: Rafał Miłecki Date: Sat Feb 27 13:03:35 2010 +0100 b43: N-PHY: update writing channel-specific radio registers Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c2b7aefdc9b10c64a4e4be2303131006f9dc7013 Author: Rafał Miłecki Date: Sat Feb 27 13:03:34 2010 +0100 b43: N-PHY: turn radio on/off (rfkill) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 8987a9e98fbc6a8b74c0dfc96a69d5e8c200492a Author: Rafał Miłecki Date: Sat Feb 27 13:03:33 2010 +0100 b43: N-PHY: initialize super switch Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 9734485c8d2064f39ff77acf615e87da0766ce76 Author: Rafał Miłecki Date: Sat Feb 27 13:03:32 2010 +0100 b43: N-PHY: add some registers and structs definitions Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit fa9029f8c34576e121a4b6ddbbd645081fe50c74 Author: Johannes Berg Date: Thu Feb 25 15:13:11 2010 +0100 mac80211: use different MAC addresses for virtual interfaces Drivers can now advertise to cfg80211 that they have multiple MAC addresses reserved for a device, but we don't currently make use of that in mac80211. Change that and assign different addresses to new virtual interfaces (if addresses are available) in order to make it easier for users to use multiple virtual interfaces; they no longer need to always assign a new MAC address manually. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit df13cce53a7b28a81460e6bfc4857e9df4956141 Author: Helmut Schaa Date: Wed Feb 24 14:19:21 2010 +0100 mac80211: Improve software scan timing The current software scan implemenation in mac80211 returns to the operating channel after each scanned channel. However, in some situations (e.g. no traffic) it would be nicer to scan a few channels in a row to speed up the scan itself. Hence, after scanning a channel, check if we have queued up any tx frames and return to the operating channel in that case. Unfortunately we don't know if the AP has buffered any frames for us. Hence, scan only as many channels in a row as the pm_qos latency and the negotiated listen interval allows us to. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 74bad5cb497080514c4a945f38589bdb574fdfb7 Author: Pavel Roskin Date: Tue Feb 23 18:15:27 2010 -0500 ath9k: never read from the AR_IMR_S2 register The AR_IMR_S2 register sometimes cannot be read correctly. Instead of a valid value, 0xdeadbeef is returned. The driver has been observed writing that value back to AR_IMR_S2 after changing a few bits. Cache the register value in ah->imrs2_reg and always write chached value to the register. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b4d59a9317e41faec3d0b6a03f0454d1e8abb710 Author: Bruno Randolf Date: Tue Feb 23 18:51:13 2010 +0900 mac80211: fix rates setup on IBSS merge when an IBSS merge happened, the supported rates for the newly added station were left empty, causing the rate control module to be initialized with only the basic rates. also the section of the ibss code which deals with updating supported rates for an already existing station fails to inform the rate control module about the new rates. as i don't know how to fix this (minstrel does not have an update function), i have just added a comment for now. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 6f6b5d49105eba1be0b2ef0c04a4571f20793778 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:42 2010 +0200 wl1271: Remove tx-power level workaround This patch removes the workaround limiting chipset TX power to 12dB, instead using the value configured by the mac80211. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 0a34332f669dbcd9efc13a45b30985c30ba8f65e Author: Juuso Oikarinen Date: Mon Feb 22 08:38:41 2010 +0200 wl1271: Disable host TX rate control Disable host TX rate control. The wl1271 firmware is already managing rate control, so this eliminate unnecessary host processing. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 04e36fc5f1ff4e349ea21de8d15e4e1844d04197 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:40 2010 +0200 wl1271: Clean up TX security sequence number handling Instead of managing the TX security sequence number as two variables, use one 64 bit variable. This greatly simplifies the handling of the number. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 5c9417f1656b0f415f4be5a7cd7195ecadd7dd1a Author: Juuso Oikarinen Date: Mon Feb 22 08:38:39 2010 +0200 wl1271: Clean up firmware block allocation calculation This patch simplifies the required block count calculation. Though it introduces a division operator, it greatly simplifies the formula. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit ac5e1e39c1eeaaff7e6f03bf7cf7a444b42fbc23 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:38 2010 +0200 wl1271: Update TX packet life time handling with higher resolution time This patch uses a higher precision timer to synchronize with the firmware clock. Improved precision is needed as on some platforms a jiffy may be up to tens of milliseconds, and the required precision is closer to TU's. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 1e73eb62cec7cf78b7295769b6e51a915518f5a1 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:37 2010 +0200 wl1271: Implement looped IRQ handling This patch implements looped IRQ handling. In essence, if a new interrupt is asserted by the FW while the host is processing the previous one, the host will directly proceed processing the new IRQ without leaving the handling function. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 4aa05917051b01da037a80c3207b48aee252eed2 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:36 2010 +0200 wl1271: Don't mask interrupts while handling interrupt Don't mask firmware interrupts while processing interrupts. This allows the interrupt handler looping to work efficiently thus reducing interrupt processing latency. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 295cc0bff60bee988028dc431fa1f1a353fd18a7 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:35 2010 +0200 wl1271: Aggregate RX acknowledgements to FW This patch will ack RX frames read from the firmware in one single write, instead of acking all the frames separately. This will reduce the amount of required communication per frame. Signed-off-by: Juuso Oikarinen Reviewed-by: Teemu Paasikivi Signed-off-by: John W. Linville commit 18f8d468919da89185e2ab90cefa6c4a1936038e Author: Juuso Oikarinen Date: Mon Feb 22 08:38:34 2010 +0200 wl1271: Remove annoying PSM entry/exit kernel traces Remove the annoying and dmesg-flooding WLAN PSM entry/exit traces. Instead, only output them if PSM traces are enabled. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 06f7bc7db79fabe6b2ec16eff0f59e4acc21eb72 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:33 2010 +0200 wl1271: Fix queue stopping/waking for TX path The queue stopping/waking functionality was broken in a way that could cause huge latencies in TX transfers and even cause the TX to stall in the right circumstances. Correct these problems. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 15305498a443c181c8fb5deafb94eae585fe3ad5 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:32 2010 +0200 wl1271: Fix ad-hoc mode neighborhood detection This patch fixes a bug in ad-hoc mode preventing mac80211 from properly detecting other ad-hoc networks with the same SSID. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit ffb591cd0e32d817bdbd359dead3baa770b999f8 Author: Juuso Oikarinen Date: Mon Feb 22 08:38:31 2010 +0200 wl1271: Improvements to the TX path - Fix a TX result overflow problem that was present in the TX path and visible with at least linksys AP's (probably any AP with high throughput capability.) - Optimize TX by writing FW trigger for a group of TX frames instead of each and every frame. - Slightly optimize the TX path code. Signed-off-by: Juuso Oikarinen Reviewed-by: Kalle Valo Signed-off-by: John W. Linville commit 93c5bb68c89eff0cd41afce8ac932d12cc9d7ae8 Author: Kalle Valo Date: Mon Feb 22 08:38:30 2010 +0200 wl1271: don't get received frames from hardware in PLT mode Most probably patch "wl1271: add most of the normal initialization commands to PLT mode" enabled the RX path in firmware so that now driver received frames and passed them to mac80211, which warned about them. Workaround this by not retrieving frames from the hardware, just ignore them. Signed-off-by: Kalle Valo Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 49d7f6d8113a04abacdf99525db9c17d872c1efa Author: Teemu Paasikivi Date: Mon Feb 22 08:38:29 2010 +0200 wl1271: Fixed unloading of the wl1271_sdio module Fixed two bugs causing problems when unloding wl1271 module. First was missing sdio_set_drvdata call from the probe function, second was order of function calls in the remove function. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 09a9c2b3f464e757b6597f621cc3bedb6f040a27 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:28 2010 +0200 wl1271: Changed access to fw status register to use raw read Changed access to fw status register to use raw read instead of translated addressing. On SDIO access by translated addressing was not working and raw access is working also on SPI. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 5129dffebd4eab1749e63bb4a1b7abdc92903227 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:27 2010 +0200 wl1271: Initial SDIO implementation Added initial implementation of SDIO interfacte to the wl1271 driver. When selected, this adds new module called "wl1271_sdio". Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 50b3eb4bdda4690fc2848079f209b8d605c89fb5 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:26 2010 +0200 wl1271: Divided driver to two separate modules Divided wl1271 driver to wl1271 "core" and wl1271_spi modules in preparation of integration of the SDIO implementation. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 760d969f9e91a734161a5979a3b3818062e80b7e Author: Teemu Paasikivi Date: Mon Feb 22 08:38:25 2010 +0200 wl1271: Removed wl1271_spi.h and made some functions static Removed wl1271_spi.h header as there's no more need to access functions declared there outside of wl1271_spi.c. Also made those SPI access functions static. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit b42f91ba49ff135392b8f6140e21f85fb0467285 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:24 2010 +0200 wl1271: Inlined IO functions Changed IO functions to static inline. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 8197b7118add28f9aaa99c1fb73c0e201c8cde52 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:23 2010 +0200 wl1271: Implemented abstraction of IO functions. Changed the driver to use if_ops structure to abstract access to the IO layer (SPI or SDIO). Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 54f7e5037c95f2beff0252bfcf288f711c185799 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:22 2010 +0200 wl1271: Added functions to enable/disable interrupt handling Added/moved enable and disable interrupt handling functions. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit 2d5e82b8bcda58ec1e2fae5277a81e5fd067e627 Author: Teemu Paasikivi Date: Mon Feb 22 08:38:21 2010 +0200 wl1271: Moved module basics to wl1271_spi.c Moved wl1271 drivers probe, remove etc. functions and structres to wl1271_spi.c from wl1271_main.c in preparation of implementing SDIO interface. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Juuso Oikarinen Signed-off-by: John W. Linville commit d57b87fde86a641da7782b99bec0a3130ed32f4a Author: Christian Lamparter Date: Fri Feb 19 22:34:39 2010 +0100 p54: Enable HW_REPORTS_TX_ACK_STATUS P54 devices always generate a full tx_status report (ACK, PSM, rate control, etc..) for every xmitted frame. Therefore, I think The driver qualifies for the REPORTS_TX_ACK_STATUS hardware feature flag. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit ec182d976345b5eb671fe879ad73b90fe29a34e9 Author: Pavel Roskin Date: Thu Feb 18 20:28:41 2010 -0500 ath5k: move ath5k_hw_register_timeout() into reset.c ath5k_hw_register_timeout() was duplicated between phy.c and reset.c. Since it is too big and too much used to be an inline function, move it away from the ath5k.h header into reset.c. Remove _ATH5K_RESET and _ATH5K_PHY defines. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a25d1e4cd7799570ecea6b5dcc4dbf5a6d5336bf Author: Pavel Roskin Date: Thu Feb 18 20:28:23 2010 -0500 ath5k: remove useless "extern" from function declarations Adjust formatting of the affected lines to satisfy checkpatch.pl. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 626ede6b1aafb3a8cadfdd04b512fd1d3dc2113e Author: Pavel Roskin Date: Thu Feb 18 20:28:02 2010 -0500 ath5k: remove stale function declarations, make some functions static Remove all unnecessary function declarations from ath5k.h. Comment out unused functions. Remove ath5k_hw_get_tsf32(), which is too trivial to be commented out. Make functions static if suggested by sparse. Make ath5k_pm_ops static. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 62bb2ac5cb6c2f813e151617525ec518e2d1c649 Author: Johannes Berg Date: Wed Feb 17 21:27:26 2010 +0100 mac80211: deprecate RX status noise The noise value as is won't be used, isn't filled by most drivers and doesn't really make a whole lot of sense on a per packet basis -- proper cfg80211 survey support in mac80211 will need to be different. Mark the struct member as deprecated so it will be removed from drivers. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 3a9d620278981f367a77a8888c0d59a70473b056 Author: Kuninori Morimoto Date: Mon Mar 1 10:10:43 2010 +0900 ASoC: da7210: Add 8/12/16/24/32/48/96 kHz rate support Signed-off-by: Phil Edworthy Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 Author: Paul Mundt Date: Mon Mar 8 21:46:37 2010 +0900 sh: Support early clkdev allocations. early platform devices and the like may need to set up clock aliases, which require an allocation at a time well before the slab allocators are available. The clock framework comes up after bootmem, so using bootmem as a fallback should be sufficient. Signed-off-by: Paul Mundt commit 51a5006afcd13176276f0935ee57c4cc6f210e83 Author: Paul Mundt Date: Mon Mar 8 21:45:19 2010 +0900 sh: Merge clkdev API updates. This rolls in the remainder of the clkdev API bits from the ARM tree. This can more or less be used verbatim, so we just copy it over and nuke our local version. Signed-off-by: Paul Mundt commit c43a7523470dc2d9947fa114a0b54317975d4c04 Merge: eaa5eec 634a539 Author: James Morris Date: Tue Mar 9 12:46:47 2010 +1100 Merge branch 'next-queue' into next commit 7b4df05537f4e6c0c3524055ece7f99b5c98cc87 Author: YOSHIFUJI Hideaki Date: Mon Mar 8 13:17:01 2010 +0100 netfilter: remove stale declaration for ip6_masked_addrcmp() Commit f2ffd9ee... ("[NETFILTER]: Move ip6_masked_addrcmp to include/net/ipv6.h") replaced ip6_masked_addrcmp() with ipv6_masked_addr_cmp(). Function definition went away. Let's remove its declaration as well in header file. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: Patrick McHardy commit 0898f99a267f89a7dc72cc687955f17613a711b8 Author: YOSHIFUJI Hideaki Date: Mon Mar 8 13:15:59 2010 +0100 netfilter: ebt_ip6: Use ipv6_masked_addr_cmp() Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: Bart De Schuymer Signed-off-by: Patrick McHardy commit 63e690caf24e8f43ba019fe1107669746b072d80 Author: Andrea Gelmini Date: Mon Mar 8 13:13:07 2010 +0100 netfilter: include/linux/netfilter/nf_conntrack_tuple_common.h: Checkpatch cleanup include/linux/netfilter/nf_conntrack_tuple_common.h:5: ERROR: open brace '{' following enum go on the same line Signed-off-by: Andrea Gelmini Acked-by: David S. Miller Signed-off-by: Patrick McHardy commit f790c0ca6fad60b544bb73eda8cc841a6436725b Merge: 9ab48dd 25cf84c Author: Patrick McHardy Date: Mon Mar 8 12:55:23 2010 +0100 Merge branch 'master' of /repos/git/linux-2.6 Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c Signed-off-by: Patrick McHardy commit 634a539e16bd7a1ba31c3f832baa725565cc9f96 Author: Stephen Hemminger Date: Thu Mar 4 21:59:03 2010 -0800 selinux: const strings in tables Several places strings tables are used that should be declared const. Signed-off-by: Stephen Hemminger Signed-off-by: James Morris commit 12c7389abe5786349d3ea6da1961cf78d0c1c7cd Author: Joerg Roedel Date: Thu Jan 21 11:50:28 2010 +0100 iommu-api: Remove iommu_{un}map_range functions These functions are not longer used and can be removed savely. There functionality is now provided by the iommu_{un}map functions which are also capable of multiple page sizes. Signed-off-by: Joerg Roedel commit 468e2366cdb80cf8a691b8bc212260cfbdbd518e Author: Joerg Roedel Date: Thu Jan 21 16:37:36 2010 +0100 x86/amd-iommu: Implement ->{un}map callbacks for iommu-api This patch implements the new callbacks for the IOMMU-API with functions that can handle different page sizes in the IOMMU page table. Signed-off-by: Joerg Roedel commit f03152bb7d0a74f409ad63ed36916444a7493d72 Author: Joerg Roedel Date: Thu Jan 21 16:15:24 2010 +0100 x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes This patch extends the amd_iommu_iova_to_phys() function to handle different page sizes correctly. It doesn't use fetch_pte() anymore because we don't know (or care about) the page_size used for mapping the given iova. Signed-off-by: Joerg Roedel commit 24cd772315c19e4d9409d0d21367ec1ebab3149f Author: Joerg Roedel Date: Tue Jan 19 17:27:39 2010 +0100 x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes This patch extends the functionality of iommu_unmap_page and fetch_pte to support arbitrary page sizes. Signed-off-by: Joerg Roedel commit cbb9d729f3433c9c2660b01dc52e6deb89488886 Author: Joerg Roedel Date: Fri Jan 15 14:41:15 2010 +0100 x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes This patch changes the old map_size parameter of alloc_pte to a page_size parameter which can be used more easily to alloc a pte for intermediate page sizes. Signed-off-by: Joerg Roedel commit fcd95807fb61e67d602610e7ff7129ed769e9fee Author: Joerg Roedel Date: Mon Jan 11 16:38:18 2010 +0100 kvm: Change kvm_iommu_map_pages to map large pages This patch changes the implementation of of kvm_iommu_map_pages to map the pages with the host page size into the io virtual address space. Signed-off-by: Joerg Roedel Acked-By: Avi Kivity commit b146a1c9f7f1feeacf840fa1ba197a99593cea15 Author: Joerg Roedel Date: Wed Jan 20 17:17:37 2010 +0100 VT-d: Change {un}map_range functions to implement {un}map interface This patch changes the iommu-api functions for mapping and unmapping page ranges to use the new page-size based interface. This allows to remove the range based functions later. Signed-off-by: Joerg Roedel commit 67651786948c360c3122b8a17cb1e59209d50880 Author: Joerg Roedel Date: Thu Jan 21 16:32:27 2010 +0100 iommu-api: Add ->{un}map callbacks to iommu_ops This patch adds new callbacks for mapping and unmapping pages to the iommu_ops structure. These callbacks are aware of page sizes which makes them different to the ->{un}map_range callbacks. Signed-off-by: Joerg Roedel commit cefc53c7f494240d4813c80154c7617452d1904d Author: Joerg Roedel Date: Fri Jan 8 13:35:09 2010 +0100 iommu-api: Add iommu_map and iommu_unmap functions These two functions provide support for mapping and unmapping physical addresses to io virtual addresses. The difference to the iommu_(un)map_range() is that the new functions take a gfp_order parameter instead of a size. This allows the IOMMU backend implementations to detect easier if a given range can be mapped by larger page sizes. These new functions should replace the old ones in the long term. Signed-off-by: Joerg Roedel commit 4abc14a733f9002c05623db755aaafdd27fa7a91 Author: Joerg Roedel Date: Wed Jan 20 14:52:23 2010 +0100 iommu-api: Rename ->{un}map function pointers to ->{un}map_range The new function pointer names match better with the top-level functions of the iommu-api which are using them. Main intention of this change is to make the ->{un}map pointer names free for two new mapping functions. Signed-off-by: Joerg Roedel commit e7b184f199fd3c80b618ec8244cbda70857d2779 Author: J. Bruce Fields Date: Tue Mar 2 11:18:40 2010 -0500 nfsd4: document lease/grace-period limits The current documentation here is out of date, and not quite right. (Future work: some user documentation would be useful.) Signed-off-by: J. Bruce Fields commit efc4bb4fdd09c11f5558446e584a494c6feb43c7 Author: J. Bruce Fields Date: Tue Mar 2 11:04:06 2010 -0500 nfsd4: allow setting grace period time Allow explicit configuration of the grace period time as well as the lease period time. Signed-off-by: J. Bruce Fields commit f013574014816c7a557b3c52233f3620463f0b9b Author: J. Bruce Fields Date: Mon Mar 1 19:32:36 2010 -0500 nfsd4: reshuffle lease-setting code to allow reuse We'll soon allow setting the grace period, so we'll want to share this code. Signed-off-by: J. Bruce Fields commit f958a1320ff7a1e0e861d3c90de6da12a88839dc Author: J. Bruce Fields Date: Mon Mar 1 19:43:02 2010 -0500 nfsd4: remove unnecessary lease-setting function This is another layer of indirection that doesn't really buy us anything. Signed-off-by: J. Bruce Fields commit e46b498c84163e86e2627c30bca298c968664f65 Author: J. Bruce Fields Date: Mon Mar 1 19:21:21 2010 -0500 nfsd4: simplify lease/grace interaction The original code here assumed we'd allow the user to change the lease any time, but only allow the change to take effect on restart. Since then we modified the code to allow setting the lease on when the server is down. Update the rest of the code to reflect that fact, clarify variable names, and add document. Also, the code insisted that the grace period always be the longer of the old and new lease periods, but that's overly conservative--as long as it lasts at least the old lease period, old clients should still know to recover in time. Signed-off-by: J. Bruce Fields commit cf07d2ea43e5c22149435ee9002cb737eac20eca Author: J. Bruce Fields Date: Sun Feb 28 23:20:19 2010 -0500 nfsd4: simplify references to nfsd4 lease time Instead of accessing the lease time directly, some users call nfs4_lease_time(), and some a macro, NFSD_LEASE_TIME, defined as nfs4_lease_time(). Neither layer of indirection serves any purpose. Signed-off-by: J. Bruce Fields commit 692247196dd845eef02f26bf2959719b82e935c6 Author: Mark Brown Date: Wed Mar 3 14:57:09 2010 +0000 ASoC: Improve DAPM pop_wait delays Currently during pop/click debug we're inserting a delay both after every log message we generate and at explicit points in the sequence, slowing things down even further than they need to be especially when many writes get coalesced by the sequence generation code. Remove the per-printk delay and ensure that we have explicit delays where we say we want them. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1d24452b5536bd5c0c7721887a38d736b885014f Author: Mark Brown Date: Thu Mar 4 11:03:26 2010 +0000 ASoC: Remove unused pmdown_time flag The flag is no longer used in the code so it just wastes a bit. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit bc6552f4717e07e7737b5dc17883c2ff99f2a315 Author: Mark Brown Date: Fri Mar 5 16:27:15 2010 +0000 ASoC: Add 16/16 registers to soc-cache I2C only at the minute. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207 Merge: 767d75a 2b9ddcb Author: Takashi Iwai Date: Fri Mar 5 08:23:32 2010 +0100 Merge branch 'topic/misc' into topic/usb commit 767d75ad1c08c31646498a13837a5c59db90ccad Author: Daniel Mack Date: Thu Mar 4 19:46:17 2010 +0100 ALSA: usb-audio: add support for samplerate setting on v2 devices Sample rate setting is done with a 4-byte long class request that addresses the interface. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 29088fef3e3f62147c1dd53d764da4f04bf3188d Author: Clemens Ladisch Date: Thu Mar 4 19:46:16 2010 +0100 ALSA: usb-audio: support multiple formats with audio class v2 devices Change the parser to correctly handle v2 descriptors with multiple format bits set. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 015eb0b08150c6fef843efe22609589ead3d4fb8 Author: Clemens Ladisch Date: Thu Mar 4 19:46:15 2010 +0100 ALSA: usb-audio: use a format bitmask per alternate setting In preparation for USB audio 2.0 support, change the audioformat structure so that it uses a bitmask to specify possible formats. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit e11b4e0e4f5ab40ec342dc07b7201c09a45f9574 Author: Clemens Ladisch Date: Thu Mar 4 19:46:14 2010 +0100 ALSA: usb-audio: rename substream format field to altset_idx The snd_usb_substream::format field actually contains the index of the current alternate setting, so rename it to altset_idx to avoid confusion. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit e5779998bf8b70e48a6cc208c8b61b33bd6117ea Author: Daniel Mack Date: Thu Mar 4 19:46:13 2010 +0100 ALSA: usb-audio: refactor code Clean up the usb audio driver by factoring out a lot of functions to separate files. Code for procfs, quirks, urbs, format parsers etc all got a new home now. Moved almost all special quirk handling to quirks.c and introduced new generic functions to handle them, so the exceptions do not pollute the whole driver. Renamed usbaudio.c to card.c because this is what it actually does now. Renamed usbmidi.c to midi.c for namespace clarity. Removed more things from usbaudio.h. The non-standard drivers were adopted accordingly. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit 3e1aebef6fb55e35668d2d7cf608cf03f30c904f Author: Daniel Mack Date: Thu Mar 4 19:46:12 2010 +0100 ALSA: usb-audio: header file cleanups Rename snd-usb-lib to snd-usbmidi-lib as MIDI functions are the only thing it actually contains. Introduce a new header file to only declare these functions. Introduced usbmixer.h for all functions exported by usbmixer.c. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit bc700ab1407864ebee838de53c9565a394f4da38 Author: Daniel Mack Date: Thu Mar 4 19:46:11 2010 +0100 ALSA: usb-audio: move ua101 driver As part of the USB audio code cleanup, move the non-standard ua101 driver out of the way. Signed-off-by: Daniel Mack Cc: Clemens Ladisch Signed-off-by: Takashi Iwai commit c8563473c1259f5686ceb918c548c80132089f79 Author: wzt.wzt@gmail.com Date: Thu Mar 4 21:26:23 2010 +0800 Security: Fix some coding styles in security/keys/keyring.c Fix some coding styles in security/keys/keyring.c Signed-off-by: Zhitong Wang Signed-off-by: James Morris commit 1ca7578043a79d74152774acee0ed6e393134d12 Author: Mark Brown Date: Thu Mar 4 14:54:40 2010 +0000 ASoC: Add delay information for Samsung IISv2 DAIs Report the current FIFO depth when delay is queried. The FIFO is only 16 frames deep so the latency will be at most a couple of miliseconds (and we tend to end up reporting zero most of the time) but it may help some applications. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 06b9b72df43800b9ae4e77202c8bf5848c9d6998 Author: wzt.wzt@gmail.com Date: Wed Mar 3 21:29:37 2010 +0800 Selinux: Remove unused headers skbuff.h in selinux/nlmsgtab.c skbuff.h is already included by netlink.h, so remove it. Signed-off-by: Zhitong Wang Signed-off-by: James Morris commit 913d7b4cc0d958df9f2e4bc0e6926c037d96d07e Author: Mark Brown Date: Wed Mar 3 13:47:03 2010 +0000 ASoC: Add support for WM8960 capless mode The WM8960 headphone outputs can be run in capless mode with OUT3 used to drive a pseudo ground for the headphone drivers. In this mode the mono mixer is not used, the mixer should be turned on in concert with the headphone output drivers and the device bias levels are managed differently. Also tweak the existing bias management to remove the use of active discharge while we're at it since that's often audible. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b6877a477d356a7c07a6c173d58c34a0a6abb086 Author: Mark Brown Date: Wed Mar 3 11:43:38 2010 +0000 ASoC: Move WM8960 platform data into include/sound Avoids machine files having to peer into sound/soc which is a bit rude and icky. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a24d62d297fad31c866eef28e3d8b691a2b14a92 Author: Mark Brown Date: Mon Mar 1 20:00:04 2010 +0000 ASoC: Prettify wm8960 logging The driver name gets used by dev_() logging so use something a bit more idiomatic. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 258020d0882e89c1462800a70eb414b8a4fec78c Author: Peter Ujfalusi Date: Wed Mar 3 15:08:07 2010 +0200 ASoC: core: Add delay operation to snd_soc_dai_ops The delay callback can be used by the core to query the delay on the dai caused by FIFO or delay in the platform side. In case if both CPU and CODEC dai has FIFO the delay reported by each will be added to form the full delay on the chain. If none of the dai has FIFO, than the delay will be kept as zero. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 377b6f62effcb91c53cd7ff8709a94d72d23b6ae Author: Peter Ujfalusi Date: Wed Mar 3 15:08:06 2010 +0200 ASoC: core: soc level wrapper for pcm_pointer callback Create a soc level wrapper for pcm_pointer callback. This will facilitate the soc level handling of different HW buffers in the audio path. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 50831450503b828b3f8c031aa664340062afb3b0 Author: Peter Ujfalusi Date: Wed Mar 3 15:08:04 2010 +0200 ASoC: core: fix tailing whitespace in soc_pcm_apply_symmetry My editor removes the tailing spaces, which causes problems when changing the soc-core.c Removing the space. Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit eeec124685164cb8f9bbf274e1d4c9b9c2f8d6c9 Author: Mark Brown Date: Tue Feb 23 11:15:34 2010 +0000 ASoC: Wolfson Microelectronics 1133-EV1 audio support Initial support for audio using the 1133-EV1 audio and PMIC module for the i.MX31ADS. Currently only playback is supported, and the FIQ DMA driver has performance problems at higher sample rates which cause audible dropouts. This driver is based heavily on an out of tree one written by Liam Girdwood. Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown commit dbba541f9d9bd2c200041bc1b37c59dbaf9beb75 Author: wzt.wzt@gmail.com Date: Tue Mar 2 17:03:43 2010 +0800 Selinux: Remove unused headers slab.h in selinux/ss/symtab.c slab.h is unused in symtab.c, so remove it. Signed-off-by: Zhitong Wang Signed-off-by: James Morris commit 31637b55b09753de9d5e24afc3a1d7fbdb2108d8 Author: wzt.wzt@gmail.com Date: Tue Mar 2 15:08:58 2010 +0800 Selinux: Remove unused headers list.h in selinux/netlink.c list.h is unused in netlink.c, so remove it. Signed-off-by: Zhitong Wang Signed-off-by: James Morris commit b380de9e54ec354ccac55fd9a611ffe28b4daa76 Author: Tetsuo Handa Date: Mon Mar 1 19:47:04 2010 +0900 TOMOYO: Remove unused variables. Variable "atmark" is currently unused. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit c1e992b99603a84d7debb188542b64f2d9232c07 Author: wzt.wzt@gmail.com Date: Fri Feb 26 22:49:55 2010 +0800 Security: Add __init to register_security to disable load a security module on runtime LSM framework doesn't allow to load a security module on runtime, it must be loaded on boot time. but in security/security.c: int register_security(struct security_operations *ops) { ... if (security_ops != &default_security_ops) return -EAGAIN; ... } if security_ops == &default_security_ops, it can access to register a security module. If selinux is enabled, other security modules can't register, but if selinux is disabled on boot time, the security_ops was set to default_security_ops, LSM allows other kernel modules to use register_security() to register a not trust security module. For example: disable selinux on boot time(selinux=0). #include #include #include #include #include #include #include MODULE_LICENSE("GPL"); MODULE_AUTHOR("wzt"); extern int register_security(struct security_operations *ops); int (*new_register_security)(struct security_operations *ops); int rootkit_bprm_check_security(struct linux_binprm *bprm) { return 0; } struct security_operations rootkit_ops = { .bprm_check_security = rootkit_bprm_check_security, }; static int rootkit_init(void) { printk("Load LSM rootkit module.\n"); /* cat /proc/kallsyms | grep register_security */ new_register_security = 0xc0756689; if (new_register_security(&rootkit_ops)) { printk("Can't register rootkit module.\n"); return 0; } printk("Register rootkit module ok.\n"); return 0; } static void rootkit_exit(void) { printk("Unload LSM rootkit module.\n"); } module_init(rootkit_init); module_exit(rootkit_exit); Signed-off-by: Zhitong Wang Signed-off-by: James Morris commit bc078e4eab65f11bbaeed380593ab8151b30d703 Author: Martin Schwidefsky Date: Tue Mar 2 16:01:10 2010 +0100 oprofile: convert oprofile from timer_hook to hrtimer Oprofile is currently broken on systems running with NOHZ enabled. A maximum of 1 tick is accounted via the timer_hook if a cpu sleeps for a longer period of time. This does bad things to the percentages in the profiler output. To solve this problem convert oprofile to use a restarting hrtimer instead of the timer_hook. Signed-off-by: Martin Schwidefsky Signed-off-by: Robert Richter commit ced918eb748ce30b3aace549fd17540e40ffdca0 Author: Thomas Gleixner Date: Wed Feb 17 16:47:10 2010 +0000 i8253: Convert i8253_lock to raw_spinlock i8253_lock needs to be a real spinlock in preempt-rt, i.e. it can not be converted to a sleeping lock. Convert it to raw_spinlock and fix up all users. Signed-off-by: Thomas Gleixner Acked-by: Ralf Baechle Acked-by: Dmitry Torokhov Acked-by: Takashi Iwai Cc: Jens Axboe LKML-Reference: <20100217163751.030764372@linutronix.de> commit 372e22ef0a87d5fc10d387791f9f19721115820c Author: Randy Dunlap Date: Mon Mar 1 22:06:25 2010 -0800 x86, docbook: Fix errors from x86 headers merger Fix docbook errors for x86 headers that were recently merged: docproc: arch/x86/include/asm/atomic_32.h: No such file or directory docproc: arch/x86/include/asm/io_32.h: No such file or directory Signed-off-by: Randy Dunlap LKML-Reference: <20100301220625.bad46c19.randy.dunlap@oracle.com> Cc: Brian Gerst Signed-off-by: H. Peter Anvin commit 4daa2a8093ecd1148270a1fc64e99f072b8c2901 Author: Pallipadi, Venkatesh Date: Wed Feb 24 13:43:55 2010 -0800 x86, pat: In rbt_memtype_check_insert(), update new->type only if valid new->type should only change when there is a valid ret_type. Otherwise the requested type and return type should be same. Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20100224214355.GA16431@linux-os.sc.intel.com> Tested-by: Jack Steiner Signed-off-by: H. Peter Anvin commit a5c9161f27c3e1ae6c0094d262f03a7e98262181 Author: H. Peter Anvin Date: Mon Mar 1 11:49:23 2010 -0800 x86, atomic64: In selftest, distinguish x86-64 from 586+ The x86-64 implementation of the atomics is totally different from the i586+ implementation, which makes it quite confusing to call it "586+". Also fix indentation, and add "i" for "i386" and "i586" as used elsewhere in the kernel. Signed-off-by: H. Peter Anvin Cc: Luca Barbieri LKML-Reference: <1267005265-27958-4-git-send-email-luca@luca-barbieri.com> commit f3e83131469e29032a700217aa394996107b8fc5 Author: Luca Barbieri Date: Mon Mar 1 19:55:49 2010 +0100 x86-32: Fix atomic64_inc_not_zero return value convention atomic64_inc_not_zero must return 1 if it perfomed the add and 0 otherwise. It was doing the opposite thing. Signed-off-by: Luca Barbieri LKML-Reference: <1267469749-11878-6-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 25a304f277ad70166eeae25a4958d2049005c33a Author: Luca Barbieri Date: Mon Mar 1 19:55:48 2010 +0100 lib: Fix atomic64_inc_not_zero test atomic64_inc_not_zero must return 1 if it perfomed the add and 0 otherwise. The test assumed the opposite convention. Signed-off-by: Luca Barbieri LKML-Reference: <1267469749-11878-5-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 97577896f6b9c056fa0a5e9f6a608110cb3dcd33 Author: Luca Barbieri Date: Mon Mar 1 19:55:47 2010 +0100 lib: Fix atomic64_add_unless return value convention atomic64_add_unless must return 1 if it perfomed the add and 0 otherwise. The generic implementation did the opposite thing. Reported-by: H. Peter Anvin Confirmed-by: Paul Mackerras Signed-off-by: Luca Barbieri LKML-Reference: <1267469749-11878-4-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 6e6104fe085026e6ef82cc5cc303d6c8ceb7e411 Author: Luca Barbieri Date: Mon Mar 1 19:55:46 2010 +0100 x86-32: Fix atomic64_add_unless return value convention atomic64_add_unless must return 1 if it perfomed the add and 0 otherwise. The implementation did the opposite thing. Reported-by: H. Peter Anvin Signed-off-by: Luca Barbieri LKML-Reference: <1267469749-11878-3-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 9efbcd590243045111670c171a951923b877b57d Author: Luca Barbieri Date: Mon Mar 1 19:55:45 2010 +0100 lib: Fix atomic64_add_unless test atomic64_add_unless must return 1 if it perfomed the add and 0 otherwise. The test assumed the opposite convention. Reported-by: H. Peter Anvin Signed-off-by: Luca Barbieri LKML-Reference: <1267469749-11878-2-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit d7f6de1e9c4a12e11ba7186c70f0f40caa76f590 Author: Luca Barbieri Date: Fri Feb 26 12:22:41 2010 +0100 x86: Implement atomic[64]_dec_if_positive() Add support for atomic_dec_if_positive(), and atomic64_dec_if_positive() for x86-64. atomic64_dec_if_positive() for x86-32 was already implemented in a previous patch. Signed-off-by: Luca Barbieri LKML-Reference: <1267183361-20775-2-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 8f4f202b335144bf5be5c9e5b1bc9477ecdae958 Author: Luca Barbieri Date: Fri Feb 26 12:22:40 2010 +0100 lib: Only test atomic64_dec_if_positive on archs having it Currently atomic64_dec_if_positive() is only supported by PowerPC, MIPS and x86-32. Signed-off-by: Luca Barbieri LKML-Reference: <1267183361-20775-1-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 14dc5734bdac2629ed4228f3d30662bb440a3982 Author: Jassi Brar Date: Fri Feb 26 09:12:32 2010 +0900 ASoC: Allow mulitple usage count of codec and cpu dai If we are to have a snd_soc_dai i.e, cpu_dai and codec_dai, shared among two or more dai_links we need to log the number of active users of the dai. For that, we change semantics of the snd_soc_dai.active flag from indicator to reference counter. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a7e926abc3adfbd2e5e20d2b46177adb4e313915 Author: Luca Barbieri Date: Wed Feb 24 10:54:25 2010 +0100 x86-32: Rewrite 32-bit atomic64 functions in assembly This patch replaces atomic64_32.c with two assembly implementations, one for 386/486 machines using pushf/cli/popf and one for 586+ machines using cmpxchg8b. The cmpxchg8b implementation provides the following advantages over the current one: 1. Implements atomic64_add_unless, atomic64_dec_if_positive and atomic64_inc_not_zero 2. Uses the ZF flag changed by cmpxchg8b instead of doing a comparison 3. Uses custom register calling conventions that reduce or eliminate register moves to suit cmpxchg8b 4. Reads the initial value instead of using cmpxchg8b to do that. Currently we use lock xaddl and movl, which seems the fastest. 5. Does not use the lock prefix for atomic64_set 64-bit writes are already atomic, so we don't need that. We still need it for atomic64_read to avoid restoring a value changed in the meantime. 6. Allocates registers as well or better than gcc The 386 implementation provides support for 386 and 486 machines. 386/486 SMP is not supported (we dropped it), but such support can be added easily if desired. A pure assembly implementation is required due to the custom calling conventions, and desire to use %ebp in atomic64_add_return (we need 7 registers...), as well as the ability to use pushf/popf in the 386 code without an intermediate pop/push. The parameter names are changed to match the convention in atomic_64.h Changes in v3 (due to rebasing to tip/x86/asm): - Patches atomic64_32.h instead of atomic_32.h - Uses the CALL alternative mechanism from commit 1b1d9258181bae199dc940f4bd0298126b9a73d9 Changes in v2: - Merged 386 and cx8 support in the same patch - 386 support now done in assembly, C code no longer used at all - cmpxchg64 is used for atomic64_cmpxchg - stop using macros, use one-line inline functions instead - miscellanous changes and improvements Signed-off-by: Luca Barbieri LKML-Reference: <1267005265-27958-5-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 86a8938078a8bb518c5376de493e348c7490d506 Author: Luca Barbieri Date: Wed Feb 24 10:54:24 2010 +0100 lib: Add self-test for atomic64_t This patch adds self-test on boot code for atomic64_t. This has been used to test the later changes in this patchset. Signed-off-by: Luca Barbieri LKML-Reference: <1267005265-27958-4-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 9c76b38476b18c45f97098a10b0176b321eba3ea Author: Luca Barbieri Date: Wed Feb 24 10:54:23 2010 +0100 x86-32: Allow UP/SMP lock replacement in cmpxchg64 Use the functionality just introduced in the previous patch: mark the lock prefixes in cmpxchg64 alternatives for UP removal. Changes in v2: - Naming change Signed-off-by: Luca Barbieri LKML-Reference: <1267005265-27958-3-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit b3ac891b67bd4b1fc728d1c784cad1212dea433d Author: Luca Barbieri Date: Wed Feb 24 10:54:22 2010 +0100 x86: Add support for lock prefix in alternatives The current lock prefix UP/SMP alternative code doesn't allow LOCK_PREFIX to be used in alternatives code. This patch solves the problem by adding a new LOCK_PREFIX_ALTERNATIVE_PATCH macro that only records the lock prefix location but does not emit the prefix. The user of this macro can then start any alternative sequence with "lock" and have it UP/SMP patched. To make this work, the UP/SMP alternative code is changed to do the lock/DS prefix switching only if the byte actually contains a lock or DS prefix. Thus, if an alternative without the "lock" is selected, it will now do nothing instead of clobbering the code. Changes in v2: - Naming change - Change label to not conflict with alternatives Signed-off-by: Luca Barbieri LKML-Reference: <1267005265-27958-2-git-send-email-luca@luca-barbieri.com> Signed-off-by: H. Peter Anvin commit 6423c1875c87fa5ae56974ab8386d7c6110e3701 Author: jassi brar Date: Mon Feb 22 16:00:20 2010 +0900 ASoC: Remove runtime field from DAI In order for having snd_soc_dais shared among two or more dai_links, remove the relatively global runtime field from the struct snd_soc_dai Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 10cab262f49ee4574a20ab4c445bc4fdc41c36a8 Author: jassi brar Date: Mon Feb 22 15:59:02 2010 +0900 ASoC: Change how suspend and resume obtain the PCM runtime Currently only the atmel driver make use of snd_soc_dai.runtime field. If the dais are to be shared among two or more dai_links, the field must be got rid of. So, in atmel driver reach the substream via dai_link->pcm so as to not depend of snd_soc_dai.runtime field. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d273ebe77a780d3aba1f5b86615af3b0e87b76bf Author: jassi brar Date: Mon Feb 22 15:58:04 2010 +0900 ASoC: Pass dai_link as argument to platform suspend and resume Passing pointer to relevant dai_link provides easier reach to the ASoC tree in suspend/resume of snd_soc_platform. It also provides direct access to the dai at the other end of the dai_link. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9e41a49aab88a5a6c8f4875bf10a5543bc321f2d Author: Pallipadi, Venkatesh Date: Wed Feb 10 15:26:07 2010 -0800 x86, pat: Migrate to rbtree only backend for pat memtype management Move pat backend to fully rbtree based implementation from the existing rbtree and linked list hybrid. New rbtree based solution uses interval trees (augmented rbtrees) in order to store the PAT ranges. The new code seprates out the pat backend to pat_rbtree.c file, making is cleaner. The change also makes the PAT lookup, reserve and free operations more optimal, as we don't have to traverse linear linked list of few tens of entries in normal case. Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20100210232607.GB11465@linux-os.sc.intel.com> Signed-off-by: Suresh Siddha Signed-off-by: H. Peter Anvin commit be5a0c126ad1dea2128dc5aef12c87083518d1ab Author: venkatesh.pallipadi@intel.com Date: Wed Feb 10 11:57:06 2010 -0800 x86, pat: Preparatory changes in pat.c for bigger rbtree change Minor changes in pat.c to cleanup code and make it smoother to introduce bigger rbtree only change in the following patch. The changes are cleaup only and should not have any functional impact. Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20100210195909.792781000@intel.com> Signed-off-by: Suresh Siddha Signed-off-by: H. Peter Anvin commit 17d9ddc72fb8bba0d4f67868c9c612e472a594a9 Author: Pallipadi, Venkatesh Date: Wed Feb 10 15:23:44 2010 -0800 rbtree: Add support for augmented rbtrees Add support for augmented rbtrees in core rbtree code. This will be used in subsequent patches, in x86 PAT code, which needs interval trees to efficiently keep track of PAT ranges. Signed-off-by: Venkatesh Pallipadi LKML-Reference: <20100210232343.GA11465@linux-os.sc.intel.com> Signed-off-by: Suresh Siddha Signed-off-by: H. Peter Anvin commit 9ab48ddcb144fdee908708669448dd136cf4894a Author: Patrick McHardy Date: Mon Feb 8 17:35:23 2010 +0100 netfilter: nf_conntrack: fix hash resizing with namespaces As noticed by Jon Masters , the conntrack hash size is global and not per namespace, but modifiable at runtime through /sys/module/nf_conntrack/hashsize. Changing the hash size will only resize the hash in the current namespace however, so other namespaces will use an invalid hash size. This can cause crashes when enlarging the hashsize, or false negative lookups when shrinking it. Move the hash size into the per-namespace data and only use the global hash size to initialize the per-namespace value when instanciating a new namespace. Additionally restrict hash resizing to init_net for now as other namespaces are not handled currently. Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit dab1531a07ad7c5be4ebe715a3d08742f0c638e3 Author: Alexey Dobriyan Date: Mon Feb 8 15:44:07 2010 +0100 netfilter: xtables: compat out of scope fix As per C99 6.2.4(2) when temporary table data goes out of scope, the behaviour is undefined: if (compat) { struct foo tmp; ... private = &tmp; } [dereference private] Signed-off-by: Alexey Dobriyan Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit 38c7233b287481dfb3327dde136801ce500aba58 Author: Alexey Dobriyan Date: Thu Feb 4 18:24:06 2010 +0100 netfilter: nf_conntrack: restrict runtime expect hashsize modifications Expectation hashtable size was simply glued to a variable with no code to rehash expectations, so it was a bug to allow writing to it. Make "expect_hashsize" readonly. Signed-off-by: Alexey Dobriyan Cc: stable@kernel.org Signed-off-by: Patrick McHardy commit ab59b19be78aac65cdd599fb5002c9019885e061 Author: Eric Dumazet Date: Thu Feb 4 14:54:05 2010 +0100 netfilter: nf_conntrack: per netns nf_conntrack_cachep nf_conntrack_cachep is currently shared by all netns instances, but because of SLAB_DESTROY_BY_RCU special semantics, this is wrong. If we use a shared slab cache, one object can instantly flight between one hash table (netns ONE) to another one (netns TWO), and concurrent reader (doing a lookup in netns ONE, 'finding' an object of netns TWO) can be fooled without notice, because no RCU grace period has to be observed between object freeing and its reuse. We dont have this problem with UDP/TCP slab caches because TCP/UDP hashtables are global to the machine (and each object has a pointer to its netns). If we use per netns conntrack hash tables, we also *must* use per netns conntrack slab caches, to guarantee an object can not escape from one namespace to another one. Signed-off-by: Eric Dumazet [Patrick: added unique slab name allocation] Signed-off-by: Patrick McHardy commit 056ff3e3bd1563969a311697323ff929df94415c Author: Patrick McHardy Date: Wed Feb 3 12:58:06 2010 +0100 netfilter: nf_conntrack: fix memory corruption with multiple namespaces As discovered by Jon Masters , the "untracked" conntrack, which is located in the data section, might be accidentally freed when a new namespace is instantiated while the untracked conntrack is attached to a skb because the reference count it re-initialized. The best fix would be to use a seperate untracked conntrack per namespace since it includes a namespace pointer. Unfortunately this is not possible without larger changes since the namespace is not easily available everywhere we need it. For now move the untracked conntrack initialization to the init_net setup function to make sure the reference count is not re-initialized and handle cleanup in the init_net cleanup function to make sure namespaces can exit properly while the untracked conntrack is in use in other namespaces. Signed-off-by: Patrick McHardy