at 65f5ef18ed23c6c0d5dfe060072f755eb147f861 (commit) - Log ----------------------------------------------------------------- commit 65f5ef18ed23c6c0d5dfe060072f755eb147f861 Merge: 326f772 8ee8614 Author: Linux Build Service Account Date: Mon Jul 5 03:57:27 2010 -0700 Merge "[ARM] msm: mahimahi_defconfig: Turn off tuner drivers" into android-msm-2.6.32 commit 326f77203f9eefb3f2ad938e04fa82464f44df31 Merge: 95e2efc 2bf56bb Author: Linux Build Service Account Date: Mon Jul 5 03:57:24 2010 -0700 Merge "regulator: consumer.h - fix build when consumer.h is #included first." into android-msm-2.6.32 commit 95e2efc04eb7108f2193e6a889658b514ce92802 Merge: 790a92e 22af93a Author: Linux Build Service Account Date: Mon Jul 5 03:57:17 2010 -0700 Merge "msm: clock-8x60: Source LPA AIF and PCM clocks from the LPA PLL" into android-msm-2.6.32 commit 790a92e320f7b0d0ab0a4fe3ca2bcf673c962e61 Merge: a1fac6b 410efd5 Author: Linux Build Service Account Date: Mon Jul 5 03:57:14 2010 -0700 Merge "msm: Return the correct size for tiled formats" into android-msm-2.6.32 commit a1fac6b5d93c09970a85f6d9c474261514664b98 Merge: 03b570b c41d019 Author: Linux Build Service Account Date: Mon Jul 5 03:57:12 2010 -0700 Merge "camera: Support for IMX074 sensor." into android-msm-2.6.32 commit 03b570be37caacc7a77e6101f2a9c97528b75107 Merge: 9dafe8c 6ae2a33 Author: Linux Build Service Account Date: Mon Jul 5 03:57:09 2010 -0700 Merge "msm: audio: qdsp5v2: Don't apply post/pre proc when ACDB parsing fails" into android-msm-2.6.32 commit 9dafe8c4104294cb723ca5ce86fcb99cb29c044c Author: Trilok Soni Date: Fri Jun 18 18:54:04 2010 +0530 leds: pmic8058: Add FLASH leds support Add support for FLASH LEDs in-kernel APIs. It is also exported through the LED subsystem provided sysfs interface. Change-Id: I483aee3446cf04aa40ee4450273f878dbbbab95a Signed-off-by: Trilok Soni commit 1d650fe76c226155abaf3c28abf7cb55c4b6d24f Merge: dbbe44b 63a0fd0 Author: Linux Build Service Account Date: Fri Jul 2 22:08:00 2010 -0700 Merge "video_core: 720p: dec: Return error when set buffer fails." into android-msm-2.6.32 commit dbbe44bac89c5c9fd1593b8288bb0ca675b6eb33 Merge: 432292c 31cd9d7 Author: Linux Build Service Account Date: Fri Jul 2 17:00:36 2010 -0700 Merge "msm: smd_pkt: Read Operation to check packet state directly" into android-msm-2.6.32 commit 432292cb162168fc75c4231a0d1305b870b8738d Merge: 3b65245 07dcff4 Author: Linux Build Service Account Date: Fri Jul 2 17:00:33 2010 -0700 Merge "msm: rpc: RPC Router to support 64KB RPC calls." into android-msm-2.6.32 commit 63a0fd0d17aabca662d8fce1971fd28c647d7c44 Author: Carlos Romanillos Date: Fri Jul 2 16:36:43 2010 -0700 video_core: 720p: dec: Return error when set buffer fails. Fix to return error in ioctl call when set buffer fails. Change-Id: Id7fc5a1c37b3f2a13141eefb8f148accfe189383 Signed-off-by: Carlos Romanillos commit 3b65245de7ed5769e11c9773545f45e2f834fae9 Author: Kalyani Oruganti Date: Tue Jun 29 17:09:44 2010 -0700 msm:board-msm8x60: Sony IMX074 sensor support. Addition of board file entry for supporting Sony 13MP Bayer sensor. Change-Id: Ie7eb976534281eaab1795784f36ee5af64e882e0 Signed-off-by: Kalyani Oruganti commit 31cd9d7d1f4dd0aa3c8b42f7063f99f5a996cb41 Author: Karthikeyan Ramasubramanian Date: Fri Jul 2 15:29:03 2010 -0600 msm: smd_pkt: Read Operation to check packet state directly During SMD_PKT data event, current packet size is copied into a driver variable. During smd_pkt_read, before smd_read updates the packet state, another SMD_PKT data event re-does the copy leading to a copy of stale packet state. Remove this copy operation and check the packet state during every read operation. Change-Id: I5d0e4fcad12dbd3e370c9af4694b5809aa473b4b Signed-off-by: Karthikeyan Ramasubramanian commit 07dcff476ea3d8f0de42c07cf6d32e7d88733f76 Author: Karthikeyan Ramasubramanian Date: Mon Jun 21 08:29:31 2010 -0600 msm: rpc: RPC Router to support 64KB RPC calls. Change the max. RPC packet size supported by Router. Add a new IOCTL command to return the current packet size for an endpoint so that the user-space can dynamically allocate the required space. Change-Id: I6dfa992f116f45ec8ccbb90b38bfecd4eb086fca Signed-off-by: Karthikeyan Ramasubramanian commit 22af93a586d756d291d5796bc37b578aad1a0e10 Author: Matt Wagantall Date: Fri Jun 25 13:14:51 2010 -0700 msm: clock-8x60: Source LPA AIF and PCM clocks from the LPA PLL Updated as per the latest frequency plan. Also, default the LPA bit clock sources to the OSR clocks (m_clk's). Change-Id: I8e6c1cd100563bde9422b3ed7c5e8a102422fca0 Signed-off-by: Matt Wagantall commit ab960b31054a20c002878c9f901ff9ff241f254e Author: Bobby Crabtree Date: Thu Jul 1 12:35:47 2010 -0700 msm: board-msm8x60: Fix mpp0 config error message Error message should only printed upon failed configuration of pmic8901 mpp0. Change-Id: I90e87e76ada65c339e08bb100b3321e613ebe932 Signed-off-by: Bobby Crabtree commit 08d37d3a953e730c9cd969b2d3326c3ab5472198 Merge: 2fcbcce 1e73560 Author: Linux Build Service Account Date: Fri Jul 2 12:13:41 2010 -0700 Merge "firmware_class: fix memory leak - free allocated pages" into android-msm-2.6.32 commit 2fcbcce4d75c6cb02c969e81cadb43555bc78c07 Merge: 42faa09 01f33db Author: Linux Build Service Account Date: Fri Jul 2 12:13:38 2010 -0700 Merge "msm: clock-8x60: Correct NT PLL configuration" into android-msm-2.6.32 commit 42faa09cd7e18bafa25a9e7653b1cf641caf9dd1 Merge: 15a9f49 5f7b7a3 Author: Linux Build Service Account Date: Fri Jul 2 12:13:36 2010 -0700 Merge "[ARM] msm: mahimahi_defconfig: Update config with actual one generated" into android-msm-2.6.32 commit c41d01951acde55f76c857c9b589ba2e75ea9005 Author: Kalyani Oruganti Date: Tue Jun 29 15:54:27 2010 -0700 camera: Support for IMX074 sensor. Addition of new driver files to support Sony 13MP Bayer sensor. Change-Id: Idaee470b4ae68ec4c0d23c453245af95208e1bba Signed-off-by: Kalyani Oruganti commit 15a9f49b4d39b96d2dd6b4be6cf1fe83092f877c Merge: ceff6b8 1e5f159 Author: Linux Build Service Account Date: Fri Jul 2 08:50:43 2010 -0700 Merge "msm: audio: 7x30: Turn on headset voltage before codec." into android-msm-2.6.32 commit ceff6b8a44689f260c59d83443470afd895f154d Merge: 0f76a7b 6a94a06 Author: Linux Build Service Account Date: Fri Jul 2 07:16:36 2010 -0700 Merge "msm: 8x60: Prepare msm8660-gpio for upstream." into android-msm-2.6.32 commit 0f76a7bc47164df8c03d0f655d05a3bc0ce2549f Merge: 19a5d48 dd2496c Author: Linux Build Service Account Date: Fri Jul 2 07:16:32 2010 -0700 Merge "kgsl: drm: Map all GEM objects in the GPU MMU" into android-msm-2.6.32 commit 19a5d489037cba6544ab65c3f7952479c691390e Merge: 888e269 099d127 Author: Linux Build Service Account Date: Fri Jul 2 07:16:30 2010 -0700 Merge "headers: export asm/sizes.h header to userspace" into android-msm-2.6.32 commit 888e269eb0f55bd50f960bba39396bdcef3ba494 Merge: 2e266b2 ac94b9e Author: Linux Build Service Account Date: Fri Jul 2 07:16:28 2010 -0700 Merge "cpuidle-8x60: Add cpuidle driver for 8x60" into android-msm-2.6.32 commit 2e266b2092a6f5e1979dbbef01b58b17e511a418 Merge: 373dc7e 684f1ad Author: Linux Build Service Account Date: Fri Jul 2 07:16:25 2010 -0700 Merge "tsif: Merge tsif driver from 2.6.29" into android-msm-2.6.32 commit 373dc7eda36e3870f19ed55888e23f6f9e1498f8 Merge: fa8923d 4b904b6 Author: Linux Build Service Account Date: Fri Jul 2 07:16:18 2010 -0700 Merge "camera: Fix for camera hang when camcorder recording stop is issued." into android-msm-2.6.32 commit 1e5f1595ff323a6a5cf2aeda20fb45703bffcd37 Author: Kiran Kandi Date: Mon Jun 28 11:37:40 2010 -0700 msm: audio: 7x30: Turn on headset voltage before codec. Capless headset mode requires turning on ncp voltage regulator to supply negative charge. The original implementation configures codec before turning on ncp and results in audible pop. Update the logic to turn on ncp before configuring codec. CRs-Fixed: 233717 Change-Id: Ia750f0237ff1504801f9bdd09904cc40d6ad99b6 Signed-off-by: Kiran Kandi commit 6ae2a33f530fde8a5df666f17ca2704d7ab0a174 Author: Santosh Mardi Date: Fri Jul 2 15:50:42 2010 +0530 msm: audio: qdsp5v2: Don't apply post/pre proc when ACDB parsing fails Don't apply post / pre proc features when failed to find acdb values in data provided by modem CRs-Fixed: 244287 Change-Id: Ice4fc983ac6d3604ceba61bdc50c9567a95a1ea5 Signed-off-by: Santosh Mardi commit ac94b9e5ae24fa61825dcc0b429fbfb6fdbd19d1 Author: Abhijeet Dharmapurikar Date: Sat Jun 5 15:17:45 2010 -0700 cpuidle-8x60: Add cpuidle driver for 8x60 This is a transitional version of cpuidle and supports only 3 states. All of them call wfi but have different latencies and threshold. A more functional cpuidle that integrates with the power management features of 8660 is being worked on. This driver only serves the purpose of enabling power tools such as powertop. Change-Id: I705267e40cb7c74cd656a8247c2fec99734f52d3 Signed-off-by: Abhijeet Dharmapurikar commit fa8923d2904d2b5aa9d8b291abb7af8719aed9f6 Merge: 8b007c4 452737f Author: Linux Build Service Account Date: Fri Jul 2 03:56:36 2010 -0700 Merge "msm: board-halibut: Add structure for handset platform data" into android-msm-2.6.32 commit 8b007c4072a1bf305e068de3e4dcb2e83186c33e Merge: f871c79 450e383 Author: Linux Build Service Account Date: Fri Jul 2 03:56:28 2010 -0700 Merge "msm-fb: s/w workaround for MDP3.0 ppp h/w lockup" into android-msm-2.6.32 commit f871c79e675ff6d3a52c6cdb0cec601248a4b4f4 Merge: db550ea 691f248 Author: Linux Build Service Account Date: Fri Jul 2 03:56:26 2010 -0700 Merge "msm: clock-8x60: Remove temporary code to configure some PLLs" into android-msm-2.6.32 commit 6a94a0646f6c4d184d5be9836608cfad4875a0b6 Author: Gregory Bean Date: Sun Jun 20 10:36:20 2010 -0700 msm: 8x60: Prepare msm8660-gpio for upstream. Perform preemptory code-review changes to msm8660-gpio using lessons learned during the upstreaming of msm7200a-gpio in order to improve its chances of a a smooth acceptance upstream. Change-Id: Ie9478475945db207bead0fcf8d109cb298bc1108 Signed-off-by: Gregory Bean commit db550ea217bf8167f9cfd8d520ea8c1bafb026ca Merge: e31b7c7 2f952b3 Author: Linux Build Service Account Date: Fri Jul 2 02:19:18 2010 -0700 Merge changes I58c242b0,I6e68de36 into android-msm-2.6.32 * changes: msm: Add power key delay msm: handset: Add delayed power key feature commit 410efd5af5b0a8f230e5c98c64eddac9061d493a Author: Naomi Luis Date: Thu Jul 1 22:19:23 2010 -0700 msm: Return the correct size for tiled formats The tiled format buffers are 8K aligned. Return the 8K aligned buffer size for the tiled color format. Change-Id: I81d04ec1d7f55ee68c361aaa1c515cc4318e906d Signed-off-by: Naomi Luis commit 452737ff756fe019e6e74009f3aacbc0e6159ded Author: Srilakshmi Punuru Date: Tue Jun 29 12:21:33 2010 +0530 msm: board-halibut: Add structure for handset platform data Change-Id: Iad44c48f5a428623bc9ccc92fa201bdce2bad915 Signed-off-by: Srilakshmi Punuru commit e31b7c7e427b8b1952aa35c9005acbbeb4a58afa Merge: 5aa2f66 36b0fb1 Author: Linux Build Service Account Date: Thu Jul 1 22:27:01 2010 -0700 Merge "msm: audio: qdsp5v2: Remove 10 seconds sleep during acdb initialzation" into android-msm-2.6.32 commit 2f952b3d8a9cf452bf5a59571942a97dd96a390b Author: Mohan Pallaka Date: Thu Jun 24 12:23:33 2010 +0530 msm: Add power key delay Add platform data for HS to delay power key. Normally, pressing and holding end key for 500ms produces a power key. Make the power delay tunable from platform data so different chips can speicify their best suitable value. Delay of 0 will disable end key. Change-Id: I58c242b0c12827639ae7bf7c43f62856634dc0c8 Signed-off-by: Mohan Pallaka commit 212caf92b190187763a53886cc126e20fee34957 Author: Mohan Pallaka Date: Fri Jun 18 14:25:25 2010 +0530 msm: handset: Add delayed power key feature Allow the platforms to set the desired delay between power key and end key. Delay of 0 will disable the end key. Change-Id: I6e68de364e6df9eb296b46962acaacd27be92904 CRs-fixed: 243050 Signed-off-by: Mohan Pallaka commit 5aa2f663d894f2923fb5fee83b1d4d43b12b49c0 Merge: 3cc9bf9 f1f27a0 Author: Linux Build Service Account Date: Thu Jul 1 21:29:20 2010 -0700 Merge "bluetooth: bluesleep: GPIO API usage corrected" into android-msm-2.6.32 commit 3cc9bf94f914f3dbf62e29e9da460a4e90667b09 Merge: ad1966a 3f3efcd Author: Linux Build Service Account Date: Thu Jul 1 21:29:17 2010 -0700 Merge "drm: ati_pcigart: fix type cast in error message" into android-msm-2.6.32 commit ad1966a91e8f58087cf5f366f6f3c0192f823d22 Merge: 6a087c8 b4428ad Author: Linux Build Service Account Date: Thu Jul 1 21:29:14 2010 -0700 Merge "net: wireless: bcm4329: Fix SoftAP security mode change" into android-msm-2.6.32 commit 6a087c80762aabc6c9541bb0d91f47a455f89939 Merge: dd50ba6 f55b995 Author: Linux Build Service Account Date: Thu Jul 1 18:47:44 2010 -0700 Merge "msm_fb: Set correct video format for different bpp values" into android-msm-2.6.32 commit 2bf56bb9a42c3e2652eaffa522c8150bd084282c Author: Liam Girdwood Date: Wed Nov 11 14:16:10 2009 +0000 regulator: consumer.h - fix build when consumer.h is #included first. consumer.h requires device.h for stand alone build. Change-Id: I4e91057cf3ad5d2dd13f028b06cb28e3641905cd Signed-off-by: Liam Girdwood Signed-off-by: Stephen Boyd commit 1e73560bc8d2191ad58a65a36ff62d4481939fd5 Author: David Woodhouse Date: Sun May 2 11:21:21 2010 +0300 firmware_class: fix memory leak - free allocated pages fix memory leak introduced by the patch 6e03a201bbe: firmware: speed up request_firmware() 1. vfree won't release pages there were allocated explicitly and mapped using vmap. The memory has to be vunmap-ed and the pages needs to be freed explicitly 2. page array is moved into the 'struct firmware' so that we can free it from release_firmware() and not only in fw_dev_release() The fix doesn't break the firmware load speed. Change-Id: Ibabd9e80fe4646b5e8f4f7e4c1e84b3ac614fca6 Cc: Johannes Berg Cc: Ming Lei Cc: Catalin Marinas Singed-off-by: Kay Sievers Signed-off-by: David Woodhouse Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman Signed-off-by: Stephen Boyd commit dd50ba667d4b5c188d86b394e37224b57dee868f Merge: 3efb9a1 5b15154 Author: Linux Build Service Account Date: Thu Jul 1 17:32:37 2010 -0700 Merge "msm: rpc: Add dog keepalive RPC client." into android-msm-2.6.32 commit 3efb9a1cb7a148a448420850f30606fca364c1dd Author: Steve Muckle Date: Thu Jul 1 14:33:37 2010 -0700 defconfig: automatic update Signed-off-by: Steve Muckle commit 36b0fb1dc5f7ddfc12ea28ae66f5f8339dfa1572 Author: Santosh Mardi Date: Thu Jul 1 11:10:40 2010 +0530 msm: audio: qdsp5v2: Remove 10 seconds sleep during acdb initialzation 10 seconds delay in acdb driver init is introduced to make sure that AUDCAL SW peer(includes acdb and voc task) on modem side is up, as modem takes time to init these components, If we issue AUDCAL requests without confirming about SW is up on modem side, modem returns an error for request. Due to this 10 seconds delay post processing features are not applied to the streams played during this time frame. To address this issue removed 10 seconds sleep and added retry mechanism if query to modem results in ACDB_BAD_STATE CRs-Fixed: 244202 Change-Id: I2369380d085c491566394bfca4338d6972ded590 Signed-off-by: Santosh Mardi commit 684f1adc5c1656418aed858ee665616ace206111 Author: Lena Salman Date: Wed Jun 30 10:53:48 2010 +0300 tsif: Merge tsif driver from 2.6.29 This is a squashed version of all the work done on TSIF driver on 2.6.29 branch. Low level TSIF (Transport Stream InterFace) driver provides in-kernel API to be used by upper layer drivers. Also included an example of upper layer driver that uses TSIF API and implements character device. Change-Id: I82898b9aa8a6eee463f2c86976e2164082f415ed Signed-off-by: Lena Salman commit 7d980202ab48882b282c0142716459eeee6f78d4 Merge: a5c660f 92665c4 Author: Linux Build Service Account Date: Wed Jun 30 15:05:07 2010 -0700 Merge "msm: smd_pkt: Add a smd_pkt device using LOOPBACK SMD channel" into android-msm-2.6.32 commit a5c660f1348bbcf3d745d66eee82e345751bb62b Merge: de94777 4957e69 Author: Linux Build Service Account Date: Wed Jun 30 15:05:04 2010 -0700 Merge "msm: clock-8x60: Fix early return when setting rate to current rate" into android-msm-2.6.32 commit de947772ebe7de8b6b83e1a793672a884d06ee61 Merge: 8a5296c d4d4f7c Author: Linux Build Service Account Date: Wed Jun 30 15:05:02 2010 -0700 Merge "diag: Add filter for commands sent to modem" into android-msm-2.6.32 commit 8a5296c22a503f5592b5e27f0ac0da5ef95101a1 Merge: 8988c70 9340648 Author: Linux Build Service Account Date: Wed Jun 30 15:04:59 2010 -0700 Merge "drm: bypass compiler warning as error for drm_edid.c" into android-msm-2.6.32 commit 450e38300a07cdb77b3ef36a4e61a3f0f835aba0 Author: Ravi Bandi Date: Sat Jun 26 20:37:14 2010 -0700 msm-fb: s/w workaround for MDP3.0 ppp h/w lockup Pulling in the changes of s/w workaround added for MDP3.1 to MDP3.0 CRs-fixed: 242307, 244250 Change-Id: I7c5ecdd8c0e02ea6c1fb2ec3261f81d6c1171f3d Signed-off-by: Ravi Bandi commit 5b15154068bc274271b46b28e3cfeb8da13b456f Author: Vishwanathapura, Niranjana Date: Mon May 10 15:20:35 2010 -0600 msm: rpc: Add dog keepalive RPC client. The dog keepalive RPC client registers for periodic callback requests from remote server and replies to those callback requests indicating that local processor state is healthy. Change-Id: Ia0d9cd421c912b44cbcf59582f79746783176813 Signed-off-by: Niranjana Vishwanathapura commit 8988c70cd6b0490bbabf0bfebb197ed0d3b8759b Merge: 0fbcea0 39a0cd9 Author: Linux Build Service Account Date: Wed Jun 30 13:59:28 2010 -0700 Merge "msm: pmic8058-mpp: Support gpiolib dbg_show API" into android-msm-2.6.32 commit 0fbcea029d814936d276ace55787f5cb316a969e Merge: dea9009 e8050ef Author: Linux Build Service Account Date: Wed Jun 30 13:59:24 2010 -0700 Merge "msm: pmic8058-gpio: Support gpiolib dbg_show API" into android-msm-2.6.32 commit d4d4f7c17c489d3dff8d819fcb46b9bf55d0dec7 Author: Shalabh Jain Date: Fri Jun 25 14:53:42 2010 -0700 diag: Add filter for commands sent to modem Applications running in user space can open a handle with DIAG kernel driver and potentially send commands to modem. Thus some safeguard is needed that no malicious app can send commands to modem and cause crash. Change-Id: I55fad87c219c3811cad762b839211040ff7e1036 Signed-off-by: Shalabh Jain commit 01f33db7c178b332af5f696f30c5b5e97ab91a80 Author: Matt Wagantall Date: Fri Jun 25 11:29:22 2010 -0700 msm: clock-8x60: Correct NT PLL configuration Correct the NT PLL programming procedure so that the PLL output is disabled while switching PLL rates (to avoid frequency overshoot) and insert a hardware-required delay between de-assertion of the PLL bypass and the deassertion of PLL reset signals. Change-Id: I6db7902145c2a061b6a96b17a511be62637e0227 Signed-off-by: Matt Wagantall commit 691f2480e532b83a3b30e2125c92dc39b41f9457 Author: Matt Wagantall Date: Tue Jun 29 11:39:00 2010 -0700 msm: clock-8x60: Remove temporary code to configure some PLLs Remove temporaray code for configuring PLLs that are not owned by the Scorpion subsystem, as these should be configured by the bootchain. Change-Id: I470b636060a17a5a0101379f15d5f845106a9dc4 Signed-off-by: Matt Wagantall commit 4957e696068cde90bfc3bc30d4738a126ed40e7e Author: Matt Wagantall Date: Thu Jun 17 16:24:58 2010 -0700 msm: clock-8x60: Fix early return when setting rate to current rate When using soc_clk_set_min_rate(), return early if the rate rounds up to the current rate since no change is necessary. To improve code organization, the frequency-lookup code is also moved into its own function. Change-Id: I848b455a3d5d0de3242bad2aa55b0cf9730b5968 Signed-off-by: Matt Wagantall commit 92665c4b1cf5626d02bcf7c867a3a93794d2007f Author: Karthikeyan Ramasubramanian Date: Fri Jun 25 09:27:49 2010 -0600 msm: smd_pkt: Add a smd_pkt device using LOOPBACK SMD channel To test the smd_pkt driver from user-space add smd_pkt_loopback device operating over LOOPBACK SMD channel. Change-Id: Ie919979ac1743b71ab3dd76270973f47a400004d Signed-off-by: Karthikeyan Ramasubramanian commit dea900986eee8828dedadc90d5358f8e4f67557b Merge: 978f53d 954ad4b Author: Linux Build Service Account Date: Wed Jun 30 12:35:13 2010 -0700 Merge "mfd: pmic8058: Move gpio/mpp functionality" into android-msm-2.6.32 commit 4b904b6b38743b42d1ef49af9d7e523e094b6c0c Author: Ninad Patgaonkar Date: Wed Jun 30 11:48:26 2010 -0700 camera: Fix for camera hang when camcorder recording stop is issued. As the tasklet scheduling is not synchronous to that of the IRQ trigger all the ISR commands gets queued up untill the tasklets get scheduled. This fix makes sure to increment the irq counter and queue the command when ever irq happens. Eventually when tasklet gets scheduled all the queued commands are serviced in a whie loop decrementing the counter. Change-Id: I00f860cfd7317375753dbc272652ce5df6d293d3 Signed-off-by: Ninad Patgaonkar commit 3f3efcd3cb79076ae7393b95a7844addeb18997c Author: Jin Hong Date: Tue Jun 29 13:57:45 2010 -0700 drm: ati_pcigart: fix type cast in error message Fix type cast for a parameter in DRM_ERROR call to avoid compiler warning. Change-Id: I081b1b8cc85d2e9692ea30b7afffb6eaeef407d6 Signed-off-by: Jin Hong commit 978f53d7ff6093b0168862ab5d7d8f65b4bd0788 Merge: 759c705 2a0cf1c Author: Linux Build Service Account Date: Wed Jun 30 06:47:58 2010 -0700 Merge "Add USB_ANDROID_RNDIS_WCEIS option." into android-msm-2.6.32 commit dd2496c7dabd73c9f867c6de83fe928a362f3196 Author: Jordan Crouse Date: Tue Jun 29 17:21:19 2010 -0600 kgsl: drm: Map all GEM objects in the GPU MMU Map both PMEM and paged memory objects in the GPU MMU. Signed-off-by: Jordan Crouse commit 93406484fe90fafeddab44bf8d13e11cac6b051c Author: Jin Hong Date: Tue Jun 29 14:37:34 2010 -0700 drm: bypass compiler warning as error for drm_edid.c drivers/gpu/drm/drm_edid.c: In function 'drm_detect_hdmi_monitor': drivers/gpu/drm/drm_edid.c:1177: error: array subscript is above array bounds Change-Id: Ie22ef167dc252388efb6b140f68fd83f95d10a94 Signed-off-by: Jin Hong commit 39a0cd9675b90085b93ddb5027a05b3673b349b5 Author: Bobby Crabtree Date: Fri Jun 25 10:35:42 2010 -0700 msm: pmic8058-mpp: Support gpiolib dbg_show API The pm8058_mpp_dbg_show API prints out the gpio number, client name, mpp type, state, and control register value. Information is printed out in the following format: "gpio-xxx (client_name) type state 0xAB" Change-Id: Ie7c3ec5cbced84a5227d1c2deda77ba2f68749e8 Signed-off-by: Bobby Crabtree commit e8050ef89439ca6024cefc7916b3cc640f015057 Author: Bobby Crabtree Date: Fri Jun 25 10:26:25 2010 -0700 msm: pmic8058-gpio: Support gpiolib dbg_show API The pm8058_gpio_dbg_show API prints out the gpio number, client name, gpio type, state, and control register values. Information is printed out in the following format: "gpio-xxx (client_name) type state 0x0B ... 0x5F" Change-Id: I1dd12f4206348e8fa66c7b6245190943a023d190 Signed-off-by: Bobby Crabtree commit 954ad4b28cb1458e92c67e33ee628cd0ee64096e Author: Bobby Crabtree Date: Wed Jun 23 14:55:46 2010 -0700 mfd: pmic8058: Move gpio/mpp functionality Move all gpio and mpp functions and macros to pmic8058-gpio and pmic8058-mpp drivers. Change-Id: I09d9257ed06c0686acf8d796f0de8ead3132602a Signed-off-by: Bobby Crabtree commit 759c705082313b41e6245e901358baec73d45e23 Merge: 88dd8b7 f1bcfd8 Author: Linux Build Service Account Date: Tue Jun 29 13:43:49 2010 -0700 Merge "msm: 8x60: Remove incorrect double-ack of gpio irqs." into android-msm-2.6.32 commit f1bcfd869b09175bb0470747589f7705c3f554a9 Author: Gregory Bean Date: Tue Jun 29 11:41:35 2010 -0700 msm: 8x60: Remove incorrect double-ack of gpio irqs. Remove the double-acking of irqs in the msm8660-gpio irq handler, which clears the status register once before calling the handler for the gpio, then clears it again when the subordinate handler calls gpio_chip->ack. Change-Id: If6f64f352efa1633cd263dcf6f5a73e0bc4c586c Signed-off-by: Gregory Bean commit 88dd8b744a431324e172c771e67f49ad1f60508d Author: Matt Wagantall Date: Mon Jun 21 19:46:01 2010 -0700 msm: clock-8x60: Add missing 'F_END' row to ROT_CLK frequency table Change-Id: I0150b46d4b3bcc11e800cabb0d9149772e9584d4 Signed-off-by: Matt Wagantall commit f1f27a060de9c490c4d4e66179094253aefc0985 Author: Matthew Wilson Date: Tue Jun 29 10:06:42 2010 -0500 bluetooth: bluesleep: GPIO API usage corrected Use gpios after request and setting direction. Change-Id: I4fc592abc4bdc3c8736c2eb1242a51de4e869887 Signed-off-by: Matthew Wilson commit 8919d64856fe71cb7c92843e733024d4838cab7c Merge: 341c8b3 f36c8f1 Author: Linux Build Service Account Date: Tue Jun 29 10:30:33 2010 -0700 Merge "debian: Generate a 'linux-headers' Debian package" into android-msm-2.6.32 commit 341c8b3f9f791105d7c3b3cb3392d0ccc45efa3b Merge: 46c264f aaaa5e4 Author: Linux Build Service Account Date: Tue Jun 29 10:30:30 2010 -0700 Merge "msm: audio: qdsp5v2: Handle device call back for session value zero" into android-msm-2.6.32 commit 46c264f1ad290d5b9ae39b711eda53cedcc65df0 Merge: 8a1d70d 1ae6441 Author: Linux Build Service Account Date: Tue Jun 29 10:30:28 2010 -0700 Merge "usb: gadget: android: Fix trivial issues w/ serial and net drivers" into android-msm-2.6.32 commit 8a1d70d6f3acf149da8318b5b2b056e9c811ab12 Merge: 50631ef 47372de Author: Linux Build Service Account Date: Tue Jun 29 10:30:24 2010 -0700 Merge "bluetooth: bluesleep: Remove non-standard gpio API usage" into android-msm-2.6.32 commit 50631ef2bcb74a5dce33635385bbd70e871b809c Author: Sahitya Tummala Date: Mon Jun 28 12:07:41 2010 +0530 defconfig: 7x27: disable SDC4 as modem owns this slot. Change-Id: Ie80ad8236024410c05f31f2a121485b5b0bf484f Signed-off-by: Sahitya Tummala commit 5cb4f5ced9164ebf11272b766bdfd57c3cc3bf26 Merge: 76463ad 7c44d6a Author: Linux Build Service Account Date: Tue Jun 29 08:26:52 2010 -0700 Merge "msm: Kconfig: protect msm-specific configs with ARCH_MSM." into android-msm-2.6.32 commit 76463ad7a4d9adccc78d0a70cd62e1aca4ae8896 Merge: aaba08e 02602ea Author: Linux Build Service Account Date: Tue Jun 29 08:26:49 2010 -0700 Merge "msm: Remove unused references to s1r72v05" into android-msm-2.6.32 commit aaaa5e47a02e806cd574f48ea42563e4c86c39ae Author: Santosh Mardi Date: Tue Jun 29 20:29:11 2010 +0530 msm: audio: qdsp5v2: Handle device call back for session value zero when session value is 0 we need to drop device call back request, as this implies that device callback is generated for voice call. ACDB driver is responsible for only audio path calibration. Null pointer checks also added Change-Id: I07d3f02cb7bf44d8e5a59f82ba0f09b4150a343c Signed-off-by: Santosh Mardi commit 7c44d6a820cfd13fefc5aa531bb4a32e934b3196 Author: Gregory Bean Date: Fri Jun 25 14:42:38 2010 -0700 msm: Kconfig: protect msm-specific configs with ARCH_MSM. Move the declarations of MSM7200A_TLMM and MSM8660_TLMM inside the "if ARCH_MSM" block, as they are ARCH_MSM-dependant. Change-Id: Ie9337b55a23bdce8ce0c1d9cb1580bff1b1f12a0 Signed-off-by: Gregory Bean commit aaba08e705ee5e8f791bb20dee857a90d91303f3 Merge: 55ee741 3fce430 Author: Linux Build Service Account Date: Tue Jun 29 07:26:15 2010 -0700 Merge "msm: kgsl: Correct context ID and mask usage for 2D core" into android-msm-2.6.32 commit 55ee741247d4681f657d4b1a76fb6db43400850d Merge: a0303a2 31a702e Author: Linux Build Service Account Date: Tue Jun 29 05:55:00 2010 -0700 Merge "msm: keypad: Remove invalid comments" into android-msm-2.6.32 commit 31a702e7ea8056b6a2268e5c480c0d8586ce8449 Author: Trilok Soni Date: Mon Jun 28 14:34:48 2010 +0530 msm: keypad: Remove invalid comments Remove invalid REVISIT comments, because PM8058 core driver supports the subdevices based functionality now. Change-Id: Ica6706a7225e5ed7d2b1015ec137b4566a9daef2 Signed-off-by: Trilok Soni commit a0303a25018ec1c8ae2fb03a4c243802b0a29a34 Merge: c40ad75 98ff0c9 Author: Linux Build Service Account Date: Tue Jun 29 04:43:57 2010 -0700 Merge "headers: exports headers for userspace application" into android-msm-2.6.32 commit c40ad75c2cac16299eecf8ed22e2d61fbeaa84cd Merge: 9bdae3d 5b43931 Author: Linux Build Service Account Date: Tue Jun 29 04:43:54 2010 -0700 Merge "msm: Add EBI1 PMEM region for 8x60" into android-msm-2.6.32 commit 1ae6441d8bb53eeb844c5dc3320f5334e0685641 Author: Vamsi Krishna Date: Wed Jun 23 17:52:09 2010 -0700 usb: gadget: android: Fix trivial issues w/ serial and net drivers Call serial_setup before binding the serial function drivers as specified in function driver comments. Android tethering framework expects usb0 to be present in network interfaces even before enabling RNDIS. Hence call gether_setup one time during first composite registration and keep the network link across all composition switches. Change-Id: I1a980575bea22f523ca3e593fac671dfea62eefc Signed-off-by: Vamsi Krishna commit 2a0cf1c404e9d59553acba7fabbe712a1f8902b1 Author: Steve Kondik Date: Fri Jun 25 15:01:36 2010 -0700 Add USB_ANDROID_RNDIS_WCEIS option. Change-Id: I12e29589421e75cf77fda5db787b163ce40dd956 Signed-off-by: Mike Lockwood Modify patch to be applicable to IAD supported usb rndis driver Signed-off-by: Vamsi Krishna commit 9bdae3d46987c5a540b43230fad5b99d55285ddd Merge: d870d92 52984e9 Author: Linux Build Service Account Date: Mon Jun 28 18:19:44 2010 -0700 Merge "sched: Extend completion api to allow io_wait time tracking" into android-msm-2.6.32 commit d870d92820ac12a512ddadebdc8e4ccac0466035 Merge: 96710fd 3c7e79b Author: Linux Build Service Account Date: Mon Jun 28 18:19:39 2010 -0700 Merge "leds: pmic8058: Make led data global to manage in kernel LEDs API" into android-msm-2.6.32 commit 96710fd9362dcd0e857fc3909abd4e5318238fba Merge: a890ecf 7613a3c Author: Linux Build Service Account Date: Mon Jun 28 18:19:37 2010 -0700 Merge "defconfig: 8x55: update local-version name" into android-msm-2.6.32 commit a890ecf75da1be0ce719316555616cb89e2498c1 Merge: 50f7d06 97fcf77 Author: Linux Build Service Account Date: Mon Jun 28 18:19:34 2010 -0700 Merge "msm: adsp: qdsp5v2: Increase retry duration to 5msecs." into android-msm-2.6.32 commit 50f7d0677d5724adb7a348c54e010c1c23edc8bb Merge: fa1c2ea 5ac4c8f Author: Linux Build Service Account Date: Mon Jun 28 18:19:28 2010 -0700 Merge "msm: audio: qdsp5v2: Vote for PMIC PFM/PWM mode" into android-msm-2.6.32 commit 5b43931994ab8751f818151bb8503397a026d756 Author: Jordan Crouse Date: Mon Jun 28 11:50:15 2010 -0600 msm: Add EBI1 PMEM region for 8x60 Add an optional EBI1 PMEM region for the 8x60 platform. Signed-off-by: Jordan Crouse commit 3fce430d4a64470cb99eb1dceac29e1c70d77895 Author: Jon Ashburn Date: Mon Jun 28 13:37:12 2010 -0600 msm: kgsl: Correct context ID and mask usage for 2D core Context creation and destruction did not handle high context counts correctly. This lead to occasional failures to create a context in OpenVG apps. This patch fixes this issue. Change-Id: Ie55be3a7c94340263aaf792b02d0eee385542e13 Signed-off-by: Jon Ashburn commit 02602ea9cd9de32c0ee4de842a96e4f878e2cc7d Author: Philip Elcan Date: Mon Jun 28 13:47:10 2010 -0400 msm: Remove unused references to s1r72v05 The s1r72v05 IDE driver is no longer in the kernel. This removes the platform-specific references that are no longer needed. Change-Id: I3861a7a6feccf9633eb9b9e7d6a0b692dd989063 Signed-off-by: Philip Elcan commit fa1c2eaa94d6d494c3d65ef3e99bf82f723da1c1 Author: Gregory Bean Date: Thu Jun 24 13:33:17 2010 -0700 msm: defconfig: Enable GPIOLIB by default. The deadline has arrived! Enable GPIOLIB on all affected 7200a-descended targets. Change-Id: I87a514da632edc0f8f157c8eaa4bfdf67f691449 Signed-off-by: Gregory Bean commit 0b71d10b81b91f94938158ac929961ad42685953 Merge: a4bf3a4 a1df750 Author: Steve Muckle Date: Mon Jun 28 11:41:13 2010 -0700 Merge "msm: tlmm: Move tlmm functions to tlmm-msm7200a.c." into android-msm-2.6.32 commit a4bf3a43fb50eea6fb7634cfd50a6b8de3528790 Merge: f0236f7 d005281 Author: Linux Build Service Account Date: Mon Jun 28 11:40:31 2010 -0700 Merge "msm: smd: update rpc program definition" into android-msm-2.6.32 commit f55b99553dc3ae09afb816e25cf657cff8e2356e Author: Ravi Bandi Date: Wed Jun 23 19:08:28 2010 -0700 msm_fb: Set correct video format for different bpp values Video format is not set properly across 16, 18 and 24bpp formats, due to which colors are not displayed properly. Rectified the issue by using appropriate video format descriptors for these panel types. Change-Id: Id79703b51aa3aceb02d080372a5696d41658f67d Signed-off-by: Ravi Bandi commit f0236f7b10338fc6c69f88f5152cb81d19a8ce4a Merge: 9885648 38fa058 Author: Jordan Crouse Date: Mon Jun 28 08:25:35 2010 -0700 Merge "drm: Add drm_vm_close_locked()" into android-msm-2.6.32 commit 98856487da011efcb5a7a879ea64cb650afdc9f2 Merge: 6eb3671 dfeb1e6 Author: Jordan Crouse Date: Mon Jun 28 08:25:25 2010 -0700 Merge changes I9befcf92,I1ad5b320 into android-msm-2.6.32 * changes: DRM: Use platform appropriate indexes for the GEM fake mmap offset gpu: msm: Update KGSL DRM to the 2.1.1 version commit 6eb3671cf0427e1e66b07628ea720369ff54945d Merge: 962a1dc 178666f Author: Jordan Crouse Date: Mon Jun 28 07:17:03 2010 -0700 Merge "defconfig: Disable SDC1 as Modem owns this for 7x30." into android-msm-2.6.32 commit 47372de98592623b1eb75209dd88cc8d0ed115d0 Author: Sankalp Bose Date: Mon Jun 28 19:03:19 2010 +0530 bluetooth: bluesleep: Remove non-standard gpio API usage bluesleep module performs redundant non-standard call to gpio method to ack interrupts in ISR. Remove this call as it is implicitly done by the IRQ setup code. Change-Id: I7f059d38030f81a3531fa0ba44150495bb9367f7 Signed-off-by: Sankalp Bose commit 3c7e79b31bc76a6ebc777924be99a4a34dccda44 Author: Trilok Soni Date: Wed Jun 16 18:22:13 2010 +0530 leds: pmic8058: Make led data global to manage in kernel LEDs API To provide LED support for in-kernel users like camera FLASH LEDs, let's make internal data structure as global to manage their calls from the driver(s) which are not child of led or pmic8058 driver. Change-Id: I55f1cecab5d2279bf0085efabed94aa092f747e4 Signed-off-by: Trilok Soni commit 962a1dc6b2b6fe32e4be021de99ae797f74a4863 Merge: c1d4746 114c46e Author: Trilok Soni Date: Mon Jun 28 06:02:44 2010 -0700 Merge "cpuidle: Enable cpu_idle_wait for ARM" into android-msm-2.6.32 commit c1d474673369d0f04039fdae87c06a5b496737d9 Merge: 4aab666 4325aa8 Author: Trilok Soni Date: Mon Jun 28 05:50:29 2010 -0700 Merge "msm_fb: Shutdown HDMI clock on dtv off." into android-msm-2.6.32 commit 178666fb81747f38f252e1a83d8216466e73ec8b Author: Murali Palnati Date: Thu Jun 17 23:04:58 2010 +0530 defconfig: Disable SDC1 as Modem owns this for 7x30. Change-Id: I86759989dfe7111aff16b62dc55d29972245f7f8 Signed-off-by: Murali Palnati commit 4aab666539b2888b1ce6eded83ae188daa0d3909 Author: Murali Palnati Date: Thu Jun 17 23:01:08 2010 +0530 msm: 7x30: Fix compile error if SDC1 slot is disabled. Change-Id: I47add569e73a221ed756f88ed7d522a8aa10ec50 Signed-off-by: Murali Palnati commit a1df7509affccdd2a70f55e12ace4c0a34026efc Author: Gregory Bean Date: Mon Jun 21 14:07:25 2010 -0700 msm: tlmm: Move tlmm functions to tlmm-msm7200a.c. Move tlmm-msm7200a-specific functions out of gpio.c and into tlmm-msm7200a.c. Since gpio.c and generic-gpio.c are soon to be disabled on many targets, and tlmm is soon to become a driver in its own right, these functions need to get out of gpio-specific files and into their own. This move parallels the move of the msm8660-specific tlmm functions into tlmm-msm8660.c. Change-Id: I07ad6ffd270a42a4a443b7276a26075740d470ec Signed-off-by: Gregory Bean commit da3d06e6a24c852224885280ab473fb1159cf18a Merge: 66f9ee2 de437da Author: Trilok Soni Date: Sat Jun 26 02:13:18 2010 -0700 Merge "msm: gpio: Fix compilation warning." into android-msm-2.6.32 commit 66f9ee2281466194b0e57f9c214e6652b56e4788 Merge: c5d427c 87c67b2 Author: Trilok Soni Date: Sat Jun 26 02:13:07 2010 -0700 Merge "msm: Add support for initiating sync request from apps processor" into android-msm-2.6.32 commit c5d427c50f6b697f6f2f9d43976a1203571de37f Merge: 394a5cf 72edd00 Author: Trilok Soni Date: Sat Jun 26 02:12:49 2010 -0700 Merge "camera: Add fix to support SOF ack." into android-msm-2.6.32 commit 394a5cfa4f4d8c77658675afab09e72eb241ef81 Merge: 4cec84b 35e9155 Author: Trilok Soni Date: Sat Jun 26 02:12:34 2010 -0700 Merge "spi_qsd: Disable irqs in the probe function." into android-msm-2.6.32 commit 4cec84bf5c9ea0bde02facd96d2119f91945d8e0 Merge: a925ae5 d5392f3 Author: Trilok Soni Date: Sat Jun 26 02:12:11 2010 -0700 Merge "msm_kgsl: Remove generation of additional interrupt for waiting processes" into android-msm-2.6.32 commit 5ac4c8f38863d96bda62503027272d7059c391c0 Author: Jay Wang Date: Thu Jun 17 21:00:39 2010 -0700 msm: audio: qdsp5v2: Vote for PMIC PFM/PWM mode Vote for PFM only when audio playback with headset device is enabled. Vote for PWM for other use cases such as recording path is enabled or non-headset device is selected Remove the vote if the RX/TX device is closed CRs-Fixed: 242284 Change-Id: Iecd1d9e3ee2ef2e22e3ae4cee4ab162e35668d62 Signed-off-by: Jay Wang commit 114c46ed2d503e9b0b4844931351c3024850be6a Author: Abhijeet Dharmapurikar Date: Sat Jun 5 12:56:16 2010 -0700 cpuidle: Enable cpu_idle_wait for ARM These functions enable making a dummy smp_call_function to all cpus, essentially kicking them out of idle and updating the idle handler. Required by cpuidle core driver running on SMP systems. Change-Id: I2950cf92a65fb50ce627338e03a103a375b22c42 Signed-off-by: Abhijeet Dharmapurikar commit 72edd00152c6de9bae8208345f0506796ab2e494 Author: Azam Kapatrala Syed Date: Fri Jun 25 16:58:25 2010 -0700 camera: Add fix to support SOF ack. Make change to support SOF ack to userspace. Change-Id: Icb9a361cbadd41335acf3b7696c4d862beebde42 Signed-off-by: Azam Kapatrala Syed commit 35e9155f59317e8ef63b8ce5190f26f5cae6a8ee Author: Harini Jayaraman Date: Fri Jun 25 16:48:25 2010 -0600 spi_qsd: Disable irqs in the probe function. The irqs are disabled at all times in the probe function irrespective of the use of remote lock. Change-Id: I0997d07b93c97a12bca6d80a9bba59682b1bec3e Signed-off-by: Harini Jayaraman commit de437dadb02b267766c3d4680ee745882ece3b7f Author: Gregory Bean Date: Fri Jun 25 00:04:14 2010 -0700 msm: gpio: Fix compilation warning. Fix a compilation warning by featurizing a code label under the same feature which calls it. Change-Id: If489f28c6e53b26014738a4eb8c90dab9f55fef9 Signed-off-by: Gregory Bean commit a925ae54ed174fe53ddc02bb2149af5efb6e545e Merge: a8de1d3 4165639 Author: Steve Muckle Date: Fri Jun 25 09:17:48 2010 -0700 Merge "msm: 8x50A: Add platform structure for hs" into android-msm-2.6.32 commit a8de1d308fd2d1a7471bfa4aec9d5f1da4be67ea Merge: 480f0fa 017f61f Author: Murali Palnati Date: Fri Jun 25 07:17:56 2010 -0700 Merge "Revert "USB: gadget: f_mass_storage: Flush writes after every 4 MB."" into android-msm-2.6.32 commit 480f0fa9c481f30436cff30cd0a9005a1f12108c Merge: e04b3a5 e6af92d Author: Trilok Soni Date: Fri Jun 25 05:12:27 2010 -0700 Merge "spi_qsd: Disable clocks and irqs when SPI bus is not in use." into android-msm-2.6.32 commit 4165639e041b365c3497d6afe6a88031a6073980 Author: Mohan Pallaka Date: Fri Jun 25 14:52:58 2010 +0530 msm: 8x50A: Add platform structure for hs Change-Id: I35b6c3b8a6e11be4180c9d94b33d2a49724552ec Signed-off-by: Mohan Pallaka commit e04b3a55dfa3fa5b7f5172d82f37d955466cd952 Merge: a6388f1 7c1d77e Author: Murali Palnati Date: Fri Jun 25 02:38:35 2010 -0700 Merge "defconfig: msm7x30: Enable TSC2007 touchscreen driver" into android-msm-2.6.32 commit a6388f1acd1e6e3188c275b04c7bcb7cef38986e Merge: b924868 8855629 Author: Murali Palnati Date: Fri Jun 25 02:38:14 2010 -0700 Merge "msm: board-msm7x30: Enable TSC2007 touchscreen for MSM8x55" into android-msm-2.6.32 commit 099d1278460b851c4e2c3b11348412a7ed133ea2 Author: Jin Hong Date: Fri Jun 25 00:29:39 2010 -0700 headers: export asm/sizes.h header to userspace This provides the needed header by userspace multi-media Signed-off-by: Jin Hong commit b9248684e276a0de614a0f72d73a8e1e487f70a6 Merge: eed1b4f 4c162b1 Author: Murali Palnati Date: Thu Jun 24 22:50:48 2010 -0700 Merge "msm: msm7200a-gpio: Move msm7200a-gpio to mach-msm." into android-msm-2.6.32 commit eed1b4f034fcb9c0f500dad6cfd9d19abeac8d0c Merge: 768a8c1 4a820b5 Author: Murali Palnati Date: Thu Jun 24 22:50:35 2010 -0700 Merge "msm: audio: 7x30: Enhance ACDB driver to cache ACDB values" into android-msm-2.6.32 commit 768a8c1224cda21bc96082ae0b69138f6f9ffe31 Merge: 8df667a b50f03f Author: Murali Palnati Date: Thu Jun 24 22:50:20 2010 -0700 Merge "[ARM] oprofile: Add missing Oprofile pieces" into android-msm-2.6.32 commit 7c1d77e78df56b1abf5ba5184196a10ec19775ae Author: Anirudh Ghayal Date: Tue Jun 22 14:59:42 2010 +0530 defconfig: msm7x30: Enable TSC2007 touchscreen driver Change-Id: I9c18db4acae77b7d84bada0941285a9465218902 Signed-off-by: Anirudh Ghayal commit 885562989eab6a5964aed76d1c9d005d3059326f Author: Anirudh Ghayal Date: Fri Jun 18 15:06:28 2010 +0530 msm: board-msm7x30: Enable TSC2007 touchscreen for MSM8x55 This change also enables the S2 vreg required for TSC2007. Change-Id: I69a6bc94a59d4d2d2c5ff342c722d2bb6a78f9f2 Signed-off-by: Anirudh Ghayal commit d5392f3de72b0ca6365a5e3b399766e4221fec06 Author: Shubhraprakash Das Date: Thu Jun 24 16:52:02 2010 -0600 msm_kgsl: Remove generation of additional interrupt for waiting processes Removed the generation if IB1 interrupt when processes have to wait on a timestamp and accordingly fixed conditional interrupt generation code so that IB1 interrupt generation is no longer required. Change-Id: I543ac21e49d82338d040f9613436cd1f27c8fef5 Signed-off-by: Shubhraprakash Das commit e6af92d74a35ba267125bc61c2c6c18034c03af3 Author: Harini Jayaraman Date: Tue Jun 22 12:20:46 2010 -0600 spi_qsd: Disable clocks and irqs when SPI bus is not in use. The SPI clocks and irqs are enabled per workqueue and correspondingly disabled once the workqueue is completed. Change-Id: Ib22b7e3b946eb4c829940e43327caaf5aff7721b CRs-fixed: 242866 Signed-off-by: Harini Jayaraman commit 98ff0c926581f56e521248fb08034292d5d06854 Author: Jin Hong Date: Thu Jun 24 00:22:06 2010 -0700 headers: exports headers for userspace application This provides the needed headers for graphics and mm applications: msm_kgsl.h msm_mdp.h msm_q6venc.h msm_q6vdec.h msm_audio.h msm_audio_aac.h android_pmem.h Change-Id: I19b272114b4afc76a0434b2f6503fdd77c9ed5b1 Signed-off-by: Jin Hong commit 38fa058a4ca0fb8020e281f1e5a889a185b85ae2 Author: Jordan Crouse Date: Thu Jun 24 16:39:55 2010 -0600 drm: Add drm_vm_close_locked() Add drm_vm_close_lock() to allow GEM to free VM entries while already holding the device drm mutex. Signed-off-by: Jordan Crouse commit dfeb1e6f5dc60c0a6d13cb63804a0cc68989741d Author: Jordan Crouse Date: Thu Jun 24 16:39:55 2010 -0600 DRM: Use platform appropriate indexes for the GEM fake mmap offset GEM uses "fake" mmap offsets to map structures. The offset member of mmap() is an unsigned long, so we need to make sure the offsets are properly formatted depending on the architectural length of an unsigned long. Signed-off-by: Jordan Crouse commit b33afed03a6263d032a5017630b5d3ffa2974247 Author: Jordan Crouse Date: Thu Jun 24 16:39:55 2010 -0600 gpu: msm: Update KGSL DRM to the 2.1.1 version Update the KGSL DRM driver to the 2.1.1 version of the API. Signed-off-by: Jordan Crouse commit 8df667a62197e6df04704dbd1757422d7111fe62 Merge: 454e077 142a0e1 Author: Jordan Crouse Date: Thu Jun 24 15:38:03 2010 -0700 Merge "drm: Add support for platform devices to register as DRM devices" into android-msm-2.6.32 commit b50f03f1bf0885189858ebe0f3628caa6e1de5a4 Author: Shubha Nagaraja Rao Date: Wed Jun 23 16:38:46 2010 -0400 [ARM] oprofile: Add missing Oprofile pieces This patch adds the Oprofile code pieces that were missed during merge to android .32 mainline Change-Id: I553d28bbf8911ec31d56270cb12c516046fad327 Signed-off-by: Shubha Nagaraja Rao commit 97fcf77a91f0d9de7aa0c43ba6fcc237db7e5c0c Author: Suresh Vankadara Date: Thu Jun 24 05:17:25 2010 +0530 msm: adsp: qdsp5v2: Increase retry duration to 5msecs. When DSP is not ready to accept a command, ADSP driver retries for 40 times with 50 usecs delay each time which amounts to 2 msec in total. But when DSP is busy processing commands it may take more than 2 msec to respond to requests from application processor. Hence updating the number of trials to 100 with 50 usecs delay each time thus increasing the maximum delay to 5 msecs. CRs-fixed:242965 Change-Id: I80eafe06d8b2188214e3cc81d144e2a51d470eb7 Signed-off-by: Suresh Vankadara commit 454e0770536321276e11e9dad27f31b02783dbf8 Merge: 2d15959 339bf11 Author: Steve Muckle Date: Thu Jun 24 10:23:32 2010 -0700 Merge "video_core: 720p: Set divx configuration and drop not coded frames." into android-msm-2.6.32 commit 2d1595957a9808e777235480fa5ec9ab94e2e47e Merge: 58e8282 e793362 Author: Trilok Soni Date: Thu Jun 24 07:48:11 2010 -0700 Merge "msm: pm: add multi-core support to PM platform data" into android-msm-2.6.32 commit 58e828260d21fad3789e7aa808056b59ad7f9bec Merge: 42da7fc 79c6460 Author: Trilok Soni Date: Thu Jun 24 07:47:30 2010 -0700 Merge "defconfig: automatic update" into android-msm-2.6.32 commit 42da7fcbe95f3df62d539538736e53017d2fbb98 Merge: 94f0167 d043981 Author: Trilok Soni Date: Thu Jun 24 07:47:07 2010 -0700 Merge "camera: Support for camera in 8x60 board file." into android-msm-2.6.32 commit f36c8f161b9cc9f4e26301bb9132c327e40e1b2f Author: Christopher Johnson Date: Tue Jun 15 17:00:06 2010 -0600 debian: Generate a 'linux-headers' Debian package This is a barebones implementation that is incomplete, but meets the current need for a Debian package of the kernel headers needed to fulfill build dependencies of externel kernel modules. Change-Id: I5b8085b6fa79005b16528fbd731fc753faf94ada Signed-off-by: Christopher Johnson commit e7933621151a3ca5e3c4830e1c978ff675503be4 Author: Ai Li Date: Mon Jun 21 14:12:32 2010 -0600 msm: pm: add multi-core support to PM platform data Add multi-core support to PM platform data by using a new argument in msm_pm_set_platform_data() that passes the number of data entries for all cores in the system. Change-Id: I7cd417c4e642a2cef2cfae8c46164afb2bf74b42 Signed-off-by: Ai Li commit 94f01676b35aa8dccdb4713dce4a921a72f5ed3a Merge: cc32e1d 8b8fdee Author: Murali Palnati Date: Thu Jun 24 05:37:49 2010 -0700 Merge "msm: board-msm7x30: Enable marimba TSADC only for 7x30" into android-msm-2.6.32 commit cc32e1d5d9bce85faac084d1e0a1fbbce8e9becd Merge: f93b6f5 2aa2879 Author: Murali Palnati Date: Thu Jun 24 04:37:10 2010 -0700 Merge "camera: Support for 8x60 camera driver" into android-msm-2.6.32 commit f93b6f56155e68b4d7bb134ad2c691c3ef8dad5c Merge: c32871c 6b59371 Author: Murali Palnati Date: Thu Jun 24 04:34:14 2010 -0700 Merge "KSAPI: Add missing KSAPI pieces" into android-msm-2.6.32 commit c32871c6c4bc8c7e5ee70106736a7d0dba6011b6 Merge: a49bb5e c6e9ce0 Author: Murali Palnati Date: Thu Jun 24 04:34:09 2010 -0700 Merge "msm: audio: qdspv2: Add support for A2DP encoding" into android-msm-2.6.32 commit 4a820b53ddeb3fb83d25fe285b3f6d9d470e6ff3 Author: Deepa Madiregama Date: Fri Jun 18 16:47:25 2010 +0530 msm: audio: 7x30: Enhance ACDB driver to cache ACDB values Enhance ACDB driver to cache ACDB values in local cache and also handle multiple audpp / preproc / device ready callback. Change-Id: Ib56a1b6bc6be51314cc6d99c2be127851b092de3 Signed-off-by: Santosh Mardi Signed-off-by: Deepa Madiregama commit a49bb5e0a151f6813cdb345039a38d04300a75c6 Merge: 1b4b7a4 eb8c434 Author: Steve Muckle Date: Wed Jun 23 17:34:44 2010 -0700 Merge "usb: gadget: rmnet: Workaround to send network adapter status" into android-msm-2.6.32 commit 1b4b7a48595a064a6daf3d919484ff4567db3617 Merge: a81485f 54153ff Author: Steve Muckle Date: Wed Jun 23 17:34:38 2010 -0700 Merge "usb: msm_otg: Do not override other bits while configuring drvamplitude" into android-msm-2.6.32 commit d0439817130b3466c7c8c2b8eabe84cb0fd4cb84 Author: Ninad Patgaonkar Date: Wed Jun 23 16:15:42 2010 -0700 camera: Support for camera in 8x60 board file. Added support to configure the GPIOs & the PMEM required for camera. Change-Id: I3d3502e03d4ea2038ac6df344de02a79fe087420 Signed-off-by: Ninad Patgaonkar commit 79c646058fe34185e436a1eb4bf34d0f6d0ada47 Author: Steve Muckle Date: Wed Jun 23 15:44:41 2010 -0700 defconfig: automatic update Change-Id: Ia10fad76288f9ba8eee6ced20f458cf9631ce462 Signed-off-by: Steve Muckle commit a81485f87ef1ffb624937673e2c302cd8f9980d7 Merge: 79b81d6 211c7a1 Author: Steve Muckle Date: Wed Jun 23 14:56:13 2010 -0700 Merge "camera: Disable camera flash on 8x60" into android-msm-2.6.32 commit c6e9ce08977efb6fc4dffa078b47e3e4b880e34c Author: Rajesha Kini Date: Tue Jun 8 20:38:29 2010 +0530 msm: audio: qdspv2: Add support for A2DP encoding Added support for A2DP recording, supporting both WAV and SBC format. Change-Id: Ie7095b3adbf0ab544b83c7bce8af9c745c1f438d Signed-off-by: Suresh Vankadara Signed-off-by: Rajesha Kini commit 79b81d6ddaa73196213bd4376ada257f836a84f4 Merge: 8c4e52f ee61d71 Author: Steve Muckle Date: Wed Jun 23 13:37:27 2010 -0700 Merge "msm_fb: Enable Audio settings for ADV7520 HDMI chip" into android-msm-2.6.32 commit 4325aa8038ed6631aa49a272c8951ddd042288d7 Author: Abhishek Kharbanda Date: Wed Jun 23 13:16:47 2010 -0700 msm_fb: Shutdown HDMI clock on dtv off. Disabling HDMI clock while dtv interface is off. Change-Id: Ib060580a79572d646b98687f4577f665ca5fdc0e Signed-off-by: Abhishek Kharbanda commit 52984e96358c55f89947c6de6e63d70261479f67 Author: Jeff Ohlstein Date: Wed Jun 23 12:59:04 2010 -0700 sched: Extend completion api to allow io_wait time tracking Adds a function wait_for_completion_io which behaves like wait_for_completion, except it calls io_schedule instead of schedule. This indicates that the process waiting on the completion is waiting on an io event, and keeps statistics accordingly. Change-Id: I2514d62ff7f26441782a4cbebc4a18c07bb5ad74 Signed-off-by: Jeff Ohlstein commit 6b59371a053d5266250c37ab15c8da5e5c9a3c28 Author: Sheetal Sahasrabudhe Date: Fri Jun 18 11:23:42 2010 -0400 KSAPI: Add missing KSAPI pieces This commit adds the KSAPI pieces that were missed during merge to android .32 mainline. Change-Id: I9a05b4f9a812da785b9869631ecacd1bd0373ff0 Signed-off-by: Sheetal Sahasrabudhe commit 8c4e52f6e3a87e9fee4036eeb41ff7a441c42846 Merge: 351cbb1 49fff67 Author: Steve Muckle Date: Wed Jun 23 10:01:03 2010 -0700 Merge "arm: mm: smmu: Set APROTNS override to non-secure." into android-msm-2.6.32 commit 8b8fdee6cc47ee7bc91b51690e87cd92a7a6b4da Author: Anirudh Ghayal Date: Tue Jun 22 14:35:33 2010 +0530 msm: board-msm7x30: Enable marimba TSADC only for 7x30 This is required for targets such as 8x55 which do not use marimba TSADC supported TSSC. Change-Id: I1edc9c0b555760d712149e4cb5c79d687fb4e54a Signed-off-by: Anirudh Ghayal commit 017f61f6830973b2018cbdbcb15a2e3f753a1c43 Author: Chiranjeevi Velempati Date: Wed Jun 23 10:49:59 2010 +0530 Revert "USB: gadget: f_mass_storage: Flush writes after every 4 MB." In order to improve the write performance, CSW Hack feature was implemented.This implementation nullifies the performance gain obtained as part of CSW Hack and degrading the overall write performance, hence reverting this patch. This reverts commit 192b9a8954d9e25ddf6e682d03a0db33810276e5. CRs-fixed: 243924 Change-Id: I9938b087d05cdc27454d0de8f6ec78530fb4cab1 Signed-off-by: Chiranjeevi Velempati commit eb8c43443add8298dd1350195bce4e4656155302 Author: Pavankumar Kondeti Date: Mon Jun 21 17:02:35 2010 +0530 usb: gadget: rmnet: Workaround to send network adapter status The host driver will issue the SET_CONTROL_LINE_STATE ACM standard request to the RmNet interface in the following scenario: Once the network adapter is disabled from device manager, the above request will be sent from the qcusbnet host driver, with DTR being '0'. Once network adapter is enabled from device manager or during enumeration, the request will be sent with DTR being '1'. Change-Id: I86ae62854b95a7325079e877900e6d7b81cfe67d Signed-off-by: Pavankumar Kondeti commit 54153ffb027027e5807b0811282006ae0a8c22f3 Author: Anji Jonnala Date: Wed Jun 23 10:01:30 2010 +0530 usb: msm_otg: Do not override other bits while configuring drvamplitude As a part of configuring the hsdrvamplitude, overriding other bits in the USB PHY configuration register. This is causing CDR Auto Reset feature is getting enabled and is causing 5th HUB enumeration failure. Fix to not override other bits in USB PHY configuration register, while configuring hsdrvamplitude Change-Id: I2e01bf5c8e14144f6b2718f7a6ff21b6e1ce73bb CRs-fixed: 242601 Signed-off-by: Anji Jonnala commit 87c67b2dd9549d5ff99d4530c1776ebc54b22f15 Author: Sahitya Tummala Date: Wed Jun 9 20:42:34 2010 +0530 msm: Add support for initiating sync request from apps processor Before the apps processor is going to shutdown there is a need to force modem to sync its pending data. Hence, add support for force sync and get sync status RPC calls in the remote storage client. These RPC calls are exposed to user-space through sysfs entries "force_sync" and "sync_sts". Change-Id: Icefcd8f5e446646022ba015b935b89bbcab0b64d Signed-off-by: Sahitya Tummala commit 142a0e1246ebb095403c2aad315b8a9cdd7c3fe6 Author: Jordan Crouse Date: Tue Jun 22 19:16:30 2010 -0600 drm: Add support for platform devices to register as DRM devices Allow platform devices without PCI resources to be DRM devices. Signed-off-by: Jordan Crouse commit 351cbb16ac28a06a1233123661435d63ca1cca94 Merge: 1f986b9 bddeed6 Author: Steve Muckle Date: Tue Jun 22 18:00:25 2010 -0700 Merge "defconfig: qsd8x50: Turn on option to make GPU only use MMU mapped address" into android-msm-2.6.32 commit 1f986b9f14429bbcc1ae9c6130ee3c5227c95e8b Merge: aabec24 dc9d931 Author: Steve Muckle Date: Tue Jun 22 18:00:18 2010 -0700 Merge "defconfig: 7x27: Turn on option to make GPU use only MMU mapped address" into android-msm-2.6.32 commit aabec245430113af3efb592ca22af3e1175d4ee0 Merge: 3783226 6dce72f Author: Steve Muckle Date: Tue Jun 22 18:00:03 2010 -0700 Merge "mmc: core: Fix the block size for CMD14 used during bustest." into android-msm-2.6.32 commit 37832262e886d7d49ea85a921ae83ce068c907e3 Merge: 3367422 467d933 Author: Steve Muckle Date: Tue Jun 22 17:59:57 2010 -0700 Merge "msm: rmnet: Add debug statements in sdio rmnet driver." into android-msm-2.6.32 commit 3367422e5eab4926da4388899cd221c8a1943932 Merge: c419559 83db274 Author: Steve Muckle Date: Tue Jun 22 17:59:46 2010 -0700 Merge changes Icdae5636,I607b7393 into android-msm-2.6.32 * changes: serial: Remove redundant clock calls from console drivers serial: msm_serial_hsl_lite: Improve console write path commit 2aa2879257ad4b6998310869bc223d9b97d80006 Author: Ninad Patgaonkar Date: Tue Jun 22 12:48:50 2010 -0700 camera: Support for 8x60 camera driver Added camera driver IO support for 8x60 & updated the Makefile. Change-Id: Ifb98d0f46b37efee927bbc4670432d3073ee1961 Signed-off-by: Ninad Patgaonkar commit ee61d7178de4c8f986ae33ec5813ed34bac0a3e3 Author: Abhishek Kharbanda Date: Mon Jun 14 18:32:01 2010 -0700 msm_fb: Enable Audio settings for ADV7520 HDMI chip Configure ADV7520 HDMI chip for dual channel audio through I2S inerface. Change-Id: I916acfc38fe497b54ce5147a07a700f57b305a4b Signed-off-by: Abhishek Kharbanda commit 49fff67651f61d31031597addbf6e47703d31a7b Author: Stepan Moskovchenko Date: Mon Jun 21 17:01:35 2010 -0700 arm: mm: smmu: Set APROTNS override to non-secure. The transition to the full boot chain requires the SMMU to be configured to treat multimedia requests as non-secure for L2 redirection to work properly. Change-Id: Ie97ecd2ace3759f43191baeb9ffa9ac9748506c6 Signed-off-by: Stepan Moskovchenko commit 211c7a1304ef45a5dc50ea911c363fe5ff5741fd Author: Ninad Patgaonkar Date: Tue Jun 22 12:33:52 2010 -0700 camera: Disable camera flash on 8x60 As there is no support for led flash is pmic disabling camera flash on 8x60. Change-Id: I086549a3257b8909b2f966f8c0e40c63103aafa6 Signed-off-by: Ninad Patgaonkar commit c4195595a96fabe4b3129ec1880be179da650979 Merge: 74f2972 1feefb7 Author: Steve Muckle Date: Tue Jun 22 11:47:08 2010 -0700 Merge "msm: 8x60: Enable the hardware graphics in the defconfig" into android-msm-2.6.32 commit 8ee8614c7a4267b2e4a85e9ff8d5057cfec2f3ed Author: Dima Zavin Date: Mon Mar 22 12:00:15 2010 -0700 [ARM] msm: mahimahi_defconfig: Turn off tuner drivers These are unused. It saves 30K+ Change-Id: Ia2bc6500bc1a8f6482a8f8b14a2b7345d4abaab9 Signed-off-by: Dima Zavin Signed-off-by: Larry Bassel commit 5f7b7a381cff6259a222e9752020ad997b698a23 Author: Dima Zavin Date: Mon Mar 22 11:57:31 2010 -0700 [ARM] msm: mahimahi_defconfig: Update config with actual one generated Change-Id: I177954318edeb115f208af097f505abc46155fbb Signed-off-by: Dima Zavin Signed-off-by: Larry Bassel commit b4428ad3f7928299654e7b6b814ca9de3f4f4bbf Author: Greg Goldman Date: Mon Mar 22 09:46:59 2010 -0700 net: wireless: bcm4329: Fix SoftAP security mode change Change-Id: If4189d81649ba3cef0220aee6bd2d3c8e542be0d Signed-off-by: Dmitry Shmidt Signed-off-by: Larry Bassel commit 74f29722c65d82c7e58479b5ff96b737d097788b Author: Matt Wagantall Date: Fri Jun 18 11:06:44 2010 -0700 msm: clock: Fix 7x30 and 8x60 locking of 'cf' pointers Other threads of execution may modify the current frequency of a clock, so 'current frequency' pointers should be protected by locks to ensure frequency switch operations are completed atomically. Change-Id: Ie2478e442221aa17c78eb4f1915622c5eee8b8cb Signed-off-by: Matt Wagantall commit 43bc3de10d689e4fdcc651fba27a786b6f2f5263 Merge: cda3753 81adfb8 Author: Murali Palnati Date: Tue Jun 22 08:54:07 2010 -0700 Merge "msm: 8x60: Increase the mdp clock rate to 128MHz" into android-msm-2.6.32 commit 6dce72fed80f64ea13b71d5017ebfd0e3c47b708 Author: Aparna Mallavarapu Date: Tue Jun 22 20:20:27 2010 +0530 mmc: core: Fix the block size for CMD14 used during bustest. As per MMC specifcation bustest procedure defines the number of bytes to be read using CMD14 for each of the buswidths available. This patch defines the bytes to be read for 8/4/1 bit buswidth using CMD14. Change-Id: I215b619418fa880d7c3bb3ae6c946f9f0dcebca5 Signed-off-by: Aparna Mallavarapu commit 1feefb78a8d0f6de5791c3e1519cf6ae74eeeb84 Author: Naomi Luis Date: Mon Jun 21 18:49:56 2010 -0700 msm: 8x60: Enable the hardware graphics in the defconfig Enable hardware accelerated graphics in the defconfig of the 8660 target. Change-Id: Ib00310174b418a2d70deac474ff7f5c1df322264 Signed-off-by: Naomi Luis commit 4c162b1892cf1f0127235ecb4d1ba7e418ac1b77 Author: Gregory Bean Date: Mon Jun 21 08:45:08 2010 -0700 msm: msm7200a-gpio: Move msm7200a-gpio to mach-msm. Code-review feedback while upstreaming this driver into 2.6.36 caused it to be moved from drivers/gpio into arch/arm/mach-msm. Move these files to reflect their correct positions upstream. Change-Id: Icb0f95c91a61e251a043a7e2b1b89bd9e66ed388 Signed-off-by: Gregory Bean commit cda375334c2de3e54e5c7d059f5f522921a18806 Merge: 5d31b75 8d31746 Author: Bryan Huntsman Date: Mon Jun 21 22:52:28 2010 -0700 Merge "defconfig: 8660: Enable basic usb host mode support" into android-msm-2.6.32 commit 5d31b753a43bda6b6d9b0d97d0603820c2506ca5 Merge: 0e7a2cf e57c778 Author: Bryan Huntsman Date: Mon Jun 21 22:52:16 2010 -0700 Merge "msm: audio: 7x30: Create MI2S sound device driver." into android-msm-2.6.32 commit 0e7a2cff615ba217017fefc2494b5a3bc8965241 Merge: fd84fc3 90a9ae4 Author: Bryan Huntsman Date: Mon Jun 21 22:51:12 2010 -0700 Merge "diag: Fix the corner case where wake up condition could remain set" into android-msm-2.6.32 commit fd84fc3a46dd3932e1e296afa00b9c22bfb13593 Merge: 07c358a a9b8d0e Author: Bryan Huntsman Date: Mon Jun 21 22:50:39 2010 -0700 Merge "diag: Enclose lesser lines of code within mutex" into android-msm-2.6.32 commit 07c358a03597047ce5e55795fb1a556e9beea815 Merge: 497e3c3 7290ff4 Author: Bryan Huntsman Date: Mon Jun 21 22:50:05 2010 -0700 Merge "diag: Modify macro name to suit functionality" into android-msm-2.6.32 commit 497e3c30ec285f3582f26b7cf4b7646c0c01e053 Merge: 5272f36 552ea03 Author: Bryan Huntsman Date: Mon Jun 21 22:49:41 2010 -0700 Merge "msm: qsd8x50a-st1x: Change defconfig options to use graphics hw" into android-msm-2.6.32 commit 5272f36af291b6c96d719a64bd92a0295defbc92 Merge: 6f2dc1d 2e8ceb0 Author: Bryan Huntsman Date: Mon Jun 21 22:48:49 2010 -0700 Merge "msm: 7x27: add gpiolib support to the MSM7x27." into android-msm-2.6.32 commit bddeed67a6d315946642f99945ac2eb560e37ecd Author: Shubhraprakash Das Date: Fri Jun 18 11:54:33 2010 -0600 defconfig: qsd8x50: Turn on option to make GPU only use MMU mapped address Turning on option CONFIG_MSM_KGSL_MMU_PAGE_FAULT will cause GPU to report a page fault when an address is not within its virtual MMU range. This prevents GPU from using direct physical address which is better for security. Signed-off-by: Shubhraprakash Das Change-Id: I36e1acf4f0a3db6de94aa67671bc5bd8740d0f6b commit dc9d931a410ea3c264080cfb935174c18ebd32d7 Author: Shubhraprakash Das Date: Thu Jun 17 15:18:05 2010 -0600 defconfig: 7x27: Turn on option to make GPU use only MMU mapped address Turning on option CONFIG_MSM_KGSL_MMU_PAGE_FAULT will cause GPU to report a page fault when an address is not within its virtual MMU range. This prevents GPU from using direct physical address which is better for security. Change-Id: I74d52648f9a1ee9303fb02c3866fdc2e9349ed13 Signed-off-by: Shubhraprakash Das commit 8d317460b30a23400c4535cdff2a9c66c8f2c1f3 Author: Vamsi Krishna Date: Fri Jun 18 17:27:04 2010 -0700 defconfig: 8660: Enable basic usb host mode support Just enabling Mass-storage and HID class for now. Depending on need would enable USB Networking, Audio and Video support Change-Id: I883d053b9619ad97de3d965bad7bb15eda9235af Signed-off-by: Vamsi Krishna commit 81adfb8ac9838f540ea359ba34dc47d46ed77fc9 Author: Naomi Luis Date: Mon Jun 21 17:44:26 2010 -0700 msm: 8x60: Increase the mdp clock rate to 128MHz There is a flicker seen on the screen when the pmem is used by Surface Flinger. The increase in clock frequency is used to fix this flicker issue. Change-Id: I7c6e046d0f2470ef189554e5f661fdf76b02d580 Signed-off-by: Naomi Luis commit 6f2dc1d2ebc979ff71476e60d84856fb08867ff2 Merge: 5eb9c1b 63c1b0f Author: Steve Muckle Date: Mon Jun 21 17:03:52 2010 -0700 Merge "usb: msm_otg: Modify in_lpm variable type to be atomic" into android-msm-2.6.32 commit 90a9ae4bfcebad44e597ea606b31200a2fb3986a Author: Shalabh Jain Date: Thu Jun 17 23:33:07 2010 -0700 diag: Fix the corner case where wake up condition could remain set DIAG clients use a read thread to communicate to the DIAG driver. This is a blocking thread which wakes up on a condition. Here, in case the read thread wakes up while logging is done on a memory device, but immediately logging mode is change, the wakeup condition would never be cleared. Adding a case to clear wakeup condition in such scenario. Change-Id: I794661930fa339503cdbe3b7e81ef81c10c2d246 Signed-off-by: Shalabh Jain commit a9b8d0e5404234f9dcd1bbee853acca17347f71a Author: Shalabh Jain Date: Thu Jun 17 22:23:59 2010 -0700 diag: Enclose lesser lines of code within mutex DIAG code uses mutex to protect a global variable that can be accessed by multiple processes at the same time. Accidentally much more code was enclosed within the mutex. Moving the lock/unlock statements to protect only the desired variable and leave rest of code out of mutex scope. Change-Id: Ia96ab7b113ef0110c915b113ae30a9a6994c5424 Signed-off-by: Shalabh Jain commit 7290ff4d0f79ae987f6e1a3871c28cb4e314fb15 Author: Shalabh Jain Date: Fri Jun 11 16:07:52 2010 -0700 diag: Modify macro name to suit functionality This macro also implements exit functionality in case copy does not work successfully. So adding that to the name. Change-Id: Ic10ca03aacfbc2163c758ed853c94fd18e240f23 Signed-off-by: Shalabh Jain commit 5eb9c1b578afa6a5e9cf27ddc73abb277745e61e Merge: 07d132a 2141858 Author: Steve Muckle Date: Mon Jun 21 15:00:43 2010 -0700 Merge "defconfig: Turn off FIQs in 8660 defconfig" into android-msm-2.6.32 commit 07d132a8f135a14739b5f921fc41caad3d138b84 Merge: fae57ba 5db9adb Author: Steve Muckle Date: Mon Jun 21 15:00:27 2010 -0700 Merge "msm: 8x60: rename gpio-v2.c to msm8660-gpio.c." into android-msm-2.6.32 commit fae57bad9aeda1b455cffc74f18dd1b9568ce0b5 Merge: e0b45b3 f628f90 Author: Steve Muckle Date: Mon Jun 21 15:00:18 2010 -0700 Merge changes Id882436e,I1a70508a into android-msm-2.6.32 * changes: msm: 8x60: move msm_gpio_install_direct_irq into tlmm-msm8660.c. msm: 8x60: move gpio_tlmm_config into tlmm-msm8660.c. commit e0b45b3380e42c71891bc6d13691eeb26e36f9fc Merge: dbde6a3 c6354c3 Author: Steve Muckle Date: Mon Jun 21 15:00:13 2010 -0700 Merge "msm: 8x60: Move tlmm register definitions to tlmm-msm8660.h." into android-msm-2.6.32 commit dbde6a392e89a24a18871764799ee04ce91bbf67 Merge: ba18a75 3bc3334 Author: Steve Muckle Date: Mon Jun 21 15:00:07 2010 -0700 Merge "msm: 8x60: rename tlmm.c to tlmm-msm8660.c." into android-msm-2.6.32 commit ba18a75139e144773337bcd3ea34b94aa7343ee7 Merge: a2f0e60 2d2d78a Author: Steve Muckle Date: Mon Jun 21 14:59:47 2010 -0700 Merge "usb: msm_gadget: Protect usb state/flag variables with spinlock" into android-msm-2.6.32 commit 467d933bfe3c5514c4c1729909b9e957e5e90215 Author: Niranjana Vishwanathapura Date: Mon Jun 21 12:07:55 2010 -0600 msm: rmnet: Add debug statements in sdio rmnet driver. Log additional information into kernel log about sdio rmnet driver operation. The log messages should be disabled by default and can be enabled by setting 'debug_mask' module parameter to 1. Change-Id: Ibafb9b9ba6d67b4d1f595988bd07dab022f643d0 Signed-off-by: Niranjana Vishwanathapura commit 339bf11dec51e9711d4a6448f3c92e81ac6a9da1 Author: Marco A Vital Yep Date: Tue Jun 8 13:46:45 2010 -0700 video_core: 720p: Set divx configuration and drop not coded frames. Set the divx configuration and drop the not coded output frames in the driver to return immediately the corresponding output buffers to the hardware. Change-Id: I0999dd300bed75061c86985f296c18f3e5b7688c Signed-off-by: Marco A Vital Yep commit 21418585ea9686c50e8b863ba2e64a954350683f Author: Jeff Ohlstein Date: Thu Jun 17 18:58:35 2010 -0700 defconfig: Turn off FIQs in 8660 defconfig Eventually trustzone will need exclusive access to FIQs. Turn them off in the 8660 defconfig so there are no surprises. Change-Id: Idb5444dc95f94b6e2b6356c1f182033cc77fb3c2 Signed-off-by: Jeff Ohlstein commit 7613a3c3e294ef979b547a5fe405309110c06225 Author: Ashish Singhal Date: Mon Jun 21 13:56:47 2010 -0600 defconfig: 8x55: update local-version name Local version name change to match the name of defconfig file Change-Id: I82308838276feb09a25f65e2a3b3a52b2e8086e3 Signed-off-by: Ashish Singhal commit a2f0e60b9aab43372d91717a7834296982786db1 Author: Jordan Crouse Date: Mon Jun 21 14:10:45 2010 -0600 kgsl: Enable MH interrupt handling Handle memory interrupts for G12 and print out error information for 2D page faults. Also fix a bug in regread that was only hit during the MH interrupt handler. Signed-off-by: Jordan Crouse commit 1cd9e297fec7574b14cdd59775751412f1648cdb Merge: 7690db2 57dd00d Author: Trilok Soni Date: Mon Jun 21 12:13:35 2010 -0700 Merge "msm_kgsl: Enable shadow writes for context switching" into android-msm-2.6.32 commit 7690db26c9984775a7b1c01ebd5a0d2866155f8c Merge: c54b081 08d8502 Author: Trilok Soni Date: Mon Jun 21 12:12:56 2010 -0700 Merge "msm: 8x60: enable CONFIG_DEBUG_GPIO." into android-msm-2.6.32 commit c54b081a90d2b4a9a2106af67d618eb8270f25b4 Merge: 6af4faf 8fd8bb1 Author: Trilok Soni Date: Mon Jun 21 12:10:18 2010 -0700 Merge "usb: msm_gadget: Change usb info counter variable's type to atomic" into android-msm-2.6.32 commit 6af4faf61ff73020056bcf9abd90e9dc1b037979 Merge: dd8a2ed 89062e0 Author: Trilok Soni Date: Mon Jun 21 12:09:49 2010 -0700 Merge "msm: rpc: Add support for delayed registration of rpc devices in board file" into android-msm-2.6.32 commit 2e8ceb0575f6906060c9b70e60746763e9299d46 Author: Gregory Bean Date: Thu Jun 17 17:45:29 2010 -0700 msm: 7x27: add gpiolib support to the MSM7x27. Change-Id: I472d17adcde1f4ed62c97cd65f2d0ce7936b951e Signed-off-by: Gregory Bean commit 63c1b0f9f42065c84fecc7a18fe40d5568ad9c18 Author: Vamsi Krishna Date: Wed Jun 16 16:19:06 2010 -0700 usb: msm_otg: Modify in_lpm variable type to be atomic Change-Id: I19062cfc6f826ec265800bdfd8cf32c2bc9c5b19 Signed-off-by: Vamsi Krishna commit 2d2d78ae54f012a787bf38cf50abae9a83cf0862 Author: Vamsi Krishna Date: Fri Jun 18 01:55:35 2010 -0700 usb: msm_gadget: Protect usb state/flag variables with spinlock Change-Id: Icf19344fd03ea9c73e81bdfbab88ec85de4d8f6c Signed-off-by: Vamsi Krishna commit 8fd8bb1eb06cd572bf4c475a522ba737c4b22eaf Author: Vamsi Krishna Date: Fri Jun 18 01:22:07 2010 -0700 usb: msm_gadget: Change usb info counter variable's type to atomic Change-Id: I9dc8cf85994acd75eb5f91bd3b41dd2178436e1f Signed-off-by: Vamsi Krishna commit 5db9adb72290b83c96726ee7d9c5e9d76f40262c Author: Gregory Bean Date: Sat Jun 19 18:29:18 2010 -0700 msm: 8x60: rename gpio-v2.c to msm8660-gpio.c. Now that the tlmm-layer code has been removed, rename gpio-v2.c to msm8660-gpio.c, to reflect its parallel status to its sibling, msm7200a-gpio. Work can now begin to prepare this driver for sending upstream. Change-Id: If187e0c61b41421f75133c635ef66ad8828cb82c Signed-off-by: Gregory Bean commit f628f904ea1436e87da881eb086cffd7600312f9 Author: Gregory Bean Date: Sat Jun 19 17:49:22 2010 -0700 msm: 8x60: move msm_gpio_install_direct_irq into tlmm-msm8660.c. Move msm_gpio_install_direct_irq from gpio-v2.c into tlmm-msm8660.c, since it is a tlmm function and not a gpiolib function. Change-Id: Id882436e11f148f1dde7c7c2bb5406672b62aaf4 Signed-off-by: Gregory Bean commit 3c520663abec520880f52a2ac1c16a223a3306f0 Author: Gregory Bean Date: Sat Jun 19 17:38:57 2010 -0700 msm: 8x60: move gpio_tlmm_config into tlmm-msm8660.c. Move gpio_tlmm_config from gpio-v2.c into tlmm-msm8660.c, since it is a tlmm function and not a gpiolib function. Change-Id: I1a70508a0beaaf7a6e2ac0d53fdf28b60f1c3e24 Signed-off-by: Gregory Bean commit c6354c32ea86bf620fd5313483c66d94d1f12d2d Author: Gregory Bean Date: Sat Jun 19 17:57:39 2010 -0700 msm: 8x60: Move tlmm register definitions to tlmm-msm8660.h. Move TLMM iomap and register-bitfield information out of gpio-v2.c and into tlmm-msm8660.h, where it can be shared by both gpio and tlmm subsystems. Change-Id: I681a367fd607bff535fb5159911e99f5a374fa69 Signed-off-by: Gregory Bean commit 3bc333462150cb0445fd80b5d283942788f34f98 Author: Gregory Bean Date: Sat Jun 19 17:25:03 2010 -0700 msm: 8x60: rename tlmm.c to tlmm-msm8660.c. Rename tlmm.c to tlmm-msm8660.c in order to make room for upcoming changes: - The separation of 8x60 gpio-specific functionality into a driver, paralleling work recently completed on uniprocessor targets; - The relocation of 8x60 tlmm-specific code into tlmm.c and out of gpio-v2.c; - The retiring of the (by this point, empty) gpio-v2.c; - The creation of tlmm-msm7200a.c for tlmm-specific code for 7200a-family chipsets (those using the msm7200a-gpio driver); - And the eventual retiring of gpio.c and generic_gpio.c. Change-Id: I5b1de0f28b2c4a3f4d8d3b0589f5f62a94f2153d Signed-off-by: Gregory Bean commit dd8a2ed7623364779e235b7cf6afce74d3fa61d2 Merge: a398a03 6207c6b Author: Murali Palnati Date: Mon Jun 21 06:51:53 2010 -0700 Merge "msm: handset: Add structure for handset platform data" into android-msm-2.6.32 commit a398a039fa28ac79c2481ef469b834b7abc70a5c Merge: c1e86b4 7a05ab9 Author: Murali Palnati Date: Mon Jun 21 06:40:54 2010 -0700 Merge "mmc: msm_sdcc: Restore controller's state even if clk_reset fails." into android-msm-2.6.32 commit 83db274f6187ba95d084d69fcda792b8462bafa0 Author: Sankalp Bose Date: Mon Jun 21 16:42:42 2010 +0530 serial: Remove redundant clock calls from console drivers Clock calls in console write path introduces unnecessary dependencies w.r.t. clock module. Remove redundant calls to clk_enable and clk_disable. Change-Id: Icdae56362354d8e2c4368cc9b08cdfe7c0e0cf37 Signed-off-by: Sankalp Bose commit 4e73cecf39194140d36692c325724db0461abe10 Author: Sankalp Bose Date: Fri Jun 18 10:04:55 2010 +0530 serial: msm_serial_hsl_lite: Improve console write path Make use of multi-byte writes to reduce polling time. This also fixes the issue of dropped characters on console writes. Change-Id: Iabf98de33dd63f923e595d0f2b4fda8a1eb4fa15 Signed-off-by: Sankalp Bose commit c1e86b48a96843bf1f3f15134ce3f072a4187b32 Merge: 3e7ef57 d4f0d91 Author: Trilok Soni Date: Mon Jun 21 00:38:32 2010 -0700 Merge "usb: msm_gadget: remove global variable vbus" into android-msm-2.6.32 commit 3e7ef57dd32336b0866c1c0a2ab8572485752664 Merge: a254dd9 ae2cf8c Author: Trilok Soni Date: Mon Jun 21 00:38:02 2010 -0700 Merge "msm: kgsl: Enable the kgsl on the 8660 target" into android-msm-2.6.32 commit a254dd9bd8f8b45fbd8e1881b3028eca86bc2a63 Merge: 5a04bca 28f8e2c Author: Trilok Soni Date: Mon Jun 21 00:37:20 2010 -0700 Merge "msm: rmnet: use spinlock instead of mutex." into android-msm-2.6.32 commit 5a04bca13d0ef900c3453dd1e7dd17a4c1942034 Merge: 8571cfa 17ef54f Author: Trilok Soni Date: Mon Jun 21 00:37:10 2010 -0700 Merge "msm: smd_pkt: Add support for new SMD_PKT user space device" into android-msm-2.6.32 commit 8571cfa15c2daffa1398a6e0bf291e0903e9d0c5 Merge: 7b8bdc3 b7c3190 Author: Trilok Soni Date: Mon Jun 21 00:36:56 2010 -0700 Merge "diag: Add spinlocks to ensure safety while calling SMD functions" into android-msm-2.6.32 commit 7b8bdc304a1386bb1dc591a7c381774355a4430e Merge: 44aaa1f b67b8f4 Author: Trilok Soni Date: Mon Jun 21 00:36:47 2010 -0700 Merge "gpio: pmic8901-mpp: Support direction and dbg APIs" into android-msm-2.6.32 commit 44aaa1fbe497ef4fc755a232e648eb80d238a561 Merge: 9aade5f a4e25cc Author: Trilok Soni Date: Mon Jun 21 00:36:36 2010 -0700 Merge "video_core: 720p: Add output port reconfiguration support" into android-msm-2.6.32 commit 9aade5fb2d57ce07e52c6bee07649506e79e0003 Merge: 9d647eb 8e35132 Author: Tom Mackall Date: Sun Jun 20 02:12:08 2010 -0700 Merge "msm_kgsl: Enable 3D clocks before power for all Adreno platforms" into android-msm-2.6.32 commit 552ea031b591765587dc20888d084c0b7eff3912 Author: Shubhraprakash Das Date: Sat Jun 19 19:37:44 2010 -0600 msm: qsd8x50a-st1x: Change defconfig options to use graphics hw Enable the graphics hw option in _defconfig file of 8650a Change-Id: I7cf23de38761d7b2da78393bce2ef77ea167374a Signed-off-by: Shubhraprakash Das commit 08d85029e7002795263d71e09e1cf15a69fad010 Author: Gregory Bean Date: Sat Jun 19 16:46:51 2010 -0700 msm: 8x60: enable CONFIG_DEBUG_GPIO. Enable CONFIG_DEBUG_GPIO to turn on warning messages for drivers which use the incorrect gpiolib APIs for gpio chips which may sleep. Change-Id: I05e32ae1becc7db770e5603b67c89d60e5f863c8 Signed-off-by: Gregory Bean commit 9d647eb97e34ccdee682ab2e5d7c0e793f72b058 Merge: b378de7 84b8222 Author: Trilok Soni Date: Sat Jun 19 12:56:31 2010 -0700 Merge "msm: timer: Remove __cpuinit from local_timer_setup" into android-msm-2.6.32 commit b378de708ce1cbb134ad1865883eaa2dffa1e654 Merge: e27b623 5274ff9 Author: Trilok Soni Date: Sat Jun 19 12:55:01 2010 -0700 Merge "qup_i2c: Set rate for QUP source clock" into android-msm-2.6.32 commit 8e35132205c17766f598fb4fff03d8474d65028d Author: Jordan Crouse Date: Fri Jun 18 09:56:46 2010 -0600 msm_kgsl: Enable 3D clocks before power for all Adreno platforms 7X30 and 8650A require that 3D clocks be turned on before the power rails. 8X50 and 7X27 work fine with the same sequence, so do away with the #ifdefs. Change-Id: I123b15cb8d624a5a842da4e9c5ce5c5a3363a1c2 Signed-off-by: Jordan Crouse commit e27b6235805130c79178fd7e3b791107a4292293 Merge: 66e88ea 82ac3f3 Author: Zach Pfeffer Date: Fri Jun 18 20:59:31 2010 -0700 Merge "msm: clock-8x60: Workaround GFX3D clocking issue" into android-msm-2.6.32 commit ae2cf8c846fcfa330143c835efe0b84cb5f4b936 Author: Naomi Luis Date: Thu Jun 17 14:38:10 2010 -0700 msm: kgsl: Enable the kgsl on the 8660 target Change-Id: I8e5863ac0b15bbf5f3cf1fffe217217dcc4fd38d Signed-off-by: Naomi Luis commit 82ac3f3cffc116bd90a1ffc87813f234f1226891 Author: Matt Wagantall Date: Thu Jun 17 11:38:15 2010 -0700 msm: clock-8x60: Workaround GFX3D clocking issue The GFX3D core doesn't seem to respond well to having its clock disabled or rate changed. This currently results in a full App's CPU crash. Always leave the clock on at 266Mhz until the root cause is identified and fixed. Change-Id: I44270595a23c67d54f1088bc07a65f3d74d05daa Signed-off-by: Matt Wagantall commit 66e88eade61c2b132bd580d4c93ff0132341ac8c Author: Shubhraprakash Das Date: Wed Jun 9 12:13:47 2010 -0600 msm_kgsl: Add back in a max timeout period Max timeout period was removed in change 9fa7a6caad680db6c0b8b8bc0dbea5b8f39448a9 Adding it back in here. Change-Id: I4d04d5e6445cf29db8eabbe33f166b1be0a3c7cd Signed-off-by: Shubhraprakash Das commit 5274ff9ab2778a49d154cdc23176ed1585ba25b8 Author: Sagar Dharia Date: Fri Jun 4 14:28:38 2010 -0600 qup_i2c: Set rate for QUP source clock Some new chipsets (ex. 8x60) don't have a fixed qup_i2c clock rate. For these, clk_set_rate() must be called to specify the desired rate prior to enabling the clock. For older chipsets with fixed rates, set_rate() may not be supported and so rate is always assumed to be 19.2MHz. Change-Id: Id38d17abed07b155827acdb47c34808bce3fe691 Signed-off-by: Sagar Dharia commit 4e1a536d8b55bf813d04916dec70ddf4cc6832cf Merge: bfda443 e52fa58 Author: Zach Pfeffer Date: Fri Jun 18 16:52:28 2010 -0700 Merge "mfd: pmic8901: Fix IRQ base register address" into android-msm-2.6.32 commit bfda4434ff5fa2692e2a4f5e4fe1e52fba2ffe6d Merge: 36d57bb eb46ea0 Author: Zach Pfeffer Date: Fri Jun 18 16:51:58 2010 -0700 Merge "msm: 8x60: Add usb ehci host mode support" into android-msm-2.6.32 commit d4f0d91352675c98a665806f740be098f6cd2cb3 Author: Vamsi Krishna Date: Mon May 3 10:48:35 2010 -0700 usb: msm_gadget: remove global variable vbus remove global variable vbus and depend on usb state instead Change-Id: I2c7d98e4ecfeaff08884d503762c209812c47159 Signed-off-by: Vamsi Krishna commit b7c31906a5819734760fd64bc76b18d4d1137fc3 Author: Shalabh Jain Date: Wed Jun 16 16:19:59 2010 -0700 diag: Add spinlocks to ensure safety while calling SMD functions DIAG pulls traffic from modem using SMD channels. It invokes a SMD API to get data from it. This SMD API can be called from different contexts, like an ISR or a user space read thread. So we need to add spinlock here to ensure safety. Change-Id: I997a2d3f373f16de696cced4aead5b8a154dfd27 Signed-off-by: Shalabh Jain commit 57dd00dda96dc719e1d6377e40df2130b60ea1a0 Author: Shubhraprakash Das Date: Thu Jun 17 11:58:49 2010 -0600 msm_kgsl: Enable shadow writes for context switching Using shadow writes for context switching gives better performance. Change-Id: I6e6f2a0a8d35afcb857d6a5576e85cdc25fdfb1b Signed-off-by: Shubhraprakash Das commit 36d57bb4e30b84c0681b475d547403b535982d56 Author: Steve Muckle Date: Fri Jun 18 10:00:11 2010 -0700 defconfig: automatic update Change-Id: I6d22043d60d7889864d18616fb2964d128c7257b Signed-off-by: Steve Muckle commit e57c778ac21a3dfe95162beea55389a4ced9bd16 Author: Patrick Lai Date: Thu May 20 11:03:31 2010 -0700 msm: audio: 7x30: Create MI2S sound device driver. This driver sets up an audio hardware path which receives and transmits digital audio signal from and to external audio devices Currently, this driver sets hardware path for trasmitting stereo audio to external HDMI transmitter. This driver also sets up audio path for receiving stereo audio from an external FM receiver. Change-Id: I61888ff44783b39c95aeabb8d71ba9726d7a0cc0 Signed-off-by: Patrick Lai commit 1f59df825afad79dfcf148c6e3c02756a4981a86 Merge: 0b07959 17a1c6d Author: Trilok Soni Date: Fri Jun 18 08:16:09 2010 -0700 Merge "msm: audio: Add adsp platform device and required platform database" into android-msm-2.6.32 commit 0b0795920712ccfaeca72ac0c1c6ef2e33d3312a Merge: cb468fb c6df6d2 Author: Trilok Soni Date: Fri Jun 18 03:41:12 2010 -0700 Merge "msm: 7x27: Make the Zero Page to be available prior to barriers." into android-msm-2.6.32 commit cb468fb0c986cc8368c9da7c4bdbeb06cf7ff985 Merge: c534ea1 8ba0e8b Author: Trilok Soni Date: Fri Jun 18 03:40:59 2010 -0700 Merge "msm: 7x27: Flush AXI Bus buffer in msm_arch_idle()" into android-msm-2.6.32 commit c534ea15732584e5a8c3f2597f141df6bb128e90 Merge: 87f26b9 b25e422 Author: Trilok Soni Date: Fri Jun 18 03:02:40 2010 -0700 Merge "spi_qsd: Add usage of MX_WRITE_COUNT register" into android-msm-2.6.32 commit 87f26b96ac4f3d96fdef0d08dabb72080acd384c Merge: ea9eb75 c26f031 Author: Trilok Soni Date: Fri Jun 18 03:02:21 2010 -0700 Merge "alsa: soc: qdsp5v2: Use factored percentage volume" into android-msm-2.6.32 commit ea9eb752560a81052bbe0853855cfb06c83dfa90 Merge: 3f14729 4ffbeb1 Author: Trilok Soni Date: Fri Jun 18 03:02:00 2010 -0700 Merge "msm: adsp: 7k: Add option to configure adsp driver based on revision" into android-msm-2.6.32 commit 6207c6ba9e56b10c91fc51c64fb7884a8739e509 Author: Mohan Pallaka Date: Wed Jun 16 18:57:21 2010 +0530 msm: handset: Add structure for handset platform data Add a structure for handset platform data to hold needed data items for driver. Change-Id: I70a96799b6d7302f4087162e0f3e273780ca60dc Signed-off-by: Mohan Pallaka commit 7a05ab92f7c7429819e7ae0c56a3154bbb0e968f Author: Aparna Mallavarapu Date: Thu Jun 17 17:02:27 2010 +0530 mmc: msm_sdcc: Restore controller's state even if clk_reset fails. In the function msmsdcc_reset_and_restore, do not return when the clk_reset functions fail. Restore the state of the controller even if clk_reset fails. Change-Id: Id0a661009e5d01408c383320d815b098faca2e08 Signed-off-by: Aparna Mallavarapu commit eb46ea08692bfb1af47ef0474e21c6e6a9e32bc5 Author: Vamsi Krishna Date: Wed Jun 9 17:17:07 2010 -0700 msm: 8x60: Add usb ehci host mode support Change-Id: I1ea38bfcab7cc1aefcf38838f0ecc899914b7291 Signed-off-by: Vamsi Krishna commit 17a1c6d77ea3dc8f05453b736c385cca315a5382 Author: Sriranjan Srikantam Date: Tue Jun 15 18:41:48 2010 +0530 msm: audio: Add adsp platform device and required platform database MSM7201A architecture uses the same audpp driver used by other 7k targets. This driver require the platform database for selecting adsp task for playback and for concurrency. This database is registered by msm_adspdec platform device in other 7k board files (board-msm7x27.c). The halibut board file used by MSM7201A architecture does not have this platform device registered and is resulting in NULL pointer dereference. Hence update the halibut board file with adsp platform device Change-Id: I4dadcfbe24ee0e97e833899427a7f54b60b32ff1 Signed-off-by: Sriranjan Srikantam commit 4ffbeb1af61bcb81d86de56f201678b82436f7f8 Author: Suresh Vankadara Date: Wed Jun 16 21:10:05 2010 -0700 msm: adsp: 7k: Add option to configure adsp driver based on revision There are two revisions of adsp driver on apps and modem side based on different RPC versions. If there is any incompatiblity between these versions (i.e. older revision modem and newer revision apps or newer revision modem and older revision apps), audio and video playback will fail completely. MSM7201A architecture shall use older modem revision and newer apps revision Hence configure adsp driver based on modem revision and target config options. Also provide config option to easily switch between the two revisions of adsp driver Change-Id: I69fa25a3ed3da087d57421e9eeee6b09a7178963 Signed-off-by: Suresh Vankadara Signed-off-by: Sriranjan Srikantam commit 17ef54fb29023beca46485eb5742b8a0c0ab32db Author: Karthikeyan Ramasubramanian Date: Thu Jun 10 16:04:55 2010 -0600 msm: smd_pkt: Add support for new SMD_PKT user space device Expose DATA22 smd channel as /dev/smd22 user-space device. This new device will be used to pass IP Packets with additional headers between Modem and Application processors. Change-Id: Ic14a5d26e5528319190adc1bc13fec14bfeb8bb8 Signed-off-by: Karthikeyan Ramasubramanian commit 8ba0e8b28aec14f5696caab6b91747eb6b254549 Author: Naveen Ramaraj Date: Tue Jun 8 14:42:01 2010 -0700 msm: 7x27: Flush AXI Bus buffer in msm_arch_idle() On 7x27 the AXI bus buffer should also be flushed whenever a cache maintenance operation is being performed. This flush is done by writing to a strongly ordered memory location. Add this operation to msm_arch_idle() and also take care of preserving the state of exception flags and the link register. Change-Id: Ib49081fa3140f13cf9bf4ce1fa2226153f3b9da3 CRs-fixed: 238082 Signed-off-by: Naveen Ramaraj commit 3f1472923bd54375df8d3abd8cdb01902778ead6 Author: Matt Wagantall Date: Tue Jun 15 14:14:50 2010 -0700 msm: clock-8x60: Remove support for pmic_ssbi2_clk This clock is configured and in-use prior to booting Linux. Attempting to manipulate this clock from the kernel after it's been in use seems to break communication with the PMIC, so support for this clock is removed for now. Change-Id: Id207edcf4934516821638c274f22bb6c176c18de Signed-off-by: Matt Wagantall commit 6e8cbad8f3bc49cbaf47c453b787293d2aff3d66 Merge: ccb9014 77aa1e4 Author: Zach Pfeffer Date: Thu Jun 17 17:28:45 2010 -0700 Merge "msm: defconfig: Enable HIGHMEM on ST 1.5" into android-msm-2.6.32 commit c6df6d2a0fa57269b534995214fdd89d903eb77e Author: Naveen Ramaraj Date: Thu Jun 17 14:33:04 2010 -0700 msm: 7x27: Make the Zero Page to be available prior to barriers. The zero page has to be initialized before any barrier calls that invoke write to strongly ordered memory. Make sure that the initialization can happen at an early stage before board file initialization so that barrier calls prior to it can succeed. Change-Id: Ia077f20a1d4a92eac75b42cbb4b2e2a4ab70d808 Signed-off-by: Naveen Ramaraj commit b25e4220efdacc231cb150fc263af1e3f525b165 Author: Lena Salman Date: Tue Jun 8 15:25:47 2010 +0300 spi_qsd: Add usage of MX_WRITE_COUNT register Use MX_WRITE_COUNT register to reduce the amount of TX interrupts in FIFO mode for transfers smaller than FIFO size. Change-Id: I7208fdc85b626a31a8b781ee5c56f73beee6c427 Signed-off-by: Lena Salman commit b67b8f4203f459362c59e8a489ffe237933e61e4 Author: Bobby Crabtree Date: Thu Jun 17 16:29:38 2010 -0700 gpio: pmic8901-mpp: Support direction and dbg APIs Implement gpiolib direction_input, direction_output, and dbg_show APIs. The direction_input API configures the MPP as digital input. The direction_output API configures the MPP as digitial output. The dbg_show API prints information out in the following format: "gpio-xxx (client_name) type state 0xAB" Change-Id: I47f488f57833d905bed0c15afb1b5886be475e62 Signed-off-by: Bobby Crabtree commit 89062e053cf07d125c10f0606e28b2e840c483f5 Author: Niranjana Vishwanathapura Date: Fri Jun 11 17:31:12 2010 -0600 msm: rpc: Add support for delayed registration of rpc devices in board file Some devices in board file are rpc related. Registering these devices needs to be delayed until remote server comes up. RPC router must maintain a list of such devices and register them when the required remote servers come up. Change-Id: I87eca2d0b4f1d369d3c738de0503c62a1bdb66bf Signed-off-by: Niranjana Vishwanathapura commit e52fa58cfde91d23a543583443156f93ab0e368f Author: Bobby Crabtree Date: Thu Jun 17 16:48:46 2010 -0700 mfd: pmic8901: Fix IRQ base register address IRQ base register address should be defined as 0xD5 not 0xF1. Change-Id: I583690efdbe9fa1ffbe8072fb757fe85aa2f657a Signed-off-by: Bobby Crabtree commit 28f8e2cb8f712b5f72a149a2192e9144f87aaeb8 Author: Niranjana Vishwanathapura Date: Thu Jun 17 16:13:37 2010 -0600 msm: rmnet: use spinlock instead of mutex. Linux IP framework holds a spinlock before calling rmnet_xmit. So, mutex can't be used inside this function. Switch to using spinlock instead of mutex in rmnet sdio driver. Change-Id: I2bdf53923cbc6448223c731157973bf4bebbd271 Signed-off-by: Niranjana Vishwanathapura commit 77aa1e48580d9597fcc46a2e1c6dd44325b6de34 Author: Naveen Ramaraj Date: Tue Jun 15 19:00:07 2010 -0700 msm: defconfig: Enable HIGHMEM on ST 1.5 Turn on HIGHMEM on ST 1.5 so that all available physical memory on the target can be mapped by the kernel. Change-Id: I1ef5591104a287674884eb3801ff6475dabed19b Signed-off-by: Naveen Ramaraj commit ccb9014d3549b778bb38f0768aec4f8efc239ba6 Author: Ai Li Date: Thu Jun 10 17:20:30 2010 -0600 msm: pm: add default low power mode for memory Add configurations MSM_MEMORY_LOW_POWER_MODE_IDLE and MSM_MEMORY_LOW_POWER_MODE_SUSPEND. They specify the default low power mode of the memory when the Application processor is in idle power collapse and suspend power collapse respectively. Change-Id: I01e7ddd00b0dd170bc57d1f9c64aba402b076dee Signed-off-by: Ai Li commit 2c415ceca42d1c97b3c2e23f1c50d7db17026d8c Merge: 81b1396 b170345 Author: Zach Pfeffer Date: Thu Jun 17 13:59:15 2010 -0700 Merge "msm_fb: proper order of IRQ operations for ST1.5" into android-msm-2.6.32 commit 81b1396c17adf54ab4bb7113774c3a599ddb4f1c Merge: eaeb24d 164672d Author: Zach Pfeffer Date: Thu Jun 17 13:58:38 2010 -0700 Merge "msm: sdcc: Set nonremovable flag for non-removable SD/MMC devices." into android-msm-2.6.32 commit eaeb24d521ed1d9e6b6d9a5f26baa5d4218b83c9 Merge: 37e4d84 ecdb815 Author: Zach Pfeffer Date: Thu Jun 17 13:57:14 2010 -0700 Merge "defconfig: enable CONFIG_MSM_KGSL_2D for 7x30 and 8x55" into android-msm-2.6.32 commit 37e4d84b80e794a4dc15f35ebbd8661b276b82e5 Merge: 32f1331 7e9e1a8 Author: Jordan Crouse Date: Thu Jun 17 13:56:14 2010 -0700 Merge "msm: qsd8x50a-st1x: Change default config options to use graphics hw" into android-msm-2.6.32 commit 84b8222459e2f186ecc0887a66c145e8b61dd87e Author: Jeff Ohlstein Date: Thu Jun 17 13:06:59 2010 -0700 msm: timer: Remove __cpuinit from local_timer_setup Currently local_timer_setup is sometimes reached on the second core after the first core has already freed __cpuinit memory. Remove __cpuinit to prevent this. Change-Id: I1f4ff8211bda7326d73a9ed52a3f22414b5c2675 Signed-off-by: Jeff Ohlstein commit 32f1331bec5e87249018e35881e558c8f433d609 Merge: 4b7f68b 08af9fc Author: Zach Pfeffer Date: Thu Jun 17 12:56:18 2010 -0700 Merge "mtd: msm_nand: Use dma_map_page instead of dma_map_single." into android-msm-2.6.32 commit 4b7f68bb65badb91025efa3bda3a179e586c17e7 Merge: 52a5177 1ad33a0 Author: Zach Pfeffer Date: Thu Jun 17 12:55:51 2010 -0700 Merge "msm: kgsl: add a Kconfig option to disable the 2D core" into android-msm-2.6.32 commit 164672dc515e366caeb39a9d78c9e602a6a6b9b7 Author: Aparna Mallavarapu Date: Thu Jun 3 11:16:56 2010 +0530 msm: sdcc: Set nonremovable flag for non-removable SD/MMC devices. Set MMC_CAP_NONREMOVABLE flag in the host capabilities for the SD slots that use SDIO cards and non-removable MMC cards like eMMC. Change-Id: I6d1a541e72399635c3aa84139e4e2b7ba645c045 Signed-off-by: Aparna Mallavarapu commit a4e25cc1180efd9829877e7a82487909444a5736 Author: Ravishangar Kalyanam Date: Tue Jun 15 23:54:39 2010 -0700 video_core: 720p: Add output port reconfiguration support Add output port reconfiguration support in 720p Video driver which enables the driver to notify reconfig event to the userspace components Change-Id: Ia5256509276ed01b63f4d7a8ce75fc80e892f3fc Signed-off-by: Ravishangar Kalyanam commit 52a5177dc45043eb408165450f73a43b1c2c2bd0 Author: Jeff Ohlstein Date: Fri May 14 10:23:24 2010 -0700 defconfig: Update 8x60 defconfig for android Turn on various Kconfig options that are on in 8x50 for android. Change-Id: Id145fd73e31bd699f7d7f745ba33b724e1ee2c53 Signed-off-by: Jeff Ohlstein commit 7e9e1a84500189d63de07511eb9e4c193db333be Author: Shubhraprakash Das Date: Wed Jun 16 19:13:04 2010 -0600 msm: qsd8x50a-st1x: Change default config options to use graphics hw Change-Id: If2a661dba81eaab0ebcb89a85ae17724a5bac760 Signed-off-by: Shubhraprakash Das commit ecdb815ee20a87715e6afab9b0fa89cc20b5adb2 Author: Jeremy Gebben Date: Mon Jun 7 19:35:06 2010 -0600 defconfig: enable CONFIG_MSM_KGSL_2D for 7x30 and 8x55 Change-Id: I4989e6422bc04f181a54a2a8fea23da642966978 Signed-off-by: Jeremy Gebben commit 1ad33a0fa7d5cbfbf42348c69ee5a6df0fa77bc1 Author: Jeremy Gebben Date: Wed Jun 2 08:04:05 2010 -0600 msm: kgsl: add a Kconfig option to disable the 2D core Change-Id: I07430c4ff4fd675c944c9ff3d025183ed59a7bbe Signed-off-by: Jeremy Gebben commit 5320526291d6f55bfaf806209648ebac6b08ab25 Merge: 5847700 abc9ec8 Author: Trilok Soni Date: Thu Jun 17 05:49:23 2010 -0700 Merge "[ARM] msm: msm_serial_hs: Improve RX flush procedure during clock off sequence." into android-msm-2.6.32 commit 5847700b78d9bfc188e2c371a82ecf1f64e9409b Merge: 29f3721 d76e632 Author: Trilok Soni Date: Thu Jun 17 05:48:53 2010 -0700 Merge "msm: nand: Fix compilation error when CONFIG_MMC_MSM is not defined" into android-msm-2.6.32 commit 29f37210a1929a41cfa6aaa243f3e11f6517e9a6 Merge: dbbaa40 340509a Author: Trilok Soni Date: Thu Jun 17 05:48:22 2010 -0700 Merge "mmc: msm_sdcc: Indentation corrections" into android-msm-2.6.32 commit dbbaa403634ed09b6f6efa9cb5aee2438125552f Merge: 737e80a ae2b6dc Author: Trilok Soni Date: Thu Jun 17 05:19:44 2010 -0700 Merge "msm: qsd8x50a-st1x: Set the 2d clock name in board file" into android-msm-2.6.32 commit 737e80a349903bb3b0a5d05be5da2417d3c6a1c7 Merge: d86f77d e8fdb27 Author: Trilok Soni Date: Thu Jun 17 05:19:30 2010 -0700 Merge "msm: qsd8x50a-st1x: Use the correct FB size in board file" into android-msm-2.6.32 commit d86f77d0459c619824dc370ea4d5bdf530856d22 Merge: 0689829 e77d332 Author: Trilok Soni Date: Thu Jun 17 05:19:13 2010 -0700 Merge "msm: clock-8x60: Enable RINGOSC branch and root for measurements" into android-msm-2.6.32 commit 0689829f6bc404c34c7fb84886912bb4e6eedce5 Merge: f186815 554058c Author: Trilok Soni Date: Thu Jun 17 05:18:57 2010 -0700 Merge "msm: sdio: SDIO-AL remove redundancy bus_lock mutex." into android-msm-2.6.32 commit f186815d84663c311c3341dc132f94d1e215555b Merge: 5bbc926 dd6eec3 Author: Trilok Soni Date: Thu Jun 17 05:18:40 2010 -0700 Merge "msm: ONFI probe fix for MT29F4G08ABC device." into android-msm-2.6.32 commit 5bbc9268d4c64774706eea1f2996f43beb3731d2 Merge: bc84138 53b73f2 Author: Trilok Soni Date: Thu Jun 17 05:18:22 2010 -0700 Merge "msm_kgsl: Convert pfn to physaddr before using the address for cache flush." into android-msm-2.6.32 commit bc841382daf1195e25779d32eadac2da3bba8d0d Merge: a6216b6 1cf15b2 Author: Trilok Soni Date: Thu Jun 17 05:16:17 2010 -0700 Merge "msm: audio: qdsp5v2: Add FM driver to route FM to different sink" into android-msm-2.6.32 commit 340509a9316643950e21e06c686cf796f1dc5927 Author: Aparna Mallavarapu Date: Mon Jun 14 18:57:29 2010 +0530 mmc: msm_sdcc: Indentation corrections Change-Id: Idf16895746c14d714cd284cf7734ac4221b675e9 Signed-off-by: Aparna Mallavarapu commit a6216b65804f0e89025a7ac86ce40c69bc8d6ac5 Merge: 74f3ff1 9602959 Author: Trilok Soni Date: Thu Jun 17 01:48:15 2010 -0700 Merge "msm: smmu: 8x60: Add gfx2d / gfx3d clock control to SMMU" into android-msm-2.6.32 commit d76e63205c22bc51c15ac3c5ed762794417cc893 Author: Sahitya Tummala Date: Thu Jun 17 11:21:13 2010 +0530 msm: nand: Fix compilation error when CONFIG_MMC_MSM is not defined There is no dependency on CONFIG_MMC_MSM for NAND initialization to happen. But a NAND related struture is defined wrongly under SDCC slot configs. This patch removes this dependency on SDCC slot configs and thus fixes the compilation issue when CONFIG_MMC_MSM is not defined. Change-Id: Ia2176720a3b0012ea69d4499d89b6fb4fc7c0031 Signed-off-by: Sahitya Tummala commit 08af9fcb53c3f4bd7c8f9bdc815c9f62da9e5793 Author: Murali Nalajala Date: Tue Jun 15 18:32:28 2010 +0530 mtd: msm_nand: Use dma_map_page instead of dma_map_single. dma_map_single does not work for highmem or vmalloced memory. Also fix the unmap length if writing more then one nand page. Change-Id: I29501b6e01415bb0497a24e1b1fe8d426d338bb1 Signed-off-by: Arve Hjonnevag [mnalajal@qualcomm.com: Modified OneNAND functions too] Signed-off-by: Murali Nalajala commit 554058c82e22c3e79347654988e9be22aad57220 Author: Amir Samuelov Date: Wed Jun 16 17:43:10 2010 +0300 msm: sdio: SDIO-AL remove redundancy bus_lock mutex. The SDIO-Host claim/release API is used as a bus mutex. Change-Id: Iddb594a3b1502f32a64d3a26dcd6f39880aeb60b Signed-off-by: Amir Samuelov commit 74f3ff168b932158e33eaf56f3e3d7d20a9aeea1 Merge: 8cddba8 86d22c5 Author: Zach Pfeffer Date: Wed Jun 16 21:19:09 2010 -0700 Merge "msm: sdio: SDIO-AL add debug." into android-msm-2.6.32 commit 8cddba834546efa9309a9a24c0d9d8364a871726 Merge: b1ced41 89c6c31 Author: Zach Pfeffer Date: Wed Jun 16 21:18:41 2010 -0700 Merge "msm: sdio: SDIO-AL retry to sdio_func_enable() if fail." into android-msm-2.6.32 commit b1ced4115a152733682795c2367f8b6f5e28dd17 Merge: 022e3e1 b277c0a Author: Zach Pfeffer Date: Wed Jun 16 21:18:27 2010 -0700 Merge "msm: sdio: SDIO-AL sdio_close keep the physical layer enabled." into android-msm-2.6.32 commit ae2b6dc664402aa796170857d06678421454469c Author: Shubhraprakash Das Date: Wed Jun 16 18:58:24 2010 -0600 msm: qsd8x50a-st1x: Set the 2d clock name in board file Change-Id: I96fba04a0c8dcec22060919a9a9a3fef60543f41 Signed-off-by: Shubhraprakash Das commit e8fdb2799ee61066408feafea19ba6f5b529c361 Author: Shubhraprakash Das Date: Tue Jun 15 18:56:47 2010 -0600 msm: qsd8x50a-st1x: Use the correct FB size in board file Change-Id: I1b0e027142e9d80aa5e74dedc8de0375d9df9b1b Signed-off-by: Shubhraprakash Das commit e77d33232c6258e54edda29d29928df239d9657d Author: Matt Wagantall Date: Wed Jun 16 13:52:14 2010 -0700 msm: clock-8x60: Enable RINGOSC branch and root for measurements Clock rate measurements require the ring oscillator clock to be on. Change-Id: I823c47ebd0c0973b8d9d62523442d182e9567cf8 Signed-off-by: Matt Wagantall commit 022e3e1b8b5c7ddcae833ac68c0a3a8e2d35151a Author: Anirudh Ghayal Date: Wed Jun 16 18:35:41 2010 +0530 defconfig: msm8660: Enable TMG200-TMA300 touchscreen driver Change-Id: I4e6d4338455f858ae49a408b258e971edf2ffe81 Signed-off-by: Anirudh Ghayal commit 52f035084fcd1e5c1c21f268bc93b56cebe93f4d Author: Anirudh Ghayal Date: Wed Jun 16 18:00:51 2010 +0530 msm: board-msm8x60: Add board info. for TMG200 touchscreen driver Change-Id: I5608f4b48ba16293392f412a4d687d2a4f9003e4 Signed-off-by: Anirudh Ghayal commit 5c8726478fdc7d0bee497c6e050c1600d83817ff Author: Anirudh Ghayal Date: Wed Jun 16 14:21:22 2010 +0530 input: touchscreen: Add support for TMG200 touch controller The TMG200 touch controller supports upto two touches. This driver supports both TMG200 and TMA300 controllers. CRs-Fixed: 226967 Change-Id: I32871e76d3dd77fec0a723e1c306492bda2de897 Signed-off-by: Anirudh Ghayal commit 9602959f4b87be9c3a3aa442ceba8856b374d51d Author: Stepan Moskovchenko Date: Wed Jun 16 13:29:41 2010 -0700 msm: smmu: 8x60: Add gfx2d / gfx3d clock control to SMMU Due to the clock configuration in the full boot chain, probing the gfx2d and gfx3d SMMUs results in a system lockup unless their clocks are explicitly turned on. Change-Id: I5642a5562266b3d9e6ef5bd09a7642e7977b9717 Signed-off-by: Stepan Moskovchenko commit 53b73f2d18ab4259cb4d92b417fbf477404c1b5f Author: Shubhraprakash Das Date: Mon Jun 14 00:32:14 2010 -0600 msm_kgsl: Convert pfn to physaddr before using the address for cache flush. Cache flush calls use physical addresses, hence convert pfn to physical address. This bug was introduced in change 9318fc2ab50dd953d73eacc40d70aaaa6563917a Change-Id: Ia78ad56573181d9759d86416c4bbbbc041550b51 Signed-off-by: Shubhraprakash Das commit c26f031c0433fd2ba320acda510dbcf5c92b3ca9 Author: Jay Wang Date: Fri Jun 11 17:54:57 2010 -0700 alsa: soc: qdsp5v2: Use factored percentage volume Because decimal fraction is lost in integer, volume level 1,2 and 3 have the same percentage volume. By using floating-point in ALSA API and converting the floating-point to the integer by multiplying a 10-base factor, it gives enough precision to distiguish volume level 1,2 and 3. Change-Id: Ide82d086ada9ed1c25e0d0a2efb10d6214fd7c00 Signed-off-by: Jay Wang commit e4237ea61890e7d815f4d8ae7c5575f375c5e03c Author: Steve Muckle Date: Wed Jun 16 12:00:10 2010 -0700 defconfig: automatic update Change-Id: Ie555e7fd30991ab8f0f27e129feafa2a96393a7a Signed-off-by: Steve Muckle commit b8c75dc3b43e3436770c5c11d146658927e7b65a Merge: c6cb323 1ff484f Author: Zach Pfeffer Date: Wed Jun 16 11:04:02 2010 -0700 Merge "msm: board-msm8x60: Configure pmic8901 mpp0" into android-msm-2.6.32 commit 1cf15b255de5201a447de8761dd92cdd63b60847 Author: Asish Bhattacharya Date: Wed Jun 16 21:42:16 2010 +0530 msm: audio: qdsp5v2: Add FM driver to route FM to different sink Audio driver is responsible to route FM audio to different audio sink. The driver registers to audio_dev_ctl to get device specific events and once the devices are ready, configures the dsp to route FM data. Change-Id: If51ce83481c13ab3269be4074046bfdc41cc0c99 Signed-off-by: Asish Bhattacharya commit 86d22c56990bd882b4277343a12d9469461f1d6b Author: Amir Samuelov Date: Wed Jun 16 08:28:25 2010 +0300 msm: sdio: SDIO-AL add debug. Add driver version, total bytes transferred and debug by unit test. Change-Id: I7f20d59f17b24ff10f5624c27f85f3db92b804fa Signed-off-by: Amir Samuelov commit 89c6c317bf08b8935d977f03e83bdbc100bf9c5b Author: Amir Samuelov Date: Wed Jun 16 08:01:11 2010 +0300 msm: sdio: SDIO-AL retry to sdio_func_enable() if fail. Retry up to 10 seconds to enable the sdio-func on the sdio card. Change-Id: I2b1bad1f601846a048b20d0dabd530f60ef5daa4 Signed-off-by: Amir Samuelov commit b277c0ab6517daba0c6668481134b49c7eb56b49 Author: Amir Samuelov Date: Wed Jun 16 06:53:49 2010 +0300 msm: sdio: SDIO-AL sdio_close keep the physical layer enabled. sdio_close() doesn't disable the sdio channel, it just logically suspend it. Change-Id: I3c6b7995465bee9f1555ecf7d27541b096c02a06 Signed-off-by: Amir Samuelov commit dd6eec3e4ded9461eaa5cb1f6fb8e7dcd56adfa1 Author: Murali Nalajala Date: Wed Mar 10 14:00:25 2010 +0530 msm: ONFI probe fix for MT29F4G08ABC device. Nand device on ST 1.x hardware is 8 bit ONFi device but it is advertising itself as a 16 bit device via ONFi parameter page. This device is identified as the one from the initial ONFi devices supplied by the vendor and is known to be deviating from the ONFi Specification. However since these devices already got into ST1.x boards we need to have this hack to enable our software to work with such devices. Change-Id: Ie12955e218ac2e0e3ea617567edadeebacbf8446 Signed-off-by: Murali Nalajala commit c6cb323d6c74264de03e0b9e084d5827f03b94a2 Merge: 21090db deee62a Author: Trilok Soni Date: Wed Jun 16 03:44:51 2010 -0700 Merge "regulator: pmic8901-regulator: Add init function" into android-msm-2.6.32 commit 21090dba7fb9a2a24534227ab6c5dd97cfb2a1b4 Merge: 5f17d4e e5fb8a2 Author: Trilok Soni Date: Wed Jun 16 03:44:39 2010 -0700 Merge "msm: board-msm8x60: Add board support for pmic8901-mpp driver" into android-msm-2.6.32 commit 5f17d4ed00a2533dd284ffac51c2bf2c1023bbc5 Merge: 90ecc7e 9f8dd1c Author: Trilok Soni Date: Wed Jun 16 03:44:22 2010 -0700 Merge "gpio: pmic8901-mpp: Add support for gpio_set_value" into android-msm-2.6.32 commit 90ecc7e433ad508715e4ccb720abcc8f8175dca0 Merge: d95e6f7 e9bf056 Author: Trilok Soni Date: Wed Jun 16 03:44:11 2010 -0700 Merge "msm: 8x50: Add spi clock name to board file" into android-msm-2.6.32 commit d95e6f7047a88dbb8bacce77090cb9c54f676403 Merge: 7769e23 f296030 Author: Trilok Soni Date: Wed Jun 16 03:43:59 2010 -0700 Merge "msm: Add framebuffer read and write support in rotator driver" into android-msm-2.6.32 commit 7769e23318ccb4b83fe09b0acc61a4dfcb6e4f92 Merge: 281e3ce 6c8e201 Author: Trilok Soni Date: Wed Jun 16 03:43:43 2010 -0700 Merge "rtc: rtc-pm8058: Add support for PM8058 based RTC" into android-msm-2.6.32 commit e9bf0562e9fcb60c1d5c2fb5f8e9b1da362493bb Author: Lena Salman Date: Sun Jun 6 12:14:02 2010 +0300 msm: 8x50: Add spi clock name to board file Support of both QUP and QSD cores in the spi_qsd driver requires the board file to implicitly name the clock names in use. Change-Id: I63eb979f7f4aab0e97c306b96a18af829d02ad2e Signed-off-by: Lena Salman commit 281e3ce80086d609bd05f49f835772d235a27baf Merge: 43dab87 4f5c02a Author: Trilok Soni Date: Tue Jun 15 22:47:33 2010 -0700 Merge "msm: internal_power_rail: Add functions stubs for 8x60" into android-msm-2.6.32 commit 43dab87b66722dbfb0e6494b53d28f8d516916f5 Merge: dec3994 972be04 Author: Trilok Soni Date: Tue Jun 15 22:47:18 2010 -0700 Merge "camera: Disable parallel sensors for 8x60." into android-msm-2.6.32 commit dec3994318f078eb8aa4210d8ca3012936e9d016 Merge: 2a6ce0c 114f782 Author: Trilok Soni Date: Tue Jun 15 22:47:03 2010 -0700 Merge "msm: sdio: SDIO-AL change the default channels parameters." into android-msm-2.6.32 commit 2a6ce0c52cdfb4d3f4bc1480fcd9a1cf1d064ca4 Merge: 671a94e dfcb2cb Author: Trilok Soni Date: Tue Jun 15 22:46:45 2010 -0700 Merge "msm: rpc_pmapp: add smps mode vote api" into android-msm-2.6.32 commit 671a94e4dfb53fa431790116a9a726cd4fb99999 Merge: 0c12c11 d49dfc0 Author: Zach Pfeffer Date: Tue Jun 15 20:15:44 2010 -0700 Merge "msm: sdio: SDIO-AL remove sdio host claim/release in IRQ-Handler." into android-msm-2.6.32 commit 0c12c11b4b68a619208115b2d318107e75543cb8 Merge: 0692297 738e7c9 Author: Zach Pfeffer Date: Tue Jun 15 20:15:07 2010 -0700 Merge "video: gemini: Remove PM_QOS request when offlining" into android-msm-2.6.32 commit 06922975824a586bd1516ae654f4018ac4da1765 Merge: 98f173c e53b6ed Author: Zach Pfeffer Date: Tue Jun 15 20:14:29 2010 -0700 Merge "arm: mm: Virtual Contiguous Memory layer." into android-msm-2.6.32 commit 98f173c6528a84a956a56a9b8dc5a229db80c728 Merge: bb38d48 91647d8 Author: Zach Pfeffer Date: Tue Jun 15 20:13:49 2010 -0700 Merge "msm: System MMU driver" into android-msm-2.6.32 commit 1ff484f98f70f0cb53df10f8f5bcffd285b8c38b Author: Bobby Crabtree Date: Tue Jun 15 16:27:11 2010 -0700 msm: board-msm8x60: Configure pmic8901 mpp0 MPP0 needs to be configured for the pmic8901 USB-OTG and HDMI-MVS regulators to work. On SURF the MPP should have the value 0, and on FFA the MPP should have the value 1. Change-Id: I4b63c180b90afd4eb41871251f3921e0c865b72a Signed-off-by: Bobby Crabtree commit 4f5c02a2d5b7bb846994293a09d846e8cc83162c Author: Matt Wagantall Date: Tue Jun 15 19:08:47 2010 -0700 msm: internal_power_rail: Add functions stubs for 8x60 8x60 internal power rail (ex. multimedia power rail) control is not yet supported. Add placeholder stubs so that the APIs can be used in 8x60 device drivers without linking problems. These APIs currently do nothing for 8x60 but, since the rails are on by default, the cores they control will still be powered. Change-Id: Idedd44745145838e260103cc87f95e90d1e48725 Signed-off-by: Matt Wagantall commit deee62a9db635334f3f8ed9cc4ba2bd7d40f754b Author: Bobby Crabtree Date: Tue Jun 15 15:12:14 2010 -0700 regulator: pmic8901-regulator: Add init function Some regulators require platform specific initialization. The init function will be called by the regulator core as each regulator is registered. Change-Id: I1a835221f61420c029736b89348dd9f5b3282e76 Signed-off-by: Bobby Crabtree commit e5fb8a225676ba9ef9113f16266ad9c62384fba6 Author: Bobby Crabtree Date: Tue Jun 15 15:05:01 2010 -0700 msm: board-msm8x60: Add board support for pmic8901-mpp driver Change-Id: I3a9d6e93fb515444df2f605ca0d8ebcd0a5987c6 Signed-off-by: Bobby Crabtree commit dfcb2cb4cd44eadac846900f86fd3ee99b7b6ff7 Author: Bobby Crabtree Date: Tue May 25 14:21:55 2010 -0700 msm: rpc_pmapp: add smps mode vote api SMPS regulators have the ability to operate in PWM and PFM modes. This patch allows clients to vote on SMPS modes for power savings. Change-Id: I900a84a1716de360adf19576f79b727579dd6106 Signed-off-by: Bobby Crabtree commit 738e7c98550bd282b2db5772dc3ea606e6758701 Author: Sunid Wilson Date: Wed Jun 9 11:37:09 2010 -0700 video: gemini: Remove PM_QOS request when offlining Remove the PM_QOS request. The PM_QOS request is crashing during gemini offline testing. A bus freq set by the camera driver is sufficient to run gemini. The PMQOS request will be added once the crash issue is rectified. Change-Id: I3df00b8c87111e6d6880feadbb98548ff468fb83 Signed-off-by: Sunid Wilson commit 972be04177fe2371f7b1a33e49d9de5dea4dff6b Author: Ninad Patgaonkar Date: Tue Jun 15 16:37:30 2010 -0700 camera: Disable parallel sensors for 8x60. 8x60 only supports MIPI sensors, therefore disabled parallel sensors enablement by default for 8x60 target. Change-Id: I80e728f8109e89cba7d7335b460f635870d1cd8b Signed-off-by: Ninad Patgaonkar commit bb38d48018e246afbb7bed0c8716f56b9db48904 Merge: 6030812 0d20ca8 Author: Zach Pfeffer Date: Tue Jun 15 16:34:41 2010 -0700 Merge "msm: defconfig: Increase vmalloc range for ST 1.5" into android-msm-2.6.32 commit 603081230833157efbd50c392ea7e1246acdc356 Merge: 45d21da 5ca110a Author: Zach Pfeffer Date: Tue Jun 15 16:34:04 2010 -0700 Merge "apanic: make APANIC_LABEL depend on APANIC" into android-msm-2.6.32 commit 45d21daf57b2e5e8fe2035b7a9b5e4efde3132fe Merge: da39718 dbd40b3 Author: Zach Pfeffer Date: Tue Jun 15 16:33:35 2010 -0700 Merge "msm_adc: Check for additional error cases" into android-msm-2.6.32 commit da39718499e46a7ba3441106004fccc1ba7bd746 Merge: ba3b2a9 e288129 Author: Zach Pfeffer Date: Tue Jun 15 16:32:58 2010 -0700 Merge "binder: Fix memory corruption via page aliasing" into android-msm-2.6.32 commit 91647d8e33bf5e18820a767f0280e47dfce99a27 Author: Stepan Moskovchenko Date: Thu May 27 13:44:05 2010 -0700 msm: System MMU driver A driver for the System MMU found on the 8x60 family of Qualcomm MSMs. These MMUs allow virtualization of the device memory space. The driver is best used by VCM. Change-Id: I146e5b92822d98a1da9c7cdf80046a3b3c9311e7 Signed-off-by: Stepan Moskovchenko commit ba3b2a92db3e18651eaaef84d5608bcf4b70af1f Author: Michael Bohan Date: Tue May 25 14:08:07 2010 -0700 msm: 7x30: Add platform device for msm_adc driver Specify the three LTC adc devices available on msm7x30 Fluid in the platform data. Change-Id: I1715ca20ee5e409d282058072e987cc1b3327a7b Signed-off-by: Michael Bohan commit 9f8dd1c06acf813782bfd1323317a20beeca56a5 Author: Bobby Crabtree Date: Tue Jun 15 14:41:19 2010 -0700 gpio: pmic8901-mpp: Add support for gpio_set_value Implement the gpiolib .set API. The pmic901-mpp driver must support gpio_set_value so that pmic8901 HDMI and USB-OTG regulators can be enabled/disabled. Change-Id: Id201a026724cc339899c9a1a0de8978e57668057 Signed-off-by: Bobby Crabtree commit 114f782d6693dd2e61be0c008b28518678b93dbd Author: Amir Samuelov Date: Wed Jun 16 00:37:57 2010 +0300 msm: sdio: SDIO-AL change the default channels parameters. Change the default configuration for the channels. Change-Id: I5b6b25b8314538621011a33f0ede7df1162d8b47 Signed-off-by: Amir Samuelov commit 34358eb6cbdbd8c536d8014deaeec628e3e0242e Merge: 74f403e f19b9b4 Author: Zach Pfeffer Date: Tue Jun 15 14:09:15 2010 -0700 Merge "gpio: msm7200a-gpio: Add PM support." into android-msm-2.6.32 commit 74f403e725369d4f44871ac4488a207d60fb00b4 Merge: d677c95 3e55447 Author: Zach Pfeffer Date: Tue Jun 15 14:08:22 2010 -0700 Merge "msm_fb: Add hdmi cable plug/unplug detection interrupt for 7x30." into android-msm-2.6.32 commit d677c95ece5fbb57714522f21add101f80605116 Merge: 3b20568 4e2da59 Author: Zach Pfeffer Date: Tue Jun 15 14:07:54 2010 -0700 Merge "msm_fb: display: add HDMI mirror support" into android-msm-2.6.32 commit e53b6eddcc90c3dc495940108430c0af433d8be2 Author: Stepan Moskovchenko Date: Thu May 27 13:11:31 2010 -0700 arm: mm: Virtual Contiguous Memory layer. VCM is the memory management framework that is intended to replace PMEM. It allows one to reason about memory mappings in various ways and (with the help of the SMMU drivers) gives the ability to create advanced memory topologies. Change-Id: Iac935722d5c98df82c6fcf557b5672e8a69f8699 Signed-off-by: Stepan Moskovchenko commit e288129cc7e9c504094e24e832313934fbc2debf Author: Christopher Lais Date: Sat May 1 15:51:48 2010 -0500 binder: Fix memory corruption via page aliasing binder_deferred_release was not unmapping the page from the buffer before freeing it, causing memory corruption. This only happened when page(s) had not been freed by binder_update_page_range, which properly unmaps the pages. This only happens on architectures with VIPT aliasing. To reproduce, create a program which opens, mmaps, munmaps, then closes the binder very quickly. This should leave a page allocated when the binder is released. When binder_deferrred_release is called on the close, the page will remain mapped to the address in the linear proc->buffer. Later, we may map the same physical page to a different virtual address that has different coloring, and this may cause aliasing to occur. PAGE_POISONING will greatly increase your chances of noticing any problems. Change-Id: I6941bf212881b8bf846bdfda43d3609c7ae4892e Signed-off-by: Christopher Lais Signed-off-by: Michael Bohan commit f29603084ab9ae536eccdf741533e39fe6cae746 Author: Omprakash Dhyade Date: Tue Jun 15 11:56:03 2010 -0700 msm: Add framebuffer read and write support in rotator driver Rotator driver can only read or write to PMEM. To read or write to framebuffer, we change MDP driver to provide framebuffer physical address information. This change is required so that we avoid copy of framebuffer in PMEM for rotation. The rotated buffer is then used to push on overlay engine. Change-Id: I17322fa77bb05f36f70ac0c225299614dd607fe9 Signed-off-by: Omprakash Dhyade commit 3b2056866bc7787cfc75297ed859c750251923ed Merge: da35f9a 6cd6236 Author: Zach Pfeffer Date: Tue Jun 15 12:55:00 2010 -0700 Merge "defconfig: msm8660: Enable PM8058 vibrator" into android-msm-2.6.32 commit 3e55447dd2237db303a118d7a7de1b0daa3bcdde Author: Abhishek Kharbanda Date: Mon Jun 14 16:49:29 2010 -0700 msm_fb: Add hdmi cable plug/unplug detection interrupt for 7x30. Enable ADV7520 interrupt line,connected to MSM GPIO 18, and pass it as platform data for hdmi plug/unplug event detection . Change-Id: I85bdc0dc59bb8467b3173154e104bec5e60fd720 Signed-off-by: Abhishek Kharbanda commit f19b9b439a3e83197c804201f16d2c366bb62805 Author: Gregory Bean Date: Mon May 31 10:01:54 2010 -0700 gpio: msm7200a-gpio: Add PM support. Change-Id: I704b45bf3c72be7905b6fc4b7b552981155cd7e3 Signed-off-by: Gregory Bean commit 0d20ca874a7c977ee44933ca98844df18096cf4a Author: Naveen Ramaraj Date: Tue Jun 15 12:07:38 2010 -0700 msm: defconfig: Increase vmalloc range for ST 1.5 Increase the available address range for ioremaps by increasing the VMALLOC_RANGE to 192M. Change-Id: Ia7fccf834734ba8b56996b1d9a24ba13202e4c2f Signed-off-by: Naveen Ramaraj commit 4e2da5926dc4b904dcfa930219c4bc1a1e2f6233 Author: kuogee hsieh Date: Mon May 17 15:57:43 2010 -0700 msm_fb: display: add HDMI mirror support Allow VG pipe can be shared by both RGB and YUV format (video). YUV format (video) have higher priority than RGB format during overlay play so that RGB format can be preemepted by YUV format during VG pipe sharing. Change-Id: Ie9bf1beb28095e157f5be4a573fc541780a54e09 Signed-off-by: Kuogee Hsieh commit d49dfc0372efbb6f0dbb89fb70a8b2e45e9f3f57 Author: Amir Samuelov Date: Tue Jun 15 21:14:38 2010 +0300 msm: sdio: SDIO-AL remove sdio host claim/release in IRQ-Handler. Read the mailbox from the IRQ-handler rather than from the worker. The SDIO-AL IRQ-Handler is called from Thread context and not ISR context. The IRQ-Thread has already claimed the host, so reading the mailbox from the IRQ-handler should not attempt to claim the host. This prevents a deadlock in the IRQ-Handler. Change-Id: I20a866ba0b2e65c1ffacf5c91e8e43297c2b33e1 Signed-off-by: Amir Samuelov commit da35f9ac1a33b0bb0cd4c72d40b77c8cfc00e220 Merge: 64bbb76 c69c04c Author: Zach Pfeffer Date: Tue Jun 15 10:57:00 2010 -0700 Merge "msm: board-msm8x60: Add board info. for PM8058 based RTC" into android-msm-2.6.32 commit 6cd62363259aad14ec48d4fbb95c3c36e2f42f5c Author: Anirudh Ghayal Date: Tue Jun 15 21:09:35 2010 +0530 defconfig: msm8660: Enable PM8058 vibrator Change-Id: I67f52dda6043234138b92e00fa7825a66f06b8ba Signed-off-by: Anirudh Ghayal commit dbd40b3ccfe0d7f96b8c265a3149a595c496e73c Author: Michael Bohan Date: Wed Jun 9 19:05:02 2010 -0700 msm_adc: Check for additional error cases It's possible for the DAL framework to return success, yet the ADC driver itself to report an error in the result structure. Change-Id: I476fa0cae5f5b08c1f20aff5c7bebe8b204b4b75 Signed-off-by: Michael Bohan commit 64bbb762700a79ed76b30f115bccc3c5eef539f5 Merge: 26ec47b 9a2b0b0 Author: Murali Palnati Date: Tue Jun 15 09:37:12 2010 -0700 Merge "mmc: msm_sdcc: Check for only DATA_END interrupt to end a request" into android-msm-2.6.32 commit 26ec47b1045b603b1a7f6facdc3cc200aab8e751 Merge: f79b4be c9d176a Author: Trilok Soni Date: Tue Jun 15 09:06:14 2010 -0700 Merge "camera: Support for dual camera sensor clock enmumerations for 8x60." into android-msm-2.6.32 commit f79b4be967b855882fc698a76d79b13b918e024d Merge: 762c30e e1a71a9 Author: Trilok Soni Date: Tue Jun 15 09:05:43 2010 -0700 Merge "camera: SOF acknowledgement to VFE." into android-msm-2.6.32 commit 762c30ed44eda96373dae7193c0267a39ec0318b Merge: a49c61f 0c9b850 Author: Trilok Soni Date: Tue Jun 15 09:05:15 2010 -0700 Merge "msm: 7201: Set the clock frequency and buswidth for SD Slots." into android-msm-2.6.32 commit a49c61fdecc5a1ea6eca36300e3e2e38b43d350c Merge: 3c8dac5 3f5355b Author: Trilok Soni Date: Tue Jun 15 09:04:45 2010 -0700 Merge "gpio: pmic8901-mpp: Move gpio-get fn to mpp driver" into android-msm-2.6.32 commit 3c8dac59effa835e03a2e3f46449ad6890b4d5bf Merge: 26bcd08 192b9a8 Author: Trilok Soni Date: Tue Jun 15 09:04:17 2010 -0700 Merge "USB: gadget: f_mass_storage: Flush writes after every 4 MB." into android-msm-2.6.32 commit 26bcd081b0aadb9096ca108804c093a46f53b9fc Merge: 822e82e 01a20e8 Author: Trilok Soni Date: Tue Jun 15 09:01:19 2010 -0700 Merge "defconfig: msm8660: Enable 8-bit MMC and Interrupt based card detection." into android-msm-2.6.32 commit 822e82e15ce825c8dd9933c3379427b32d865723 Merge: 7bd0634 7ed56f3 Author: Trilok Soni Date: Tue Jun 15 09:01:01 2010 -0700 Merge "spi_qsd: Minor changes to support Data Mover mode on QUPe core" into android-msm-2.6.32 commit 7bd063401a51cbb118d2197f8da704a17f104251 Merge: c96eb1b a60a145 Author: Trilok Soni Date: Tue Jun 15 08:59:47 2010 -0700 Merge "msm: 8x60: Add Data Mover configuration for spi_qsd" into android-msm-2.6.32 commit c96eb1bbbc4b0a46617303eab3d01658f1793af7 Merge: 3e2163c 609c6af Author: Trilok Soni Date: Tue Jun 15 08:58:06 2010 -0700 Merge "msm: rmnet: Fix bugs in sdio rmnet transport" into android-msm-2.6.32 commit c69c04c85c31dcd51321c018a883cc9458e33469 Author: Anirudh Ghayal Date: Mon Jun 14 23:54:02 2010 +0530 msm: board-msm8x60: Add board info. for PM8058 based RTC Change-Id: Ieeb6a4c5b473f902cfd023e24e8d2077c1ea3f21 Signed-off-by: Anirudh Ghayal commit 3e2163c1ada7947015d37b567b50777f23b619a1 Merge: 8efa7ba b4ccf51 Author: Trilok Soni Date: Tue Jun 15 08:55:53 2010 -0700 Merge "msm: 7x30: Add spi clock name to board file" into android-msm-2.6.32 commit 8efa7ba31f18a98e07fa294d567435df0396f66d Merge: c8289a3 9433c6e Author: Trilok Soni Date: Tue Jun 15 08:55:18 2010 -0700 Merge "msm: rpc: RPC over SDIO performance improvement" into android-msm-2.6.32 commit 9a2b0b06291a7771bbdc8511c801baf16d8fd6aa Author: Sahitya Tummala Date: Mon Jun 14 12:19:26 2010 +0530 mmc: msm_sdcc: Check for only DATA_END interrupt to end a request The current code checks for both DATA_END and DATA_BLK_END bits in MCI_STATUS register and ends a request only if both are set at a time. The hardware doesn't always set DATA_BLK_END when DATA_END is set. But DATA_END status itself is sufficient condition from hardware that data transfer is done and hence, check for only DATA_END interrupt in software to end a request. Change-Id: I27bca7c06135854af9b18912fbd36349d4f74e00 Signed-off-by: Sahitya Tummala commit 01a20e88ae61766b327511f3fc26b0ba5022d64b Author: Aparna Mallavarapu Date: Mon Jun 14 16:01:18 2010 +0530 defconfig: msm8660: Enable 8-bit MMC and Interrupt based card detection. Change-Id: I0ff2c2a86c6c9068f736d015cf3f9e1c11fb2382 Signed-off-by: Aparna Mallavarapu commit c8289a3c9fca4b57897bb0e5f84e95f654203a5f Author: Rajesha Kini Date: Thu Jun 3 20:44:28 2010 +0530 msm: audio: 7x30: Add a2dp dummy devices Add 1. A2dp rx device 2. A2dp tx device These devices are dummy devices to help routing decoder/encoder to a2dp. Change-Id: Iaeb0c18cf2fefed3b3f9a8f59e030b100cb00f75 Signed-off-by: Asish Bhattacharya Signed-off-by: Rajesha Kini commit 70e5dbab3436898b9ddbfea906b7a57f010c66c0 Author: Asish Bhattacharya Date: Wed Apr 7 15:56:18 2010 +0530 msm: audio: 7x30: Add platform driver for virtual snd devices The driver provides support for virtual devices. These devices are virtual devices to help routing decoder/encoder. The driver registers with audio_dev_ctrl framework and hence gets allocated a device number. This device number is used to do all routing to the virtual device. Change-Id: Iacd5cf63c36fcffca83c8413cb804b0d08497394 Signed-off-by: Asish Bhattacharya Signed-off-by: Rajesha Kini commit b4ccf51785193c2be7d18be78950f91886d7b5aa Author: Lena Salman Date: Sun Jun 6 12:13:13 2010 +0300 msm: 7x30: Add spi clock name to board file Support of both QUP and QSD cores in the spi_qsd driver requires the board file to implicitly name the clock names in use. Change-Id: I62f001314011283ae4b4401187af77ac7b2f7363 Signed-off-by: Lena Salman commit 6c8e201a4e3dad5f2faa501e4701e0ecb84cc000 Author: Anirudh Ghayal Date: Mon Jun 14 22:41:20 2010 +0530 rtc: rtc-pm8058: Add support for PM8058 based RTC The Real Time Clock (RTC) is a 1 Hz clock present inside PMIC8058. The RTC hardware supports alarms, which can be used to wake up the system from a state of deep sleep. The driver currently supports read time and set alarm functionality. Change-Id: I356643eed8f2241edd40318d0f5ee3c033f2413d Signed-off-by: Anirudh Ghayal commit 0c9b850ecc7310b9bd67e64be40801bb3b3a254b Author: Aparna Mallavarapu Date: Tue Jun 15 11:20:30 2010 +0530 msm: 7201: Set the clock frequency and buswidth for SD Slots. Change-Id: I6d65fcb1805c81d3f3b72b6fc9d4c2197bf2b11e Signed-off-by: Aparna Mallavarapu commit ed25a99117977d7338420c282adce874335b382b Merge: 67899d0 f75d95e Author: Zach Pfeffer Date: Mon Jun 14 21:58:20 2010 -0700 Merge "msm: sdio: SDIO-AL Fix swapped fields in SDIOC-SW-mailbox." into android-msm-2.6.32 commit 67899d02e2a0c919d3570341a651cfcc46ebc132 Merge: e6314e3 5eef0fe Author: Zach Pfeffer Date: Mon Jun 14 21:57:52 2010 -0700 Merge "msm_fb: display: enable software vsync to prevent display from tearing" into android-msm-2.6.32 commit e6314e3ba9cdb6349913d742f30949aa471943cd Merge: d3543e1 e823f68 Author: Zach Pfeffer Date: Mon Jun 14 21:56:32 2010 -0700 Merge "msm: socinfo: Hardcode CPU type for 8x60" into android-msm-2.6.32 commit d3543e132d3b2920458c63c692b766c77c78bdad Merge: fa49a34 67a9e09 Author: Zach Pfeffer Date: Mon Jun 14 21:56:03 2010 -0700 Merge "leds: leds-pmic8058: Re-arrange low current leds code" into android-msm-2.6.32 commit fa49a3471f0fd8d507c1f46a9388433e1f3d38f1 Merge: afc5f48 1729b87 Author: Zach Pfeffer Date: Mon Jun 14 21:55:06 2010 -0700 Merge "msm: 8x50: Add device configuration for msm7200a-gpio." into android-msm-2.6.32 commit afc5f48721eeff8ea90c1907006dfb946c768ca3 Merge: aa53673 e9f44e9 Author: Zach Pfeffer Date: Mon Jun 14 21:54:27 2010 -0700 Merge "mfd: pm8058: Add IRQ entries for RTC" into android-msm-2.6.32 commit aa53673965a295a811e8058d628dfc31e9fa8c06 Merge: 0c6c8639 1ab6f09 Author: Zach Pfeffer Date: Mon Jun 14 21:54:00 2010 -0700 Merge "msm: 7x30: Add device configuration for msm7200a-gpio." into android-msm-2.6.32 commit 0c6c8639386afc4f261321740e92cac4b6828eb3 Merge: 455fc4e 478b076 Author: Murali Palnati Date: Mon Jun 14 21:08:38 2010 -0700 Merge "mmc: msm_sdcc: Cleanup of the resume function." into android-msm-2.6.32 commit 455fc4ead81d0087fb54efec5bd3415436c4e587 Merge: 2641e8f b219c3c Author: Bryan Huntsman Date: Mon Jun 14 19:46:26 2010 -0700 Merge "msm: audio: qdsp5v2: Post device release pending event" into android-msm-2.6.32 commit 2641e8f8291c443da80434730847f210aef07ffa Merge: 07a9a01 4c018c7 Author: Bryan Huntsman Date: Mon Jun 14 19:45:41 2010 -0700 Merge "msm_fb: display: fix MDDI NULL function pointer bug" into android-msm-2.6.32 commit 07a9a01144c23bbfaf2a900e9e790fd173eb03dd Merge: fcb6e21 840e9da Author: Bryan Huntsman Date: Mon Jun 14 19:43:20 2010 -0700 Merge "msm: 8x60: Add spi clock name to board file" into android-msm-2.6.32 commit fcb6e21715dccb212e9f7afc7de80d772de211b5 Merge: 2a6b85c 1d5c7d9 Author: Bryan Huntsman Date: Mon Jun 14 19:42:58 2010 -0700 Merge "qsd8k: audio: Change buffer size for AAC encoding driver" into android-msm-2.6.32 commit c9d176aeafb7cfbb2da69386488f001843b6def3 Author: Ninad Patgaonkar Date: Mon Jun 14 14:59:22 2010 -0700 camera: Support for dual camera sensor clock enmumerations for 8x60. Added clock enumeration support for dual camera sensors for 8x60. Updated 7x30 to compile with the new clock enumerations. Change-Id: I49508166c2b53ebdec74afe0af61139b05481b71 Signed-off-by: Ninad Patgaonkar commit 5eef0fe4e1eb1150166233425f42b05d307962b4 Author: Kuogee Hsieh khsieh Date: Fri Apr 9 16:05:28 2010 -0700 msm_fb: display: enable software vsync to prevent display from tearing Enable software vsync and adjust frequence of MDDI display panel to prevent tearing from happening. Also add vsync can be enabled/disabled from mdp4 debugfs. CRs-fixed: 221821, 227518, 241791 Change-Id: I482980ce1d12b083745e74aad1248a66b33d4cb8 Signed-off-by: kuogee hsieh commit e1a71a936cdd89c12d323ca53f7a404199ad9e67 Author: Abhiruchi Birajdar Date: Mon Jun 14 14:56:27 2010 -0700 camera: SOF acknowledgement to VFE. This change acknowledges the start of frame(SOF) interrupt to the user space. Change-Id: I65d2bb52d705305d88cf85a7b039d04a6c02285b Signed-off-by: Abhiruchi Birajdar commit 2a6b85c7f116335fbeae7db1a4852d43ddb9334c Author: Steve Muckle Date: Mon Jun 14 14:21:39 2010 -0700 defconfig: automatic update Change-Id: Iaca15c2a55daee2568d10892b847e632338f0d29 Signed-off-by: Steve Muckle commit 1729b87961af14728dd3875a8ab3dc90392ad47d Author: Gregory Bean Date: Fri May 28 17:04:47 2010 -0700 msm: 8x50: Add device configuration for msm7200a-gpio. Change-Id: I71e44e527cf94922d3b5db720b85b785c0690a37 Signed-off-by: Gregory Bean commit 1ab6f0910102c84e8fe85ed881ee220cc0d0a023 Author: Gregory Bean Date: Wed May 26 12:18:45 2010 -0700 msm: 7x30: Add device configuration for msm7200a-gpio. Change-Id: I6a55e7da35ecf6726943e7dd73d5b12e32aac8f9 Signed-off-by: Gregory Bean commit 5ca110ad291560c9296a36db9c9efba641c553ea Author: Iliyan Malchev Date: Wed Mar 17 12:02:26 2010 -0700 apanic: make APANIC_LABEL depend on APANIC Change-Id: I0b69ac999260aaf6c18d1e92d235d2e4fb2839e3 Signed-off-by: Iliyan Malchev commit 3f5355b2d25920acf0f803c76d127bdb7b00db65 Author: Bobby Crabtree Date: Mon Jun 14 12:22:09 2010 -0700 gpio: pmic8901-mpp: Move gpio-get fn to mpp driver Clean up pmic8901-core driver by moving the pm8901_mpp_get function to the pmic8901-mpp driver. Also add function pm8901_irq_get_rt_status to the pmic8901-core as a helper function to pm8901_mpp_get. Change-Id: I56f093cc20be8bcd2d6532af5bd3c6240cbab67e Signed-off-by: Bobby Crabtree commit f75d95e050a5796947930c7ef2411ace3efd1c46 Author: Amir Samuelov Date: Mon Jun 14 22:30:56 2010 +0300 msm: sdio: SDIO-AL Fix swapped fields in SDIOC-SW-mailbox. The SDIO-Host read channel parameter from the SDIO-Card, from an area used as a software mailbox. However, the host and the card had mismatch of swapped fields. Change-Id: I6b9b2f641e0904aa8896300d6a25fcc887a0f296 Signed-off-by: Amir Samuelov commit 28009539cae785f5c9daa68f0322dc214965250e Merge: 5317aaa 3063229 Author: Trilok Soni Date: Mon Jun 14 12:08:01 2010 -0700 Merge "msm: smd: Add SMSM_INIT event in modem notifier." into android-msm-2.6.32 commit 5317aaa55d40688ff707e8c8fd96cbc853d3bc99 Merge: 0362994 1bf11f6 Author: Trilok Soni Date: Mon Jun 14 12:03:53 2010 -0700 Merge "msm: audio: 7x30: Allow to change adie codec frequency" into android-msm-2.6.32 commit b1703457d0b166d30fbea0ee1147cc8bbcf478e6 Author: Derek Kulinski Date: Wed Jun 2 15:34:26 2010 -0700 msm_fb: proper order of IRQ operations for ST1.5 Ensure interrupt is requested before it's enabled during panel-on processing. Disable the interrupt before adding fb device to avoid panel-on enabling it a second time. Change-Id: I38c16c4d2fd3a2aa1e8ab4589980dd8e753f9ed5 Signed-off-by: Derek Kulinski commit e9f44e9c9f1741e09234484e3917bccf818e65f9 Author: Anirudh Ghayal Date: Fri May 28 13:54:43 2010 -0700 mfd: pm8058: Add IRQ entries for RTC Change-Id: I4ae1783662074ea6c0915d81f8ae2a0bb4c166d2 Signed-off-by: Anirudh Ghayal commit 192b9a8954d9e25ddf6e682d03a0db33810276e5 Author: Mike Lockwood Date: Fri Mar 12 11:01:05 2010 -0500 USB: gadget: f_mass_storage: Flush writes after every 4 MB. This avoids excessive caching at the block level layer when copying large files to the storage device. Change-Id: I7c94fdcc139ea4a6952dc305b631fa0bdaa6d8d9 Signed-off-by: Mike Lockwood commit e823f68360387946458456a6d25060d695e2fe7d Author: Matt Wagantall Date: Mon Jun 14 09:46:02 2010 -0700 msm: socinfo: Hardcode CPU type for 8x60 8x60 doesn't support socinfo yet, so hardcode the CPU type so that calls to all the cpu_is_xxxx() functions don't fail because of the "BUG_ON(cpu == MSM_CPU_UNKNOWN)" in socinfo.h. Change-Id: I6adf9d1fff2fdb052f3d6568688644eda0c7839e Signed-off-by: Matt Wagantall commit 7ed56f3441c5ebe7fd8107fb8468207a88bc743f Author: Lena Salman Date: Wed Jun 9 16:14:44 2010 +0300 spi_qsd: Minor changes to support Data Mover mode on QUPe core Minor changes to support Data Mover made on QUPe core. Change-Id: I54663115a43f7fd9b52a2ddee796b5499d5f239a Signed-off-by: Lena Salman commit a60a145673edcd072bb713e12f1b063b90f4c065 Author: Lena Salman Date: Wed Jun 9 15:52:25 2010 +0300 msm: 8x60: Add Data Mover configuration for spi_qsd Add Data Mover configuration for spi_qsd driver. Change-Id: I7ecf84b0278b746b0963e0f1683e382c8d7a4006 Signed-off-by: Lena Salman commit 840e9da9cb5614cfadcb976ca9cff32d26c9550a Author: Lena Salman Date: Wed Jun 9 16:50:59 2010 +0300 msm: 8x60: Add spi clock name to board file Support of both QUP and QSD cores in the spi_qsd driver requires the board file to implicitly name the clock names in use. Change-Id: Iaea43c3426026872378f35f11006665495cdf760 Signed-off-by: Lena Salman commit 036299482fef19313c7cd2c568cfc8ab224b4675 Merge: e46e81b cf08787 Author: Murali Palnati Date: Sun Jun 13 21:42:25 2010 -0700 Merge "usb: gadget: android: Clear remote wakeup bit for MSC only composition" into android-msm-2.6.32 commit abc9ec82f66c457ba4f1d359ef76c437adbcacd2 Author: Nick Pelly Date: Fri Nov 20 13:31:36 2009 -0800 [ARM] msm: msm_serial_hs: Improve RX flush procedure during clock off sequence. Clock off is requested by msm_hs_request_clock_off. The new procedure is: 1) Immediately deassert RTS to prevent new RX data. 2) Wait for the TX pipeline to flush (TXLEV, TXEMT). 3) Issue a FORCE_STALE_EVENT command, and flush on RXSTALE. 5) After this flush completes, disable DLINK and flush one more time (discarding data). 6) Finally clock off the uart. The key changes are to disable DLINK - which fixes the datamover lockup, and the issuing of the FORCE_STALE_EVENT command - which prevents RX data loss during clock off sequence. CRs-fixed: 240036 Change-Id: I5e89e002deca1151939fd378f1402b0c9dbbc2bf Signed-off-by: Nick Pelly [sankalpb@qualcomm.com: Leave out step 1] Signed-off-by: Sankalp Bose commit e46e81b9c6c0a1aa104a3f4e6d2fb44ff2ee9e9d Author: Lena Salman Date: Thu Jun 10 11:18:06 2010 +0300 msm: 7x30: Remove remote spinlock for fluid platform Sharing SPI core across several processors is not needed anymore according to new requirements. Change-Id: I7792463c5064a0c2c22768afc3e18ea65a69ffd5 Signed-off-by: Lena Salman commit ff3377baf10e9fbdbaeddcc2a9b7862973d0fee4 Merge: b8ae54b 04570dd Author: Trilok Soni Date: Sat Jun 12 11:27:04 2010 -0700 Merge "msm: board-msm8x60: Add board support for regulators" into android-msm-2.6.32 commit b8ae54b66437b03e2c87c6d51d3bf2b4895aadfa Merge: f6fd70f de2a99f Author: Trilok Soni Date: Sat Jun 12 11:26:36 2010 -0700 Merge "msm: clock-8x60: Update driver for latest frequency plan" into android-msm-2.6.32 commit f6fd70f274a4d757d04afa1db110ed49e65d0226 Merge: a342333 e2b3a9f Author: Trilok Soni Date: Sat Jun 12 11:26:07 2010 -0700 Merge "msm: audio: qdsp5v2: add capability for SD line mask to HDMI." into android-msm-2.6.32 commit 478b07632842fc39c6dec52399c3b0cd9848504e Author: Murali Palnati Date: Sat Jun 12 17:38:25 2010 +0530 mmc: msm_sdcc: Cleanup of the resume function. The way the if checks are organised, the test and enable irq code appears twice. Clean up the function, by pulling out the common code from both if and else blocks. Change-Id: Ifb22a277b6c5a5d74049a572e6154da7aeb56ccb Signed-off-by: Murali Palnati commit b219c3c27b09f8f0b53eb5089f6244580a7e23fa Author: Jay Wang Date: Fri Jun 11 12:22:00 2010 -0700 msm: audio: qdsp5v2: Post device release pending event Problem: Low-power audio stream does not resume when application resumes the playback Impact: Broken audio playback Change: To handle device switch or derouting of stream, low-power audio decoder driver relies on device release pending event sent from ALSA mixer control. This event is not sent for the derouting of stream. Update the logic in routing handler function to dispatch device release pending event CRs-Fixed: 242310 Change-Id: I4b18abb1fb8bd26b2dbd9a631a8ffaec283b1f68 Signed-off-by: Jay Wang commit 1d5c7d9be079461b35ad985426717ca33917ea2f Author: Ashraya Arya Date: Tue Jun 8 12:11:01 2010 -0700 qsd8k: audio: Change buffer size for AAC encoding driver New firmware returns variable sized encoded AAC frames, default buffer size changed to accomodate the max possible size returned the DSP. Read returns only one encoded frame at a time. Change-Id: I37238bf00a78ba57287c1c30b93126b3f3024c13 CRs-Fixed: 242023 Signed-off-by: Ashraya Arya commit de2a99f5ca00603338cc24f2c975126cde3fc7ee Author: Matt Wagantall Date: Thu May 27 10:51:31 2010 -0700 msm: clock-8x60: Update driver for latest frequency plan Change-Id: I47257400dd4c9f3980fe00c02ecc921642e352c7 Signed-off-by: Matt Wagantall commit 9433c6e0c2f11ddfb5634ad7f3356a39f11141ca Author: Karthikeyan Ramasubramanian Date: Fri May 28 09:30:24 2010 -0600 msm: rpc: RPC over SDIO performance improvement During write by SDIO XPRT, when available write space becomes less than the data to be written, use Notification mechanism rather than sleep. Change-Id: Ie5e21b5d198e4934cb6f2d1bd1a3c4b06c8d3c90 Signed-off-by: Karthikeyan Ramasubramanian commit 4c018c787d601ad9beadaf8ada3b2dba8c5f8e82 Author: kuogee hsieh Date: Fri Jun 11 11:26:06 2010 -0700 msm_fb: display: fix MDDI NULL function pointer bug Check function pointer before call it during parser received reverse MDDI packets. CRs-fixed: 239194 Change-Id: Ia4d371f4f4d1500b227ee6361dc5b81087e9735c Signed-off-by: Kuogee Hsieh commit a34233392fe7a87352eadff83b0b03d9b6f50f7f Author: Matt Wagantall Date: Mon Jun 7 12:20:33 2010 -0700 msm: clock: Route 7x30 System Bus rate requests to remote 'pbus_clk' On 7x30, ebi1_clk requests are dropped during power collapse, but pbus_clk requests are not. Use pbus_clk to implicitly request ebi1 and AXI rates so that pm_qos System Bus requirements persist across power collapse. AXI votes from acpuclock-7x30.c can continue to use ebi1_clk since these requests are allowed to drop during power collapse. Change-Id: I3f1d8c5e92c88d5a54d2573eef79d7ee550978b9 Signed-off-by: Matt Wagantall commit c029d591b8630da21bbdbb1330eefa73ebf5eec4 Author: Matt Wagantall Date: Fri Jun 11 09:43:00 2010 -0700 msm: Call msm_clock_init() after socinfo_init() Move the call to msm_clock_init() to after socinfo_init() so that the cpu_is_xxxx() functions may safely be used within the clock driver. Change-Id: I28211c1fb7b01801943250d4bf85ec0d93b2efec Signed-off-by: Matt Wagantall commit 04570dd60c999b3076338c668e6a394f033579f5 Author: Bobby Crabtree Date: Wed Jun 9 17:30:36 2010 -0700 msm: board-msm8x60: Add board support for regulators Add pmic8058 and pmic8901 regulator subdevices and platform data for msm8x60 SURF and FFA. Change-Id: I2056cba922c751438a15d14de7b38e708c869bb3 Signed-off-by: Bobby Crabtree commit 28814684f7dddc3cc85fa9772a825dd749cb19f9 Merge: 06e0521 e4f2349 Author: Pavan Kumar Kondeti Date: Fri Jun 11 05:27:35 2010 -0700 Merge changes I0c441cea,I552da2fb into android-msm-2.6.32 * changes: msm: 7x30: Add tma300 device. input: touchscreen: Cypress TMA300 multi-touch controller commit 06e0521c30cdedace873257ea5d14898804260dc Merge: d5b8087 65b08b7 Author: Pavan Kumar Kondeti Date: Fri Jun 11 01:10:47 2010 -0700 Merge "input: pmic8058_keypad: Fix ghost key detection mask" into android-msm-2.6.32 commit d5b8087adc9caaa3da7f368ce213a1ef63a8e487 Merge: e93bc5c 28af57f Author: Pavan Kumar Kondeti Date: Fri Jun 11 01:10:27 2010 -0700 Merge "msm_kgsl: Add idle command only before interrupt generation" into android-msm-2.6.32 commit e93bc5cd493c199208f1eff975357ea85bdf0004 Merge: bd15285 3011e27 Author: Pavan Kumar Kondeti Date: Fri Jun 11 01:10:02 2010 -0700 Merge "regulator: msm: Fix regulator registration bug" into android-msm-2.6.32 commit bd1528583ddd34c8fcb2bb61a58e521d3ebb045f Merge: 46e3d14 ebf0613 Author: Pavan Kumar Kondeti Date: Fri Jun 11 01:09:35 2010 -0700 Merge "msm_kgsl: Only add an entry to memory list if allocation succeeds" into android-msm-2.6.32 commit 46e3d14f50fb6b1ae81dbf2bb097987aac61e2b8 Merge: 2326931 6bae109 Author: Pavan Kumar Kondeti Date: Fri Jun 11 01:09:15 2010 -0700 Merge "defconfig: 7630: Enable msm_adc driver" into android-msm-2.6.32 commit 2326931c7fe8afcffcafbdae63316bb3c8f1bbef Merge: 8bc97e1 5240e47 Author: Pavan Kumar Kondeti Date: Thu Jun 10 23:50:26 2010 -0700 Merge "qup_i2c: Add adapter after GPIOs and interrupts are initialized" into android-msm-2.6.32 commit 8bc97e1758e6774d4aba1ec78f5727d640830545 Merge: a334a6a 14cd28d Author: Pavan Kumar Kondeti Date: Thu Jun 10 23:50:00 2010 -0700 Merge changes Iff66d583,I17b91f7a into android-msm-2.6.32 * changes: regulator: pmic8901: support additional regulator APIs regulator: pmic8058: support additional regulator APIs commit a334a6a672ba935d4235cd6a9c87281a6e7f86d2 Merge: c4cf671 a6adc40 Author: Pavan Kumar Kondeti Date: Thu Jun 10 23:49:29 2010 -0700 Merge "gpio: msm7200a: Add irq support to msm-gpiolib." into android-msm-2.6.32 commit e4f23495d7fcd5856d005c5d86c72d123bf515c2 Author: Mohan Pallaka Date: Mon Jun 7 20:11:34 2010 +0530 msm: 7x30: Add tma300 device. Add platform device for cypress tma300 chip. Include various parameters needed for the driver and enable virtual key support. Change-Id: I0c441cea956f68484c665b635f07b248c5bcaa42 Signed-off-by: Mohan Pallaka commit 0fa88bbdf188bf4a9c25c627f28d0b4f0c7d2afa Author: Mohan Pallaka Date: Mon Jun 7 19:13:56 2010 +0530 input: touchscreen: Cypress TMA300 multi-touch controller TMA300 has Multi touch support and can track up to 10 independent fingers. This is the first version that supports upto 4 fingers. TMA300 is tied to I2C bus and the driver reads its registers and sends the coordinates to userspace. Change-Id: I552da2fb8aa62e9cfc909b2571f0c0f1c6044965 Signed-off-by: Mohan Pallaka commit 6bae109669440232b80156cf5b4e8d0401d8d67d Author: Michael Bohan Date: Tue May 25 14:08:15 2010 -0700 defconfig: 7630: Enable msm_adc driver Change-Id: I0ed868d6df63cb5e6bd2bd1bf9ba101e9204e4c1 Signed-off-by: Michael Bohan commit c4cf67156a9d9232d4096729fcee7fb9fd82bf71 Merge: 25c41e6 d8086a8 Author: Saravana Kannan Date: Thu Jun 10 19:39:25 2010 -0700 Merge "diag: Add NULL port to logging options" into android-msm-2.6.32 commit 25c41e67366aace0b700c777d0602c648d07c4f8 Merge: 3aa23fc a142496 Author: Saravana Kannan Date: Thu Jun 10 19:39:15 2010 -0700 Merge "defconfig: Enable FB early suspend" into android-msm-2.6.32 commit 3aa23fc3abe65ee38d406f7a078cf61e95e5d846 Merge: eefc9ef 7fa48e7 Author: Saravana Kannan Date: Thu Jun 10 19:38:36 2010 -0700 Merge "camera: New Register settings for CUT3 VX6953 sensor." into android-msm-2.6.32 commit eefc9efcbdf972a7d9876b39d7c9a5d4c6ebc807 Merge: 4ad07c2 14abca9 Author: Saravana Kannan Date: Thu Jun 10 19:37:48 2010 -0700 Merge "msm_fb: display: change fb state to FBINFO_STATE_RUNNING" into android-msm-2.6.32 commit 4ad07c209064e7019b37d2b24488caff7ff02eb2 Merge: 7f7b4ea 0463ee0 Author: Saravana Kannan Date: Thu Jun 10 19:37:32 2010 -0700 Merge "msm: rpc: Router to handle DATA events after completing OPEN event" into android-msm-2.6.32 commit 3063229bce723a245ddee2d0e75d355dbcacbe34 Author: Niranjana Vishwanathapura Date: Thu Jun 10 18:57:20 2010 -0600 msm: smd: Add SMSM_INIT event in modem notifier. Add the SMSM_INIT to notifier chain in modem notifier. This provides the asynchronous notification to drivers upon shared memory initializaion from remote side. Change-Id: I4db017557e410b331e6ca4b46dda8297fccc97af Signed-off-by: Niranjana Vishwanathapura commit 7f7b4ead54459cc548350b32d6e61963e2c25afd Merge: cef62cb 890d5cc Author: Saravana Kannan Date: Thu Jun 10 15:16:20 2010 -0700 Merge "msm: socinfo: Compile socinfo for 8x60" into android-msm-2.6.32 commit cef62cb1adfc6b488da0f70414d8083cc73835be Merge: 6e303cc 9460942 Author: Saravana Kannan Date: Thu Jun 10 13:39:16 2010 -0700 Merge "input: touchscreen: Initial TMA300 driver from cypress." into android-msm-2.6.32 commit 6e303cc188d0c8938b25ccde1a681e758e195b28 Merge: c8a2d9c ed6774d Author: Saravana Kannan Date: Thu Jun 10 12:54:18 2010 -0700 Merge "msm: 8x60: Add board definitions and devices for the kgsl driver" into android-msm-2.6.32 commit 890d5cc11d95e88d287b97ee3d0f43f73666856d Author: Matt Wagantall Date: Wed Jun 9 19:43:00 2010 -0700 msm: socinfo: Compile socinfo for 8x60 Compiling socinfo allows the socinfo.h header file to be included by files used in 8x60 builds, even though socinfo is not yet supported on that SoC. This allows use of the cpu_is_xxxx() functions in files which are shared between 8x60 and other SoCs. Change-Id: I9bd9dc67210d1fc4272492fa8ec7779e06a207de Signed-off-by: Matt Wagantall commit 9460942bbaf6722a619f010e873b2bb79d3973c5 Author: Mohan Pallaka Date: Tue Feb 2 15:04:02 2010 +0530 input: touchscreen: Initial TMA300 driver from cypress. Change-Id: I4e58bd33e2568194de5feaa2bf0c1ba78778e4a8 Signed-off-by: Mohan Pallaka commit cf0878721656b783aef1c4d402e93ca165ee3383 Author: Chiranjeevi Velempati Date: Tue Jun 8 16:44:38 2010 +0530 usb: gadget: android: Clear remote wakeup bit for MSC only composition Enabling remote wakeup capability in mass storage only composition doesn't make sense, because mass storage function doesn't support any notification events in bus-suspend. Also, due to enabling remote wakeup feature in mass storage only composition, causing compliance test (Resuming in S1 and S3 Suspend) failure with WindowsXP, this is because, WindowsXP is not supporting remote wakeup in mass storage only composition. Hence, mark device as non-wakeup and clear remote wakeup bit in bmAttributes field in configuration descriptor. Change-Id: I31c2d520f4b6ba25bc10441086883dc4cd53e813 Signed-off-by: Chiranjeevi Velempati commit 67a9e09d09c6e0cda76f33fbc7a5f4a9aee40526 Author: Trilok Soni Date: Wed Jun 9 16:12:47 2010 +0530 leds: leds-pmic8058: Re-arrange low current leds code Introduce led_lc_set/get functions and move the code into them. Change-Id: I1f696115568c97fa44ce8478c6d4253111c2a78b Signed-off-by: Trilok Soni commit c8a2d9c149935fef3cf2bfec438f9f0f5fa004c2 Author: Trilok Soni Date: Mon Jun 7 17:29:29 2010 +0530 msm: board-msm7x30: Remove remote leds support Remove support for remote leds for 7x30 because now we have native driver to support PMIC8058 leds. Change-Id: I15ead21f780c10e98f6bc7b410a86a8ea2f5f2a7 Signed-off-by: Trilok Soni commit 65b08b774bbce32414dbd4e2f641d8034e0fdbe8 Author: Trilok Soni Date: Thu Jun 10 15:41:01 2010 +0530 input: pmic8058_keypad: Fix ghost key detection mask Make ghost key detection mask generic and not limited to eight columns only. Change-Id: Icf9583289149574e3d739bc98a4fbfc7833ad35c Signed-off-by: Trilok Soni commit 70aeee3bd757f1a1dacefd5ecd8d26a0981bd90b Merge: 7c67c69 32c5fe5 Author: Pavan Kumar Kondeti Date: Thu Jun 10 02:54:58 2010 -0700 Merge "gpio: msm7200a: Add gpiolib support for MSM chips." into android-msm-2.6.32 commit 7c67c692fd4bb494e4358251c7f875a61c74e723 Merge: d52eaa7 032ae05 Author: Pavan Kumar Kondeti Date: Thu Jun 10 02:54:20 2010 -0700 Merge "msm: clock-7x30: Set MI2S_S clock's divider to 8" into android-msm-2.6.32 commit 28af57f51a61505ceabb68223b3aa9f54cb28d72 Author: Shubhraprakash Das Date: Wed Jun 9 13:05:36 2010 -0600 msm_kgsl: Add idle command only before interrupt generation Remove idle command from end of every packet and add it only before interrupt generation. Earlier an idle command was added at the end of every frame with interrupt generation command but now since we generate interrupts in kernel just add idle before the interrupt generation. Change-Id: Ia031cc5955c2dd531ed9b9042e7904f3747ee217 Signed-off-by: Shubhraprakash Das commit ed6774d408e656107a79c685a62acfc6c444ee9a Author: Naomi Luis Date: Thu Jun 3 15:44:57 2010 -0700 msm: 8x60: Add board definitions and devices for the kgsl driver Change-Id: If28933185349d4e0d9774fb6e0f9f902be898ef9 Signed-off-by: Naomi Luis commit ebf0613e45395f5200a889d199a5bb19b0eec858 Author: Shubhraprakash Das Date: Tue Jun 8 23:46:18 2010 -0600 msm_kgsl: Only add an entry to memory list if allocation succeeds List of memory allocations made in kgsl is maintained in a list. The list consists of memory descriptor nodes representing each allocation. When a new allocation is made add a new memory descriptor for this allocation to this list only if the allocation is successful. Change-Id: Ic98d20ce2abbd3526a6ed2d535e860964e47a892 Signed-off-by: Shubhraprakash Das commit a142496114749a8cad01a4ba235f3dc03ea5181e Author: Omprakash Dhyade Date: Tue May 25 11:03:25 2010 -0700 defconfig: Enable FB early suspend Enable FB early suspend and disable console early suspend and framebuffer console. Surface Flinger expects console early suspend if framebuffer console is enabled so we disable framebuffer console. Change-Id: I40b4849d1fa99d411f7a401f92b49edac917628e Signed-off-by: Omprakash Dhyade commit 1bf11f6d429606a76f427e5ace05c91f36bdb334 Author: Patrick Lai Date: Tue Jun 8 11:52:55 2010 -0700 msm: audio: 7x30: Allow to change adie codec frequency There is a check in adie driver intended to prevent codec reconfiguration when the codec is already active. However, there are two states when the reconfiguration through adie_codec_setpath() is valid. This fix includes the 2nd valid state which was previously missing. CRs-fixed: 241422 Change-Id: I1fb41302b386181d2243a0ff8cb09f01445fe2b6 Signed-off-by: Patrick Lai commit e2b3a9fb1e3165ae2cfb66185a02eba6bbb131ce Author: Patrick Lai Date: Thu May 20 11:01:24 2010 -0700 msm: audio: qdsp5v2: add capability for SD line mask to HDMI. Add capabilty to pass bit mask of SD lines to enabled . This allows the capability to use any SD lines by sound devices. Change-Id: I1cc7ca61ef7406421dd6fcfa369b0fa47c4d8b07 Signed-off-by: Patrick Lai commit 3011e27251a3fafee87774d02f8f2f5f9b25a66a Author: Bobby Crabtree Date: Wed Jun 9 16:28:37 2010 -0700 regulator: msm: Fix regulator registration bug regulator_register returns a handle that is used by the regulator driver in the enable/disable functions of the regulator driver. since regulator_register may call enable/disable on the regulator driver, there's a chance that the driver may dereference the null handle. In this patch the enable/disable functions use the handle passed in by the regulator core rather than the handle returned by regulator_register. Change-Id: Ie35b5eef217aad16dd71e755c1c7a447a482c1a3 Signed-off-by: Bobby Crabtree commit d52eaa7cea73054a26c22bef7ffa449da69139f7 Merge: dde9aef 16bb6af Author: Saravana Kannan Date: Wed Jun 9 18:40:10 2010 -0700 Merge "MSM: add keyboard driver in st1.5" into android-msm-2.6.32 commit dde9aef611a4832ea9794b9eaab09108f53a5701 Merge: 6c7f7d5 14c6458 Author: Saravana Kannan Date: Wed Jun 9 18:39:49 2010 -0700 Merge "Revert "input: Add Quanta keypad driver"" into android-msm-2.6.32 commit 032ae05e978be6c3afccc143b9fcf100c5199406 Author: Stephen Boyd Date: Mon Jun 7 19:19:53 2010 -0700 msm: clock-7x30: Set MI2S_S clock's divider to 8 Change-Id: I88c9a16d10430f3706108b0ef4b71dbe14b25ff1 Signed-off-by: Stephen Boyd commit 6c7f7d559f9a67719d76fef5e6c8c19cdc13881c Merge: 22a5464 4440fd1 Author: Saravana Kannan Date: Wed Jun 9 18:11:52 2010 -0700 Merge "usb: gadget: android: claim as self powered, if self_powered flag is set" into android-msm-2.6.32 commit 22a5464ab82b9cf1822a212c77446d3ebb768e49 Merge: 1931fe4 fcfdf77 Author: Saravana Kannan Date: Wed Jun 9 18:05:54 2010 -0700 Merge "msm: audio: 7k: Change voicememo driver to use RPC async notification" into android-msm-2.6.32 commit 14abca9a4a199a325690aed620aa0adc659f6d86 Author: kuogee hsieh Date: Wed Jun 9 17:27:31 2010 -0700 msm_fb: display: change fb state to FBINFO_STATE_RUNNING In msm_fb_resume, changed the fb state to FBINFO_STATE_RUNNING instead of a magic number 1 (SUSPEND) after resume. In addition, change all the magic numbers to macros in suspend as well. Change-Id: I5a854293a3577522c559fd90a2dbc84a06072097 Signed-off-by: Kuogee Hsieh commit 1931fe44309b0b00dbd50b977958da094645067a Merge: a64e0a8 f424e1b Author: Saravana Kannan Date: Wed Jun 9 17:05:06 2010 -0700 Merge "msm: usb: Enable native phy reset for all targets" into android-msm-2.6.32 commit 14cd28d68d89de3cdb9feae5e29098641e3a1c94 Author: Bobby Crabtree Date: Thu Jun 3 17:24:16 2010 -0700 regulator: pmic8901: support additional regulator APIs Add support for regulator_set_mode, regulator_get_mode, regulator_get_voltage, and regulator_is_enabled APIs. For LDO and SMPS regulators the mode mapping is as follows: REGULATOR_MODE_NORMAL: Normal REGULATOR_MODE_STANDBY: Low power Change-Id: Iff66d583de509cdda48a4f706d5e29cd1bfc998c Signed-off-by: Bobby Crabtree commit 7fa48e7c4a6720c45ba4674fdfa265bc00d81e6c Author: Abhiruchi Birajdar Date: Tue Jun 8 15:30:58 2010 -0700 camera: New Register settings for CUT3 VX6953 sensor. CUT3 sensor has new register and patch table settings. Also put a check for CUT2.0 and CUT3.0 before register update. Change-Id: I334d85bbd927c4120e621883b1651c3c28da41c5 Signed-off-by: Abhiruchi Birajdar commit 16bb6af2b6197670b5cc16b0e22a0159ea87b949 Author: Mandeep Singh Baines Date: Wed Jun 9 09:08:55 2010 -0700 MSM: add keyboard driver in st1.5 BUG=NONE TEST=Built and ran on st1.5 Signed-off-by: Horace Fu Signed-off-by: Mandeep Singh Baines Review URL: http://codereview.chromium.org/723001 Change-Id: Ib7db8eb5c4c2fe3a8e957cb917ebad05f1ee3f1f Signed-off-by: Ajay Dudani commit 0463ee0858afadbcc628fb5171986cc271018c69 Author: Karthikeyan Ramasubramanian Date: Wed Jun 9 10:48:50 2010 -0600 msm: rpc: Router to handle DATA events after completing OPEN event In RPC Router, OPEN & DATA events can happen concurrently over an XPRT. OPEN Event initializes some data structures to be used during DATA event. So discard DATA events while handling OPEN event for an XPRT. Change-Id: If86dd442dd68fec4ba01698a22a6d9bdc7da2011 Signed-off-by: Karthikeyan Ramasubramanian commit 8242201ff0bc35b349a8fe1c06c1c075d08c34d9 Author: Bobby Crabtree Date: Wed May 19 10:05:44 2010 -0700 regulator: pmic8058: support additional regulator APIs Add support for regulator_set_mode, regulator_get_mode, regulator_get_voltage, and regulator_is_enabled APIs. For LDO regulators the mode mapping is as follows: REGULATOR_MODE_NORMAL: Normal REGULATOR_MODE_IDLE: Low power - follow TCXO REGULATOR_MODE_STANDBY: Force low power For SMPS regulators the mode mapping is as follows: REGULATOR_MODE_NORMAL: PWM REGULATOR_MODE_IDLE: Follow TCXO REGULATOR_MODE_STANDBY: PFM Change-Id: I17b91f7a27e6bbf49c6c7b2abab7072c2a863a0f Signed-off-by: Bobby Crabtree commit 14c64583ed9f37f93d7c801bf80ba4c030431160 Author: Ajay Dudani Date: Wed Jun 9 08:55:15 2010 -0700 Revert "input: Add Quanta keypad driver" This reverts commit 5a86997e6a151cb5e67c1bf9f0601554049efe11. Change-Id: If3de2d9084fdcbc46ca38fa6d5e77206bc0941e8 Signed-off-by: Ajay Dudani commit a6adc400a851f65c16f36de621547c6cfaffc3fb Author: Gregory Bean Date: Tue May 25 19:48:53 2010 -0700 gpio: msm7200a: Add irq support to msm-gpiolib. Change-Id: If962aab99c6c31a4ea38d30e824eff831dd0a289 Signed-off-by: Gregory Bean commit 32c5fe5740d913b59ea201a13e8bf9b950ec7f7c Author: Gregory Bean Date: Mon May 24 13:13:55 2010 -0700 gpio: msm7200a: Add gpiolib support for MSM chips. Add support for uniprocessor MSM chips whose TLMM/GPIO design is the same as the MSM7200A. This includes, but is not necessarily limited to, the: MSM7200A, MSM7x25, MSM7x27, MSM7x30, QSD8x50, QSD8x50A Change-Id: Idf123328c221b249aaa0c64038b64d886621e2b6 Signed-off-by: Gregory Bean commit a64e0a82ef15f72805d11f19021e8f67e9da1a99 Merge: ad352ec 0b6d8e1 Author: Trilok Soni Date: Wed Jun 9 06:04:09 2010 -0700 Merge "defconfig: 7x30: Enable native PMIC8058 leds driver" into android-msm-2.6.32 commit 0b6d8e1cea4c3228ee4be27b0daee72f2f9a51d1 Author: Trilok Soni Date: Mon Jun 7 17:27:24 2010 +0530 defconfig: 7x30: Enable native PMIC8058 leds driver Enable native PMIC8058 leds driver and disable remote leds driver for 7x30. Change-Id: Ia1c27fffb43e56a6c3802bef9113dee0cf9cc7de Signed-off-by: Trilok Soni commit ad352ec442b5d29291ec25ca3ecce108b7a2e57e Merge: 229af59 c1b1daa Author: Trilok Soni Date: Wed Jun 9 05:04:58 2010 -0700 Merge "rtc: rtc-msm: Support for time update on async MODEM boot" into android-msm-2.6.32 commit 229af5929a94227f59537f7d3219a7cef7c2fde7 Merge: 0d2749d c46a11e Author: Pavan Kumar Kondeti Date: Wed Jun 9 02:50:08 2010 -0700 Merge "msm: defconfig: Enable ST1.5 display, Quanta keypad, YAFFS" into android-msm-2.6.32 commit f424e1b3d409ddc297a5617340852a6f01db3460 Author: Anji Jonnala Date: Tue Jun 8 07:20:40 2010 +0530 msm: usb: Enable native phy reset for all targets Remove rpc phy reset from otg platform data and configure the mpp pin to enable HSUSB 3.3V LDO. Change-Id: I94e06da99d0e98bf6fc26bb73e94a2d81fd591a6 CRs-fixed: 241456 Signed-off-by: Anji Jonnala commit 4440fd10c7c0dca5b2737b2bc69270a113cf41e4 Author: Chiranjeevi Velempati Date: Wed Jun 9 14:44:10 2010 +0530 usb: gadget: android: claim as self powered, if self_powered flag is set Claim as self powered device only if, self_powered flag is set in platform data and if this gadget device declares as self powered and update the configuation descriptor accordingly.If claiming as self power device, request for max current of 100 mA's only. Change-Id: I6cde81febcb4520dd67ed2d77524bdff6ceef2ad Signed-off-by: Chiranjeevi Velempati commit 0d2749db584c16cbd4fc9a5ff196f0494df71be6 Merge: cc24877 9318fc2 Author: Pavan Kumar Kondeti Date: Wed Jun 9 02:00:07 2010 -0700 Merge "msm_kgsl: Map host addresses into GPU's MMU" into android-msm-2.6.32 commit cc24877fc3b0e7a6017b72d2fd9a8488999b50ab Merge: 24ca97e f961bb6 Author: Pavan Kumar Kondeti Date: Wed Jun 9 02:00:03 2010 -0700 Merge "msm: qsd8x50a-st1x: Disable pmem_smipool device when using pmem_kernel_smi" into android-msm-2.6.32 commit 24ca97e832d6e92553d4b5de1214d36eaac60361 Merge: 7bda7c6 161371c Author: Pavan Kumar Kondeti Date: Wed Jun 9 01:59:54 2010 -0700 Merge "msm: devices-qsd8x50: Add 2D and 3D GRP clocks for 8x50A" into android-msm-2.6.32 commit c1b1daa46b0a6ca01754308463ea3e42eea77bf1 Author: Anirudh Ghayal Date: Wed Jun 9 12:19:51 2010 +0530 rtc: rtc-msm: Support for time update on async MODEM boot On targets where the MODEM processor boots up after the APPS processor, the rtc device gets registered after the MODEM has booted. This change sets the system time after the rtc device has registered. Change-Id: I5aa917f617b0062b937f4ccfb3294665ef08b6cd Signed-off-by: Anirudh Ghayal commit fcfdf77f567dc0d0c8b639db22370d7e74ad63bf Author: Sriranjan Srikantam Date: Tue Jun 8 15:08:44 2010 +0530 msm: audio: 7k: Change voicememo driver to use RPC async notification According to current implementation if RPC server on modem side is not initialized by the time init function is called, the driver fails to initialize. Hence make use of RPC asynchronous notification in voicememo driver Signed-off-by: Sriranjan Srikantam Change-Id: I93b246b0fba7ff60783ce3fe28ade2dd49f6e611 commit 7bda7c6fe418f80e9106a441e5ded68311d37e09 Merge: 28a7dca 8b084e1 Author: Trilok Soni Date: Tue Jun 8 23:27:38 2010 -0700 Merge "msm: rpc: enable rpc router for 8660." into android-msm-2.6.32 commit 28a7dcac7940ef8c05695cefa8c02dd6a006773e Merge: 3b3a6d8 848cfc5 Author: Pavan Kumar Kondeti Date: Tue Jun 8 22:26:03 2010 -0700 Merge "msm: acpuclock-8x50a: Increase EBI1/AXI clock rates for better performance" into android-msm-2.6.32 commit 3b3a6d871d197170fb11cc1d665b8097ba89e4fb Merge: 7e5116b ed29c15 Author: Pavan Kumar Kondeti Date: Tue Jun 8 22:25:41 2010 -0700 Merge "msm: hsusb: stub hsusb apis for 8660." into android-msm-2.6.32 commit 7e5116b8da906c3dedb54acafb08d2a7a144775f Merge: 847a3a4 b75ad39 Author: Saravana Kannan Date: Tue Jun 8 20:16:32 2010 -0700 Merge "msm: Fix barrier defintions" into android-msm-2.6.32 commit 847a3a4518e196b656ff91727d5e18567cb58eda Merge: b99a6b3 9127780 Author: Saravana Kannan Date: Tue Jun 8 20:16:18 2010 -0700 Merge "msm_fb: display: Add FB_MSM_OVERLAY dependency" into android-msm-2.6.32 commit b99a6b3902e4742eff27df546e25910f15553192 Merge: 5441002 fff2080 Author: Saravana Kannan Date: Tue Jun 8 20:16:03 2010 -0700 Merge "msm: board-msm7x30: Add board support for PMIC8058 leds" into android-msm-2.6.32 commit 161371cd216f52becb1bc6f9437ba4649b8b1c8f Author: Matt Wagantall Date: Tue Jun 8 17:28:09 2010 -0700 msm: devices-qsd8x50: Add 2D and 3D GRP clocks for 8x50A Change-Id: I5559b98255603babef3aadceee7aaaf3d55854a7 Signed-off-by: Matt Wagantall commit fff2080f3ee5d28a92cdc07108e084c6b067b995 Author: Trilok Soni Date: Mon May 3 17:03:04 2010 +0530 msm: board-msm7x30: Add board support for PMIC8058 leds Adds board configuration data for 7x30 SURF and FFA's leds over PMIC8058 using direct configuration from application processor. Change-Id: I1a1990239eded3a54939cd501cc18f6345e605c5 Signed-off-by: Trilok Soni commit 54410026b0adebfc8fdc624bd44feda115ca57dc Author: Matt Wagantall Date: Tue May 18 19:06:29 2010 -0700 msm: clock-8x60: Add debugfs interface to measure clock rates Use the 8x60's ring oscillator hardware to measure the clock rate of locally-controlled clocks. This allows for the development of more comprehensive end-to-end clock tests. A 'measure' debugfs node is created for each clock to perform the measurement and retrieve the result. soc_clk_measure_rate() should *only* be used for debug purposes since it busy-loops while the measurement takes place (~15 ms). Clock rates are in units of Hz. Clocks that are not locally controlled or do not support rate measurement will return -1. Change-Id: Ie6ff2b8d9bfe2861cb5373126056716bbb1f72d6 Signed-off-by: Matt Wagantall commit 84f1c83d5b1e4796d0fa6334313c14f93b82911b Merge: f336be0 90cf96a Author: Saravana Kannan Date: Tue Jun 8 17:34:32 2010 -0700 Merge "msm: board-msm8x60: Use PMIC for ethernet interrupt on surf" into android-msm-2.6.32 commit 848cfc54b73f5ef94fba0b855d0b2277130f21ca Author: Matt Wagantall Date: Wed Jun 2 17:28:43 2010 -0700 msm: acpuclock-8x50a: Increase EBI1/AXI clock rates for better performance Change-Id: I6eb61b3e0c2b048ff1c962d1a2ca480222ae885d Signed-off-by: Matt Wagantall commit 8b084e19350d1435776f3e82428bba2a7850bec9 Author: Niranjana Vishwanathapura Date: Fri Jun 4 13:14:02 2010 -0600 msm: rpc: enable rpc router for 8660. enable rpc router/ ping mdm and oem rapi clients for 8660. Change-Id: I9728e3ecb91a2f557bf289ddc70727e36b77ac86 Signed-off-by: Niranjana Vishwanathapura commit ed29c15fd4e1c1edde89acb99fc43dc5c6868244 Author: Niranjana Vishwanathapura Date: Fri Jun 4 13:09:03 2010 -0600 msm: hsusb: stub hsusb apis for 8660. HSUSB apis are enabled when ONCRPCROUTER config is set. For 8660 stub out hsusb apis even if ONCRPCROUTER is enabled. Change-Id: Ib49dba6f8a9277c1ac45b56d4d89a7a4b772faff Signed-off-by: Niranjana Vishwanathapura commit f336be0cfcf398e3e0030128adbcd70e9d9d1b08 Merge: 14ea121 7dd776e Author: Saravana Kannan Date: Tue Jun 8 16:49:07 2010 -0700 Merge "defconfig: Enable USB RNDIS function" into android-msm-2.6.32 commit 14ea121803729d47f3a00a4708b443de7ad3ab5a Merge: 130ce63 a74f0bc Author: Saravana Kannan Date: Tue Jun 8 16:34:14 2010 -0700 Merge "msm: audio: qdsp5v2: Modify Low power audio concurrency profile" into android-msm-2.6.32 commit 9318fc2ab50dd953d73eacc40d70aaaa6563917a Author: Shubhraprakash Das Date: Mon Jun 7 18:02:57 2010 -0600 msm_kgsl: Map host addresses into GPU's MMU We need the ability to map in host addresses as this will allow the use of memory allocated in user space. Change-Id: I8be66122e183930cb31f0a3839e1af6f4b3e2df0 Signed-off-by: Shubhraprakash Das commit 130ce63f7ac51d556f8241d81906478011e2fdf8 Merge: e78c53f 901fcdb Author: Saravana Kannan Date: Tue Jun 8 15:38:36 2010 -0700 Merge "msm: clock-7x30: Add debugfs interface to measure clock rates" into android-msm-2.6.32 commit 91277807c75b4ed9844441da31d9a49c990c1334 Author: kuogee hsieh Date: Fri Jun 4 08:19:58 2010 -0700 msm_fb: display: Add FB_MSM_OVERLAY dependency Add FB_MSM_OVERLAY dependency to FB_MSM_HDMI_ADV7520_PANEL to fix compiler error when FB_MSM_OVERLAY is not defined. CRs-fixed: 240734 Change-Id: I948b2b198f69ada3dfb2eb4903363230a48935aa Signed-off-by: Kuogee Hsieh commit d8086a8f3ea59ad707fe06c855e5eafec20807db Author: Shalabh Jain Date: Thu May 27 16:05:55 2010 -0700 diag: Add NULL port to logging options Until now DIAG could log traffic to USB or memory device. Now it has the option of NO logging too. In this case, all DIAG traffic will be just dropped. Change-Id: I0a640bc3a47d0389fc042c86116c77caa86805bd Signed-off-by: Shalabh Jain commit a74f0bc17d9da45fe0d584bf5b7002019cb71ece Author: Jay Wang Date: Mon Jun 7 16:08:41 2010 -0700 msm: audio: qdsp5v2: Modify Low power audio concurrency profile Change low power audio concurrency profile to support one low power audio and three NT modes. Set default profile to low power audio. Change-Id: I9ccbae3e83df303d613ef34cb0db38816b560a49 Signed-off-by: Jay Wang commit f961bb6fea6ebd4af6aae40935c024e3c26797ab Author: Matt Wagantall Date: Tue Jun 8 10:09:13 2010 -0700 msm: qsd8x50a-st1x: Disable pmem_smipool device when using pmem_kernel_smi When CONFIG_KERNEL_PMEM_SMI_REGION is enabled, the pmem_smipool device should be disabled since the memory it uses is in conflict with the the pmem_kernel_smi device. Change-Id: If2f56ebe5263c3214c76c0b97ba67005f83bc352 Signed-off-by: Matt Wagantall commit 5240e47a689ae9ff463bcdf24c6414f09fc2c8ba Author: Sagar Dharia Date: Fri Jun 4 16:13:03 2010 -0600 qup_i2c: Add adapter after GPIOs and interrupts are initialized Adding an I2C adapter means registering it with the Linux I2C framework. Linux I2C framework will call probe on the adapter's clients as soon as add_adapter is called. If the client initiates the transaction in its probe and client's probe is called after add_adapter but before QUP IRQs, GPIOs are initialized, the transaction may fail. Adapter is added after GPIOs, interrupts are initialized to prevent this failure. Change-Id: I2aafde206d2afc4317fae3c5bc6f45b3fa07f379 Signed-off-by: Kenneth Heitke Signed-off-by: Sagar Dharia commit e78c53fb877e2667b6e36778d525ac3fc31a15bc Merge: 8f54456 319dbe2 Author: Pavan Kumar Kondeti Date: Tue Jun 8 04:06:20 2010 -0700 Merge "input: marimba_tsadc: Add support for codec ssbi clock" into android-msm-2.6.32 commit 7dd776e95f3fa69c8e4f5fe06676ede8497af779 Author: Pavankumar Kondeti Date: Thu Jun 3 16:43:41 2010 +0530 defconfig: Enable USB RNDIS function CRs-Fixed: 241453 Change-Id: I4f1940cabc02b11eb27662819814ccb2164e7023 Signed-off-by: Pavankumar Kondeti commit 8f54456b2b4cf3ba36ae5f553fe9ab6ba94654a0 Merge: 57e6460 a0c85d0 Author: Pavan Kumar Kondeti Date: Tue Jun 8 01:52:33 2010 -0700 Merge "net: Kernel config change to support IPV6 and QoS" into android-msm-2.6.32 commit 57e64606e3875ccb3275cf2d91e1742bfc442db0 Merge: cb69286 6b41644 Author: Pavan Kumar Kondeti Date: Tue Jun 8 01:52:29 2010 -0700 Merge "msm: 8x50: Change the size and allocator of /dev/pmem" into android-msm-2.6.32 commit cb692862712156bd84eba800df542bb2870eefab Merge: ec91163 d3071c7 Author: Pavan Kumar Kondeti Date: Tue Jun 8 01:52:24 2010 -0700 Merge "defconfig: msm8660: Enable evbug, leds-gpio, PMIC8058 pwr-end key" into android-msm-2.6.32 commit ec91163cfbcb85e631a69fde42377cac06848d96 Merge: 4a46727 ee1a5e7 Author: Pavan Kumar Kondeti Date: Tue Jun 8 00:38:51 2010 -0700 Merge "msm: rmnet: Do not close logical rmnet sdio port" into android-msm-2.6.32 commit d3071c75414f8617f032ff9af48b109bc0d37c93 Author: Anirudh Ghayal Date: Tue Jun 8 11:19:37 2010 +0530 defconfig: msm8660: Enable evbug, leds-gpio, PMIC8058 pwr-end key Change-Id: I1ec0dbd825521daf9475a6928c7ace63b531b0bb Signed-off-by: Anirudh Ghayal commit 319dbe24cf5e52c02e79c3499b2480317d7cfabf Author: Trilok Soni Date: Fri Jun 4 14:39:30 2010 +0530 input: marimba_tsadc: Add support for codec ssbi clock Add support for codec_ssbi_clk as it is required for the marimba TSADC to operate and make transactions. Early suspend/late resume support is also required in-order to operate and turn-off the codec_ssbi_clk when the ADC is not being used. Change-Id: I2e4ae7e4ccb52c65bce080b7c1d4bd46b2f4fc27 CRs-Fixed: 238112 Signed-off-by: Trilok Soni commit 901fcdb8f3eccb8a77e262171cc76766a079dac7 Author: Matt Wagantall Date: Fri May 7 12:31:19 2010 -0700 msm: clock-7x30: Add debugfs interface to measure clock rates Use the 7x30's ring oscillator hardware to measure the clock rate of locally-controlled clocks. This allows for the development of more comprehensive end-to-end clock tests. A 'measure' debugfs node is created for each clock to perform the measurement and retrieve the result. soc_clk_measure_rate() should *only* be used for debug purposes since it busy-loops while the measurement takes place (~15 ms). Clock rates are in units of Hz. Clocks that are not locally controlled or do not support rate measurement will return -1. Change-Id: I671db560463be46749816f4bac61e576eb7b3b2e Signed-off-by: Matt Wagantall commit b75ad390921a0b06f8c92121615d8f361d3532a0 Author: Naveen Ramaraj Date: Fri May 28 11:41:52 2010 -0700 msm: Fix barrier defintions Change the barrier defintions to execute actual cp15 instructions instead of compiler directives. Change-Id: Idd7d250b5dc8dd3421afed4d7ded18f7ba2399a5 Signed-off-by: Naveen Ramaraj commit 4a467271132ecaf5ad2806fb0e52223afd7fe428 Merge: 6ce95c9 1140e0f Author: Saravana Kannan Date: Mon Jun 7 18:08:29 2010 -0700 Merge "msm: audio: qdsp5v2: Match LPA's volume level to SW mixer's volume level" into android-msm-2.6.32 commit 6ce95c9c8579bbec373dbd8e8b370c6fca013b45 Merge: 54649c7 0fbe75c Author: Saravana Kannan Date: Mon Jun 7 18:08:12 2010 -0700 Merge "msm: 7x30: Add USB phy reset clk" into android-msm-2.6.32 commit 54649c7e286e2d38c90f4dfc3083ee7942ef1adb Merge: ac9038d fd27fc8 Author: Saravana Kannan Date: Mon Jun 7 18:08:03 2010 -0700 Merge "media: camera: Fix for the concurrency issue" into android-msm-2.6.32 commit ac9038d990aed56b0bce28908e1b8b09ccfc4c0f Merge: 91e2014 23055d6 Author: Saravana Kannan Date: Mon Jun 7 18:07:41 2010 -0700 Merge "regulator: pmic8901: add mvs, usb-otg, and hdmi switch support" into android-msm-2.6.32 commit 91e2014b5df6d6684504348d2e6bbb509210e3e6 Merge: 45b8f42 1f07ddd Author: Saravana Kannan Date: Mon Jun 7 18:07:23 2010 -0700 Merge "msm: audio: qdsp5v2: Check for not sending invalid buffer" into android-msm-2.6.32 commit 45b8f42e6cc51247d2ecaef78c50b6d639a64643 Merge: e4b71e0 aa30b59 Author: Saravana Kannan Date: Mon Jun 7 18:06:14 2010 -0700 Merge "input: pmic8058_keypad: Add ghost key detection support" into android-msm-2.6.32 commit e4b71e0cdb2509c225bde7de9e74619060f391c0 Merge: ad489bc 61c3fb5 Author: Saravana Kannan Date: Mon Jun 7 18:05:36 2010 -0700 Merge "msm: clock: Use correct clock ID (ie. remote/local) for clock resets" into android-msm-2.6.32 commit ad489bc201ae80b38ccbcac65dd35843b6070c1f Merge: 47c2558 a85fd0a Author: Saravana Kannan Date: Mon Jun 7 18:05:13 2010 -0700 Merge "spi_qsd: Add support for QUPe controller" into android-msm-2.6.32 commit c46a11e0e7bc7b43f6ca01398f66982b84a9b0de Author: Stephen Boyd Date: Wed Jun 2 13:33:30 2010 -0700 msm: defconfig: Enable ST1.5 display, Quanta keypad, YAFFS Disable HIGHMEM since it's known to cause issues with the nand driver used by yaffs. Change-Id: I5eb5d563db318c2a3117b84f4db16abec28fd8a4 Signed-off-by: Stephen Boyd commit 47c2558f792c08825a2ced557b1d884a23df0ac2 Merge: 44f4ff0 5a86997 Author: Willie Ruan Date: Mon Jun 7 17:43:27 2010 -0700 Merge "input: Add Quanta keypad driver" into android-msm-2.6.32 commit 90cf96af0a1da151ebcf8c84f7f7681ec6dcfffe Author: Jeff Ohlstein Date: Thu May 27 19:07:53 2010 -0700 msm: board-msm8x60: Use PMIC for ethernet interrupt on surf The FFA requires the ethernet interrupt to go through the PMIC. Doing this on the surf also lets us work toward not needing a separate machine type for the ffa. Change-Id: I7b08fb4d1208fd0f66e8831ebb4b74717f2ed25e Signed-off-by: Jeff Ohlstein commit 609c6af3a5b860882ed15893267f96c978911d58 Author: Niranjana Vishwanathapura Date: Mon Jun 7 18:02:46 2010 -0600 msm: rmnet: Fix bugs in sdio rmnet transport Reserver bufferspace for partial packet and mark write complete before notifying the upper layer about it. Change-Id: I80c995d72555e17e88718dc05e0911565fb4b2cf Signed-off-by: Niranjana Vishwanathapura commit 61c3fb507f243a0a26b07e30abc0de5cabf7c62d Author: Matt Wagantall Date: Tue May 25 16:17:29 2010 -0700 msm: clock: Use correct clock ID (ie. remote/local) for clock resets On SoCs with local clock reset support, the local reset implementation should be used with the local clock ID. On SoCs without local reset support, the remote implementation should be used with the remote ID. This fixes clock reset support for 8x60 by correcting the ID used. Change-Id: Id284f38eb604743f4834822dfefceb1e8360f252 Signed-off-by: Matt Wagantall commit a0c85d0f5479fc7e6b6e1b3a42c421d32bdf0e83 Author: Abhijeet Dharmapurikar Date: Tue Jun 1 22:39:56 2010 -0700 net: Kernel config change to support IPV6 and QoS Enable IPV6 privacy extensions to enhance connection security by changing IPV6 address on periodic basis. Enable kernel network packet scheduling and classification mechanisms to support Quality of Service (QoS). Change-Id: I6257e5c3c0f1930ae182f8bd84ec1a05e21a3a30 Acked-by: Andrew Richardson Signed-off-by: Abhijeet Dharmapurikar commit 44f4ff0903b0afb374e872c36d01003c29de8dbe Author: Steve Muckle Date: Mon Jun 7 10:00:50 2010 -0700 defconfig: automatic update Change-Id: I7ccdd4bca45bd129f4db1c656c57a4380f639e8d Signed-off-by: Steve Muckle commit 23055d6a1e25e550c1e09638e274b0fe7f9cf238 Author: Bobby Crabtree Date: Wed Jun 2 12:04:04 2010 -0700 regulator: pmic8901: add mvs, usb-otg, and hdmi switch support Voltages switches are needed to support USB, HDMI, and digital MIC components. Change-Id: Ib7af27a7c9694c042209c86741998e8d5ba9674d Signed-off-by: Bobby Crabtree commit ee1a5e71476eab8d3b320f948e6136a64a8d83d5 Author: Niranjana Vishwanathapura Date: Mon Jun 7 10:15:25 2010 -0600 msm: rmnet: Do not close logical rmnet sdio port Once a logical sdio rmnet channel is open, it should not be closed upon rmnet_close request. Change-Id: Ic27d76e3df8dc04284d03d7b5c870aa738a807d1 Signed-off-by: Niranjana Vishwanathapura commit 1140e0fcb5d1476984e591dbe11da5fbc6c9359e Author: Jay Wang Date: Mon Jun 7 09:08:44 2010 -0700 msm: audio: qdsp5v2: Match LPA's volume level to SW mixer's volume level Change-Id: I3702bfdcee2eec0a1229b13da0537bbf6d2a4937 Signed-off-by: Jay Wang commit 0fbe75c27fae51be1ce8d22490b5c524bbdd158e Author: Anji Jonnala Date: Mon Jun 7 17:49:10 2010 +0530 msm: 7x30: Add USB phy reset clk Phy reset clk is an interface to reset the HSUSB phy, add an entry for phy reset clk in the 7x30 clk list. Change-Id: I9767adb809df657fb77ea7c23e7b9be369017f01 Signed-off-by: Anji Jonnala commit 7f954c559a30762fdaca23bbc3da8b50525c9eee Merge: ef48661 edae0f3 Author: Trilok Soni Date: Sun Jun 6 09:06:09 2010 -0700 Merge "msm: sdio_ctl: Read all qmi packets on sdio link in work function" into android-msm-2.6.32 commit ef48661504b5effb6f37031e4836d0b85c24db89 Merge: 84a8ce3 44fe9fc Author: Trilok Soni Date: Sun Jun 6 09:05:23 2010 -0700 Merge "qup_i2c: Revert initcall ordering" into android-msm-2.6.32 commit 84a8ce3630e985ff6a464c82277dc61d3dfab918 Merge: 889912e 6d83391 Author: Neil Leeder Date: Sat Jun 5 07:52:24 2010 -0700 Merge "msm: 7x30: add support for Bluetooth power for svlte boards" into android-msm-2.6.32 commit 889912e86a68c0a38e0e417d0a3f4b936db78c1b Merge: 7b2e0d2 8494474 Author: Neil Leeder Date: Sat Jun 5 07:50:20 2010 -0700 Merge "input: msm_ts: Add early suspend, late resume support" into android-msm-2.6.32 commit fd27fc8f1edd31ed64d5f8aa08aa2f1ec2420534 Author: Nagesh Reddy Date: Fri Jun 4 11:35:11 2010 -0700 media: camera: Fix for the concurrency issue Added a mutex lock to fix concurrency issue of processing more than one blocking call at a time. Change-Id: Ia8dedb5b4066c9378d4f63d7762cd46236c6f369 CRs-fixed:238520 Signed-off-by: Nagesh Reddy commit 6b4164413d819e8a2fd2f55a0dd2f6a90e071517 Author: Naomi Luis Date: Fri Jun 4 17:31:37 2010 -0700 msm: 8x50: Change the size and allocator of /dev/pmem Change the allocator type to ALLORNOTHING and the size of the /dev/pmem region as it is only used by SurfaceFlinger. Change-Id: I189087fa642005578af1d745c91adac468ed419b Signed-off-by: Naomi Luis commit edae0f3bd607bd470d0a102b4e08f765d7724fb3 Author: Niranjana Vishwanathapura Date: Fri Jun 4 16:20:45 2010 -0600 msm: sdio_ctl: Read all qmi packets on sdio link in work function sdio_read_avail returns the size of one packet even if multiple packets are available for read. Update code to read all available qmi packets on sdio link in the work function instead of reading only one packet. Change-Id: I029fcb51c8498b615df2f2ecb4db0d572c62ff9b Signed-off-by: Niranjana Vishwanathapura commit 44fe9fc1be43bd11729044769d010987e59f4208 Author: Stephen Boyd Date: Fri Jun 4 14:53:24 2010 -0700 qup_i2c: Revert initcall ordering This was originally a subsys_initcall but was made into an arch_initcall for 8x60. 8x50a bringup made it into a subsys_initcall again but now that 8x60 is here it should really be an arch_initcall. Change-Id: I8201ceac0fe16a713752f4e7502c7b4b43b2f7b9 Signed-off-by: Stephen Boyd commit 5a86997e6a151cb5e67c1bf9f0601554049efe11 Author: Ajay Dudani Date: Thu May 13 11:43:56 2010 -0700 input: Add Quanta keypad driver Change-Id: Ic00fbfc55398fc7b5742bf9ba3743ba7ae663a7c Signed-off-by: Ajay Dudani commit 1f07ddda4bd2d68dafa6c59e115117db3b514cca Author: Jay Wang Date: Fri May 28 15:49:47 2010 -0700 msm: audio: qdsp5v2: Check for not sending invalid buffer Check for end of buffer node to avoid invalid buffer pointer sent to DSP Change-Id: I00bfc6a162f68383dfee152104023133a64e1aa5 Signed-off-by: Jay Wang commit 6d83391c79c2d24cf9b82a44712a3f269c23ffd5 Author: Matthew Wilson Date: Wed Jun 2 15:50:06 2010 -0500 msm: 7x30: add support for Bluetooth power for svlte boards Add GPIO control for enabling clock to Bluetooth device Change-Id: I6f2ec797f614f2a1157acd2cb7242c9e1ff9835a Signed-off-by: Matthew Wilson commit 7b2e0d21aec010c80325643dd20c4b03e30b4082 Merge: 8be44cc c67ee64 Author: Murali Palnati Date: Fri Jun 4 10:02:16 2010 -0700 Merge "usb: msm_otg: Add native phy reset support" into android-msm-2.6.32 commit 8be44ccd62523f3e15dc63547c18d2b32f1bdffc Merge: 8a9ff76 a01ad2b Author: Neil Leeder Date: Fri Jun 4 09:44:04 2010 -0700 Merge "usb: gadget: f_rndis: Remove __init macro for bind" into android-msm-2.6.32 commit 8a9ff764ff292c39f55dbb3044793cc4e106ac29 Merge: 4605207 142788d Author: Neil Leeder Date: Fri Jun 4 08:34:08 2010 -0700 Merge "serial: msm_serial_hs_lite: Fix high baud rate issues" into android-msm-2.6.32 commit 460520787e21ed652f7ebab10ed81f147aac491a Merge: 8c85e8c d7a5bbe Author: Neil Leeder Date: Fri Jun 4 07:22:35 2010 -0700 Merge "mfd: pmic8058/8901: remove disable and enable methods" into android-msm-2.6.32 commit 8c85e8c3d1736354b1c8c66f345caa86a41317be Merge: 40e3541 239c728 Author: Neil Leeder Date: Fri Jun 4 07:21:17 2010 -0700 Merge "tty: Allow RI, DSR and CTS modem status bits in tiocmset" into android-msm-2.6.32 commit 40e35417e13400d52ca4882f51da2e959de78bab Merge: 40efaf7 f21d7fd Author: Neil Leeder Date: Fri Jun 4 07:20:46 2010 -0700 Merge "usb: msm_otg: Rename usb clock names" into android-msm-2.6.32 commit 40efaf70a85f6c9f718cf0f31dac0bfb5285cb0d Merge: 17bb786 dc71604 Author: Neil Leeder Date: Fri Jun 4 07:20:02 2010 -0700 Merge "gpio: add pmic8901-mpp.c as a gpio driver for PM8901 MPP" into android-msm-2.6.32 commit 84944741bc82da07871ff7f56e8e2b8a49044ebd Author: Trilok Soni Date: Fri Jun 4 14:34:13 2010 +0530 input: msm_ts: Add early suspend, late resume support Add early suspend support for TSSC controller driver as touchscreen could go to the suspend early when the screen goes blank. Change-Id: I0753c47bd5987610ea7f81523ead766bafaefae1 Signed-off-by: Trilok Soni commit 142788d1b268d3dea84132827367b73ac943b103 Author: Sankalp Bose Date: Fri Jun 4 17:34:53 2010 +0530 serial: msm_serial_hs_lite: Fix high baud rate issues UARTDM does not seem to generate stale interrupts unless initial timeout value is greater than all subsequent values. Change so that UARTDM is initialised with the highest possible value for IPR register. Change-Id: I4716f1a3686523800b4ec3f1007af3582ac80f5a Signed-off-by: Sankalp Bose commit c67ee642b579d471237d4fde10bcd3193d05ebdd Author: Anji Jonnala Date: Fri Jun 4 11:18:20 2010 +0530 usb: msm_otg: Add native phy reset support Phy reset need's to be performed for every plug in plug out to get rid of phy stuck up issues and to avoid high power consumption. As of now USB driver is using rpc phy reset. Implement phy reset functionality in the USB driver to remove the modem dependencies. Change-Id: Ie35fba634b35147f87ce9cb2230f19b56f8d51b1 Signed-off-by: Anji Jonnala commit a01ad2b441c9d2203e9b8710452ed35aa3cbe864 Author: Chiranjeevi Velempati Date: Fri Jun 4 17:49:30 2010 +0530 usb: gadget: f_rndis: Remove __init macro for bind rndis_bind will be called as part of composition switch, hence this function should be present in memory, hence removing the __init macro for bind function. Change-Id: If0cfea20a448eedd2f405784a867513befb571a1 Signed-off-by: Chiranjeevi Velempati commit 17bb786446cbd6461e5612cf507af33c6f7f7a89 Merge: 5642c91 f59172a Author: Murali Palnati Date: Fri Jun 4 04:21:57 2010 -0700 Merge "msm_kgsl: Remove the G12 bottom half handler" into android-msm-2.6.32 commit f21d7fdbf27a5c4966830822a5b8be520f4e249e Author: Anji Jonnala Date: Fri Jun 4 09:59:14 2010 +0530 usb: msm_otg: Rename usb clock names Change-Id: I6fd6be1dc9b58a591727d55d26666125550d240a Signed-off-by: Anji Jonnala commit 5642c911864da92a677bf37b6c5dd957cddf89c5 Merge: 483a2dc a54aac4 Author: Murali Palnati Date: Fri Jun 4 00:46:19 2010 -0700 Merge "msm_fb: Add ST1.5 LCDC driver" into android-msm-2.6.32 commit 483a2dceb1262f24bb742fc53bae2223d071479c Merge: f02deb1 28a9e33 Author: Murali Palnati Date: Fri Jun 4 00:46:03 2010 -0700 Merge "qup_i2c: Update for 8x50a" into android-msm-2.6.32 commit f02deb1052791283ea628796f54b103705b79b26 Merge: 61bf03b 48cfebe Author: Murali Palnati Date: Fri Jun 4 00:45:26 2010 -0700 Merge "msm: defconfig: Add qsd8x50a defconfigs" into android-msm-2.6.32 commit 61bf03b78a39dc2d6bd8108487d4bb971f663bb3 Merge: be30dc0 5b62e76 Author: Murali Palnati Date: Fri Jun 4 00:45:08 2010 -0700 Merge "msm: 8x50a: Add board support for ST1.5" into android-msm-2.6.32 commit be30dc060bb18abed6845561d9d468ab539839fe Merge: c56dbc8 d0dc160 Author: Murali Palnati Date: Thu Jun 3 23:15:13 2010 -0700 Merge "arm: perform a dmb in do_cache_op() on MSM 7x27" into android-msm-2.6.32 commit c56dbc846cf974ecb0b7eff39dac8ea72013db83 Merge: 1c228ac c49fe46 Author: Murali Palnati Date: Thu Jun 3 23:15:06 2010 -0700 Merge "msm: kgsl: Use the kgsl clock names from the platform data handle" into android-msm-2.6.32 commit 1c228ac387b4fdc2208dc5c6c599aced5c71a5ae Merge: d832a52 00a2f9d Author: Murali Palnati Date: Thu Jun 3 23:14:59 2010 -0700 Merge "hwmon: Add driver for msm dal adc interface" into android-msm-2.6.32 commit d832a52f30506131fb7d7102610861a5e4446c41 Merge: 8774aa6 eb1144f Author: Murali Palnati Date: Thu Jun 3 23:14:50 2010 -0700 Merge "mm: dma_cache operations for non linearly mapped buffers" into android-msm-2.6.32 commit 8774aa60457280869ececad11407c2162348a393 Merge: fdbd604 4b4dff8 Author: Murali Palnati Date: Thu Jun 3 23:14:42 2010 -0700 Merge "msm: clock-7x30: Add const qualifier to variables" into android-msm-2.6.32 commit d00528130c1b7f9b8034111daa23cc732c571a34 Author: Niranjana Vishwanathapura Date: Thu Jun 3 23:51:01 2010 -0600 msm: smd: update rpc program definition Update rpc program definition file. Change-Id: Ib74b279a36c084c52de8f1118d9a7eb87a157c75 Signed-off-by: Niranjana Vishwanathapura commit d7a5bbe4c468fd690a89553bc110ce8633a2d3cb Author: Willie Ruan Date: Thu Jun 3 20:13:26 2010 -0700 mfd: pmic8058/8901: remove disable and enable methods Removing disable method will default to kernel's lazy-disable for interrupt handling. If we don't do this, 2.6.32 kernel calls suspend_device_irqs() which would disable all interrupts including the wakeup interrupts. Change-Id: I6607adf171747fec61e8820e646185ef3dd559c7 Signed-off-by: Willie Ruan commit f59172a2f35cf4775455121d28572f71cb3859a0 Author: Jordan Crouse Date: Thu Jun 3 16:31:42 2010 -0600 msm_kgsl: Remove the G12 bottom half handler The interrupt handler for the Z180 is very lightweight, and we don't need the additional overhead of the bottom half handler. Change-Id: I9143c97fcda0f4de4bec4dd5b034bd9572d9e549 Signed-off-by: Jordan Crouse commit dc71604cdcad4d95c72e0e94a231bb9061381a3a Author: Willie Ruan Date: Wed Apr 28 21:37:00 2010 -0700 gpio: add pmic8901-mpp.c as a gpio driver for PM8901 MPP MPP (Multi-Purpose Pin) can be configured for multiple purposes on PM8901 chip. This is the list of supported configurations: - digital input - digital output - digital bidirectional - analog input - analog input - current sink - test sink mode - test output mode When configured as digital input and/or output, an MPP pin works exactly like a GPIO pin. Change-Id: Ie595166700b454ddc98b0d7a7e9bbe3a1ea830ac Signed-off-by: Willie Ruan commit fdbd6046ebc4ded8ca4d6a5ddbbb7dea7873e698 Merge: ebc0b72 b9ce788 Author: Neil Leeder Date: Thu Jun 3 13:16:08 2010 -0700 Merge "msm: video: Add VC1 decoder support in Decoder driver" into android-msm-2.6.32 commit 28a9e33552b92e7718137e26cdb42e05b11cf081 Author: Ajay Dudani Date: Wed Jun 2 18:37:40 2010 -0700 qup_i2c: Update for 8x50a Change-Id: I1b218ffe38a762474d9c2baba0baeabe571b1903 Signed-off-by: Ajay Dudani commit a54aac47e202993920fae8e9297e6bf59221b765 Author: Ajay Dudani Date: Wed Jun 2 18:40:14 2010 -0700 msm_fb: Add ST1.5 LCDC driver Change-Id: Ia592bed81e316118f4c301ad59931fb9502ce49e Signed-off-by: Ajay Dudani commit 48cfebe0483b8fb59d982108978e507341e3bc59 Author: Stephen Boyd Date: Tue May 11 19:50:53 2010 -0700 msm: defconfig: Add qsd8x50a defconfigs Change-Id: I61968a629cb9a179daf61b53189f181020d7fa0a Signed-off-by: Stephen Boyd commit 5b62e763640b144a3126d3a0391c71f8db6e19c3 Author: Stephen Boyd Date: Tue May 11 19:37:41 2010 -0700 msm: 8x50a: Add board support for ST1.5 This is enough to boot up to userspace init and thus should be sufficient to bring in any drivers such as keyboard, display, etc. Change-Id: I15bba47801d3cd448339539db68f37757f1ecb47 Signed-off-by: Stephen Boyd commit c49fe46524bf6cbd10752a5d65c945e6a514015c Author: Naomi Luis Date: Wed Jun 2 15:19:03 2010 -0700 msm: kgsl: Use the kgsl clock names from the platform data handle Obtain the clock names for the imem, 2D and 3D graphics cores from the kgsl platform data handle. Change-Id: I571e76ec5a8b2953816db8252d329469dce940e6 Signed-off-by: Naomi Luis commit eb1144f426c350e8a0e7d57f0cc46b5d1e34af67 Author: Abhijeet Dharmapurikar Date: Thu Jun 3 11:14:34 2010 -0700 mm: dma_cache operations for non linearly mapped buffers dma_cache_*_ops() perform cache maintenance operations on linearly and non-linearly mapped buffers. Change-Id: Ifa726807e5f378dac4dd6eac1e5bd6e4d3c07216 Signed-off-by: Abhijeet Dharmapurikar commit 4b4dff85d0514e7479eaec9db457854746ef68f4 Author: Stephen Boyd Date: Mon May 10 13:49:16 2010 -0700 msm: clock-7x30: Add const qualifier to variables Most of the data in this file shouldn't be modified during kernel execution thus add the const qualifier to mark it as read-only. Change-Id: Idc8182061510ffb54f9c4d334d11dba4e81700dc Signed-off-by: Stephen Boyd commit d0dc160be8103d92217a2415b7ad1c6e9c145d5b Author: Larry Bassel Date: Thu May 27 10:39:59 2010 -0700 arm: perform a dmb in do_cache_op() on MSM 7x27 The ARM-specific cacheflush system call allows userspace to flush the cache for a specified address range. The kernel performs the cache flush on behalf of the user. On MSM 7x27, this cache flush must also flush the AXI bus buffer (or there may be data corruption), which can be done in several ways, including performing a dmb(). Change-Id: Ic4e91756ef67d8595132dcec5e74ee6cb26ae8ce CRs-Fixed: 236162 Signed-off-by: Larry Bassel commit ebc0b72b9315a4c0a7de7969451ef4cc7e976f2d Author: Naomi Luis Date: Wed Jun 2 15:14:41 2010 -0700 msm: Add kgsl clock names to the platform data and handle Add the names of the clocks used by the kgsl in the platform data structure and handle. Change-Id: I8719534cd3f589ee8692419ea6c0131220d49353 Signed-off-by: Naomi Luis commit 2b27b56d4f97fe697dc9348b5184f51bd914f923 Merge: 71127ff add587d Author: Murali Palnati Date: Thu Jun 3 09:11:31 2010 -0700 Merge "msm: kgsl: Fix to initially set 2D core to its max freqency" into android-msm-2.6.32 commit 71127ff47679570885934ffa4875e452f73b3e70 Merge: deed33f 8856ee9 Author: Trilok Soni Date: Thu Jun 3 05:13:16 2010 -0700 Merge "include: pmic8058-pwm.h: fix name and comment for usec" into android-msm-2.6.32 commit deed33fe51b857d68b4b5e9e36db64500195e72d Merge: 6f663b4 b87fa48 Author: Trilok Soni Date: Thu Jun 3 05:13:06 2010 -0700 Merge "defconfig: Enable remote storage RPC client for 7x30 and 7x27" into android-msm-2.6.32 commit 6f663b4509e1718297fe04a959e8de5f8389d3d7 Merge: 2fe42a6 b6c7331 Author: Trilok Soni Date: Thu Jun 3 05:12:54 2010 -0700 Merge "arm: msm: Disable non-TLMM goog_*_chip during CONFIG_GPIOLIB." into android-msm-2.6.32 commit 2fe42a6b789f6e5719181bdc04b3a39b73bf0711 Merge: e3df926 1998ae3 Author: Trilok Soni Date: Thu Jun 3 05:12:43 2010 -0700 Merge "msm: 7x30 pm8058 pwm: add 7x30 pwm 'enable' callback" into android-msm-2.6.32 commit e3df926927fae8b0b7c737dc703af0ad16f3b8c1 Merge: 8aea2d8 ec961a2 Author: Trilok Soni Date: Thu Jun 3 05:12:29 2010 -0700 Merge "misc: pmic8058-pwm: add 'enable' callback" into android-msm-2.6.32 commit 8aea2d8219c28788e732b24996476f2451392c0c Merge: 12669d3 32c63ff Author: Trilok Soni Date: Thu Jun 3 05:12:15 2010 -0700 Merge "mfd: pmic8058: add support to use MISC register" into android-msm-2.6.32 commit 12669d3f8bca41df51264145b92efa03445f2d3f Merge: ff6a489 0600a30 Author: Murali Palnati Date: Thu Jun 3 03:59:13 2010 -0700 Merge "i2c-msm: Use mod_timer since xfer routine is same for 2 adapters" into android-msm-2.6.32 commit ff6a48932d2b88805870fb1a5edc16b5696bbd58 Merge: 2c970e3 df7964f Author: Murali Palnati Date: Thu Jun 3 03:59:07 2010 -0700 Merge "USB: Partially Revert a commit for original usb changes" into android-msm-2.6.32 commit a85fd0ab6484eb2ef404c062adffce1ee22337f1 Author: Lena Salman Date: Thu Jun 3 13:57:02 2010 +0300 spi_qsd: Add support for QUPe controller QUPe controller is a new version of Qualcomm SPI controller. The controller also supports other peripheral protocols, however its SPI functionality is very similar to previous SPI core, supported by spi_qsd. Therefore the same driver is being utilized with some register address modification and minor flow change. Change-Id: Ic091ef2c2ed699b43f786c278b613e69a7e9039b Signed-off-by: Lena Salman commit 239c728e78b5c2e8b5e0d4119c7c98fa661af93d Author: Chiranjeevi Velempati Date: Thu Jun 3 15:13:34 2010 +0530 tty: Allow RI, DSR and CTS modem status bits in tiocmset Allow modem status bits like RI, DSR and CTS in tiocmset. TTY drivers, for example USB function serial driver, which talks to DCE on behalf DTE and running in DCE are interested in these bits. Signed-off-by: Pavankumar Kondeti Signed-off-by: Chiranjeevi Velempati commit 0600a3051b135bb1fc28fd5ca15f4aaa6c120696 Author: Sagar Dharia Date: Wed Jun 2 18:34:42 2010 -0600 i2c-msm: Use mod_timer since xfer routine is same for 2 adapters add_timer API should be used only to add a new timer. Since msm_i2c_xfer is same for 2 adapters (primary and secondary lines of MSM I2C controller), there exists a condition (when transaction on both adapters will call msm_i2c_xfer) where the timer needs to be modified and not added. CRs-fixed: 240987 Change-Id: Ib1a608e5f0dfe052eef447fdffe4ed2942b9fb7f Signed-off-by: Sagar Dharia commit 8856ee9c2e414dfe4ef80809b420edf85e993f52 Author: Willie Ruan Date: Wed Jun 2 16:24:14 2010 -0700 include: pmic8058-pwm.h: fix name and comment for usec Change-Id: I909425f7a55487cdabc0ddd4b9325edf3e01ee0f Signed-off-by: Willie Ruan commit 1998ae383071786cadc05b8841f8fc4fa8be1fae Author: Willie Ruan Date: Wed May 26 17:22:57 2010 -0700 msm: 7x30 pm8058 pwm: add 7x30 pwm 'enable' callback Using pm8058_pwm_set_dtest for channel 7 is 7x30 board specific and pm8058 chip specific. Thus it is better to be called in the pm8058_pwm_enable callback. Remove the mutex in the function to avoid deadlock. Change-Id: If05b84d3cf0a7aee73469c37b646a10ef46a5e00 Signed-off-by: Willie Ruan commit ec961a286915ecfedb56b1727276915f10523a83 Author: Willie Ruan Date: Wed May 26 16:56:53 2010 -0700 misc: pmic8058-pwm: add 'enable' callback Some PWM channels could have board specific enable and disable function. Adding this callback will provide an easy way to handle such situation. The callback will be executed first for pwm_enable and last for pwm_disable. Change-Id: I2d0d30410cf6a68030eaeba649ee680a8433afab Signed-off-by: Willie Ruan commit b9ce7889bea7a53adc333f86597e4088d4efc341 Author: Ravishangar Kalyanam Date: Mon May 10 13:21:06 2010 -0700 msm: video: Add VC1 decoder support in Decoder driver Add VC1 decoder support in Core driver to decode the Simple, Main and Advanced profile clips Change-Id: Ib44cbc3e9b0a26c0d0695b781310a496770a10f6 Signed-off-by: Ravishangar Kalyanam commit 2c970e38fe13d77a00323897ac62a15423996329 Author: Abhijeet Dharmapurikar Date: Tue Jun 1 13:28:42 2010 -0700 msm_fb: make 8660 backlight work with new pwm api The pwm api changed to use a callback function in the board file and to specify the pwm duty cycle and period in terms of usecs instead on nsecs. Update the 8660 display to work with it. Change-Id: Idfc67a88261ac099c50214d61ac55dbc0311d405 Signed-off-by: Abhijeet Dharmapurikar commit b6c73316aceb9a37a1cf07492728af0f8ab05f7e Author: Gregory Bean Date: Thu May 27 15:26:16 2010 -0700 arm: msm: Disable non-TLMM goog_*_chip during CONFIG_GPIOLIB. Prevent compilation and probing of the google gpio_ and irq_chips when CONFIG_GPIOLIB is on, to prevent conflicts. Change-Id: Ie311f1e2e7d789f649a9fe2039a245bd6ec93757 Signed-off-by: Gregory Bean commit 32c63ff5821b2b5f8415bdbdadaaa81a4dea981f Author: Willie Ruan Date: Mon May 24 17:36:35 2010 -0700 mfd: pmic8058: add support to use MISC register PM8058 chip has a MISC (addr=0x1CC) register to select UART path, which can select TX1/RX1, TX2/RX2, TX3/RX3 or none. This can be used for one serial driver to control different devices like IrDA and FeliCa. Change-Id: I4c62104620db8c578ab95460c5107d6e117b1468 Signed-off-by: Willie Ruan commit add587d1b37627094bfc2128c8344ed7cdab89c2 Author: Lucille Sylvester Date: Fri May 28 14:17:19 2010 -0600 msm: kgsl: Fix to initially set 2D core to its max freqency A bug left the 2D core at its default speed. Now it will be set to its platform dependent max frequency request. Change-Id: I9f41c3ed63973c1727be83b47bce0299da15ec16 Signed-off-by: Lucille Sylvester commit df7964fea8d80d32d427b38c7ba2914cba5ddc10 Author: Chiranjeevi Velempati Date: Wed Jun 2 17:56:17 2010 +0530 USB: Partially Revert a commit for original usb changes This commit partially reverts 112595d2baa0a127f3f4fef3995d8f20ad49a952 commit for bringing back original usb changes that were overwritten as part of .32 merge. Change-Id: I921efc60a393b46675f75dd6dffca6c5cd84ba24 Signed-off-by: Chiranjeevi Velempati commit b87fa480d01b226eeeae7e060fac2780bf04d82f Author: Sahitya Tummala Date: Wed Jun 2 17:25:14 2010 +0530 defconfig: Enable remote storage RPC client for 7x30 and 7x27 Change-Id: I065d1ac8ab050beb262b5938301850a34327601d Signed-off-by: Sahitya Tummala commit c712c7650e86ec86499b1f8b27a8fbe2d3a9f836 Merge: de57c70 a7c152d Author: Murali Palnati Date: Wed Jun 2 02:50:32 2010 -0700 Merge "defconfig: update the config UEVENT_HELPER_PATH" into android-msm-2.6.32 commit de57c7022a80e88895cbcfba8dbbfb1cf20b24b0 Merge: 99136c0 c86e82e Author: Murali Palnati Date: Wed Jun 2 02:03:20 2010 -0700 Merge "msm: rpc: Protect local client list from race condition" into android-msm-2.6.32 commit 99136c01c3f1b8dcd8307821f5905d8396497dc0 Merge: 743b531 d939755 Author: Murali Palnati Date: Wed Jun 2 02:02:32 2010 -0700 Merge "radio: tavarua: Setup FM Rx audio path when FM receiver is enabled" into android-msm-2.6.32 commit a7c152df6b3078e7ffe992bfd7f48bb33e5f1311 Author: Pavankumar Kondeti Date: Tue Jun 1 10:26:35 2010 +0530 defconfig: update the config UEVENT_HELPER_PATH For every uevent the kernel forks a helper program in user space as defined by UEVENT_HELPER_PATH to handle the event. This is currently defined to "/sbin/hotplug". But on Andriod, there is no support of /sbin/hotplug and all uevents will be handled by a few other andriod utilities/services which doesn't require any invocation from kernel. Hence, update UEVENT_HELPER_PATH to "" for all Android defconfigs. Change-Id: Ia4e9afce0cefcd21ad700767a9c612f6cdf3d3e3 Signed-off-by: Pavankumar Kondeti commit 743b531a2a9ac276173b4efca3fdb92afba6cff4 Merge: 3a48e46 6ece240 Author: Murali Palnati Date: Tue Jun 1 21:27:46 2010 -0700 Merge "msm: 7x27: Setup Zero Page required for barriers and cacheops" into android-msm-2.6.32 commit 3a48e4661aa2aaf147687d0555416d8a10efb9f6 Merge: b73f1e7 8bbb084 Author: Steve Muckle Date: Tue Jun 1 15:47:44 2010 -0700 Merge "msm: display: backlight intensity" into android-msm-2.6.32 commit b73f1e7878a5b04f3c4b390bf129678b702655aa Merge: c988fe5 3ad69d1 Author: Steve Muckle Date: Tue Jun 1 15:47:22 2010 -0700 Merge "defconfig: msm8660: turn on display" into android-msm-2.6.32 commit c988fe556036e241046c11fd0211fa2b9042e20b Merge: 50e8cbd d4ac1bb Author: Steve Muckle Date: Tue Jun 1 15:47:10 2010 -0700 Merge "video: msm: remove suspend_late, resume_early initializations" into android-msm-2.6.32 commit 50e8cbd591ce3a58ec612d2b81da802d9728265f Merge: 7df88cf f95c6bd Author: Steve Muckle Date: Tue Jun 1 15:46:55 2010 -0700 Merge "msm_fb: display: Add panel driver for wsvga display" into android-msm-2.6.32 commit d9397555f617b2eb8afa748a8a35b7097098a360 Author: David Scherba Date: Tue Jun 1 18:13:27 2010 -0400 radio: tavarua: Setup FM Rx audio path when FM receiver is enabled Default FM Rx audio output path is set to analog. This is changed to digital I2S when the FM receiver is successfully enabled. Change-Id: I519c67dc3262bf7258a87d86b5ede05c0dc4d544 Signed-off-by: David Scherba commit 7df88cf79965ee19bb42eabbb9c734991541130f Merge: 5d30a06 404c287 Author: Steve Muckle Date: Tue Jun 1 15:45:55 2010 -0700 Merge "msm_fb: display: set mdp core clock rate from the board file" into android-msm-2.6.32 commit 6ece2401d2572e255e044c16b64cfdb524da1fe3 Author: Naveen Ramaraj Date: Wed May 26 14:14:06 2010 -0700 msm: 7x27: Setup Zero Page required for barriers and cacheops A Zero page is required to simulate a write to a strongly ordered memory location to flush the AXI bus buffer in 7x27. The various barriers and cache operations depend on this page being available when write_to_strongly_ordered_memory() is invoked. Since barriers can be called from interrupt contexts this zero page should be initialized prior to any of these calls. Change-Id: Ie82c5dfe4ac1706a8e2fcbbf9ffeda4d1dfaee71 Signed-off-by: Naveen Ramaraj commit 8bbb084294c576722b05e5d941528f5cf129bffd Author: Abhijeet Dharmapurikar Date: Wed Apr 14 12:42:37 2010 -0700 msm: display: backlight intensity Update the panel driver to handle backlight intensity calls using pmic's pwm channels. Change-Id: I3c63588e5244748da5461e43f7f0831ddf635c5c Signed-off-by: Abhijeet Dharmapurikar commit 3ad69d1fb88142a3191d01e28d04cc4c37ab2d4a Author: Steve Muckle Date: Wed May 12 22:44:40 2010 -0700 defconfig: msm8660: turn on display Change-Id: I9b85d2acf71f4a708b4ab6cea73eee91ff0368fe Signed-off-by: Steve Muckle commit 5d30a06fa0669572acfe826d5fc998703f38f641 Merge: c371a14 8205063 Author: Steve Muckle Date: Tue Jun 1 14:18:00 2010 -0700 Merge "msm: 8x60: add devices and board definitions for display" into android-msm-2.6.32 commit c371a14a8542fe12f74d7a8dbe40b4f1d0cf7e24 Merge: 7bd283c 0956bcd Author: Neil Leeder Date: Tue Jun 1 13:59:54 2010 -0700 Merge "camera: Fix redefinition errors with time.h inclusion" into android-msm-2.6.32 commit c86e82e5b940ae797e751e2de0afc4c24808d14c Author: Karthikeyan Ramasubramanian Date: Tue Jun 1 13:46:04 2010 -0600 msm: rpc: Protect local client list from race condition During removal of clients, use locks to protect local client list from race condition. Change-Id: Ia93bbe0440b0beffe30f3cd7d541623e7ab963ad Signed-off-by: Karthikeyan Ramasubramanian commit d4ac1bbc8a7a10d457f5809728a481656a64da3b Author: Steve Muckle Date: Wed May 12 22:43:25 2010 -0700 video: msm: remove suspend_late, resume_early initializations The platform_driver struct does not have suspend_late or resume_early data members. Change-Id: Ice92977de598fd4bad6f607a8b1e1fc97e03b826 Signed-off-by: Steve Muckle commit f95c6bd8c07d38466c51d2c245aeaac3aac189d8 Author: Abhijeet Dharmapurikar Date: Fri Apr 2 13:11:55 2010 -0700 msm_fb: display: Add panel driver for wsvga display Add code for the Samsung's wsvga panel (part number LTS480WS-C01). It has a resolution of 1024 x 600 pixels, runs over an LVDS interface and accepts RGB666 pixel data. Change-Id: I399a0c08257a645fe205d5f3cb766e7dfbf20121 Signed-off-by: Abhijeet Dharmapurikar commit 404c2879aa60104da586011fc5504163cc5143b4 Author: Abhijeet Dharmapurikar Date: Fri Apr 2 13:48:49 2010 -0700 msm_fb: display: set mdp core clock rate from the board file Rather than hard-coding core clock's rate, set it to a value passed from the board file. If it isn't set then the mdp core clock was not meant to be set with a rate on that board. Change-Id: Ic7ca1b830a8b1bf4bedb9449e58b7f4b58424019 Signed-off-by: Abhijeet Dharmapurikar commit 82050635ce4d013e1594970dfc446194d53cc4b2 Author: Abhijeet Dharmapurikar Date: Fri Apr 2 13:07:50 2010 -0700 msm: 8x60: add devices and board definitions for display Change-Id: I9579c6a8c9f9b90aeefa6a763aeb5a2b58ec84e1 Signed-off-by: Abhijeet Dharmapurikar commit 7bd283c0076a5815d726debc40c9d5bba134264c Merge: 3abe362 a422c79 Author: Neil Leeder Date: Tue Jun 1 11:02:26 2010 -0700 Merge "USB: gadget: Add compilation support for RNDIS" into android-msm-2.6.32 commit 3abe362a1e0e2e5f1aaf7a7b6a61912a8ab47813 Merge: de7ea7f 758bf59 Author: Neil Leeder Date: Tue Jun 1 11:01:15 2010 -0700 Merge "msm: change remote storage RPC server as RPC client" into android-msm-2.6.32 commit 758bf591a1aa64f44dab38ac71be2cc94947894c Author: Sahitya Tummala Date: Tue Mar 16 22:49:54 2010 +0530 msm: change remote storage RPC server as RPC client Implement remote storage RPC client to interact with RPC server on other processor. The RPC client registers a callback for each service provided by apps processor with the RPC server. Upon any request from server, the client parses the parameters and passes over the request to a user space application. The user space application performs operations like open, close and write to its corresponding partition on an eMMC card. The driver provides an ioctl interface to interact with the user space program. It uses the new RPC client framework and marshalling support added in the kernel. Change-Id: Ia5b3cdac055fa32f6752b81383ea8c5977b6342f Signed-off-by: Sahitya Tummala commit de7ea7fd6f2706785376cb50f796e446ce3da0ba Merge: fd2ec3d eb44d24 Author: Murali Palnati Date: Tue Jun 1 06:28:36 2010 -0700 Merge "usb: msm_otg: define msm_otg platform data in otg data strcuture" into android-msm-2.6.32 commit fd2ec3dad34fda4b2566f31c32cbc278f62387d6 Merge: 256f7d9 80a302d Author: Murali Palnati Date: Tue Jun 1 05:24:36 2010 -0700 Merge "defconfig: automatic update" into android-msm-2.6.32 commit eb44d24f8df49f30f5050df11c449faa49133030 Author: Anji Jonnala Date: Tue Jun 1 15:14:20 2010 +0530 usb: msm_otg: define msm_otg platform data in otg data strcuture Some of the fields in msm_otg data structure are just duplication of otg platform data.Instead of defining these fields in both otg platform data and otg data, define a pointer to otg platform data in otg data structure and use directly. Change-Id: I21e61c557524e575322cadd188b0a6a09e47523b Signed-off-by: Anji Jonnala commit 256f7d950a7cc904334f0c1f160c23375731e4f4 Merge: 669b7d5 838d0b2 Author: Murali Palnati Date: Tue Jun 1 00:13:35 2010 -0700 Merge "msm: alsa: 7x30: Fix the wrong check in trigger routine." into android-msm-2.6.32 commit 669b7d5e3d63de42adbafd82e3000454ba176025 Merge: ed34794 bf54b5a Author: Trilok Soni Date: Mon May 31 20:39:50 2010 -0700 Merge "msm: clock-8x60: Add #define's for all register addresses" into android-msm-2.6.32 commit aa30b595dca00a402e5f9ef32f0efab0f61c80cd Author: Trilok Soni Date: Wed May 19 15:08:07 2010 +0530 input: pmic8058_keypad: Add ghost key detection support CRs-Fixed: 229890 Change-Id: I2c9845bdba64735a5591895fa3843bbc0020e4bb Signed-off-by: Trilok Soni commit 80a302d56e576a254d57bc961894f0cb00761258 Author: Asish Bhattacharya Date: Mon May 31 15:23:02 2010 +0530 defconfig: automatic update Change-Id: I7d815cd313b6df52885a023b499d9407d0cfcf92 Signed-off-by: Asish Bhattacharya commit ed347946b5d2efa4e230ae98a84fbed095323309 Merge: f6d2ff0 0ceb5aa Author: Asish Bhattacharya Date: Mon May 31 02:46:31 2010 -0700 Merge "msm: clock-8x60: Add support for smmu_jpegd_clk and smmu_vfe_clk" into android-msm-2.6.32 commit f6d2ff0cca9282f2b89c3664430da32a40183852 Merge: 8eca23d 2d300cd Author: Asish Bhattacharya Date: Mon May 31 02:45:54 2010 -0700 Merge "msm: pmic8058-mpp: add gpiolib support for mpp config" into android-msm-2.6.32 commit 838d0b2a479cb8408a5459fcc972254f4066c20b Author: Asish Bhattacharya Date: Fri May 28 18:40:05 2010 +0530 msm: alsa: 7x30: Fix the wrong check in trigger routine. Problem The driver checks wrong flag in trigger routine. This results in wrong state if the interrupt comes from dsp before the trigger start. The issue is reproducible if we play audio via alsa utils over serial console. Impact The driver does not play audio if there is lot of delay in user space to dump data from user space. Solution Correct check in driver shall resolve the issue as it wouldn't check the outneed flag if the playback is in non mmap interface. Change-Id: I6da4368dea1e729e291fa0aacaaeb66df7474874 Signed-off-by: Asish Bhattacharya commit 0956bcd8f0485e2d1ed4c9cb0806d91a4b9f551a Author: Lakshmi Narayana Kalavala Date: Thu May 27 14:41:37 2010 +0530 camera: Fix redefinition errors with time.h inclusion The header file msm_camera.h is common include for kernel space native camera driver and user space camera application. Compiling userspace application with GCC tool chain throws redefinition errors for struct timespec and struct timeval. To avoid this, MSM_CAMERA_GCC flag is added which allows the time.h file inclusion for GCC toolchain. This flag is enabled in the userspace application makefile used with GCC toolchain Change-Id: I355b1ba4bfbc5994e3345274d72cb4d9588bdb91 Signed-off-by: Lakshmi Narayana Kalavala commit 8eca23d0af4e69443b5d7e4e6b342be716b7f644 Merge: e011572 b1717ee Author: Trilok Soni Date: Fri May 28 19:10:13 2010 -0700 Merge "[ARM] msm: kgsl: bug if we detect a gpu hang" into android-msm-2.6.32 commit 0ceb5aa21570ab48295737344b081da6c90687e2 Author: Matt Wagantall Date: Fri May 28 12:29:55 2010 -0700 msm: clock-8x60: Add support for smmu_jpegd_clk and smmu_vfe_clk The SMMU requires the AXI interface clocks to be enabled at times when the cores associated with them may not be needed. Add support for manual enable/disable control of these clocks. Change-Id: I31412dbb0a0c7c289425ae0cd5852ea2472fd230 Signed-off-by: Matt Wagantall commit b1717ee39cff69d459a6bffd234389cdba6fac26 Author: Dima Zavin Date: Wed Apr 7 00:35:04 2010 -0700 [ARM] msm: kgsl: bug if we detect a gpu hang Change-Id: Ie2272b31b5cd040c9eb45d24ea70eaf1115a7cf9 Signed-off-by: Dima Zavin [sadas@codeaurora.org: changed Change-Id to allow reupload of the change] Signed-off-by: Shubhraprakash Das commit e0115721e85e0f93d4f03e34cc5235dcf9f2fa8d Author: Ashish Singhal Date: Fri May 28 14:19:56 2010 -0600 defconfig: Add flip switch state, SMD_PKT and GPIOlib Configs for GPIOLIB are not set as of now. Change-Id: I88ef0d3619bf738f5e79bc2354f3dd5bee99eb46 Signed-off-by: Ashish Singhal commit 2d300cdc72bbb998ba520db82b0254ea4daa1ebb Author: Bobby Crabtree Date: Fri May 28 11:05:26 2010 -0700 msm: pmic8058-mpp: add gpiolib support for mpp config pm8058_mpp_config doesn't link when GPIOLIB support is enabled. This patch resolves that issue. Change-Id: I0710999f54f003cd8df25c748cd023826c7ae857 Signed-off-by: Bobby Crabtree commit 51f165dbd914977d149504ece765b33e4dc5465d Author: Shubhraprakash Das Date: Thu May 27 15:24:28 2010 -0600 msm_kgsl: Invalidate base address Context switch base addresses need to be invalidated when tlb is flushed or page table is changed, otherwise the GPU may use old base addresses which are incorrect. Change-Id: Ia9fad16977b2f03fdc01471e47e843b0c14672f7 Signed-off-by: Shubhraprakash Das commit 4b2f06d766e50a2e88a55fef3300e0fd4519a95b Merge: 5a6a23e 9041689 Author: Brent Degraaf Date: Thu May 27 18:05:37 2010 -0700 Merge "msm: pm: add 'cpu' argument for calling acpuclock functions." into android-msm-2.6.32 commit 5a6a23e9844e2782524e0dbc8fb3d715a3161c00 Merge: b133a8d d19d5db Author: Brent Degraaf Date: Thu May 27 18:04:25 2010 -0700 Merge "msm_kgsl: Workaround for rbbm read errors and spurious interrupts" into android-msm-2.6.32 commit b133a8d4cb809af78b677bfcd4b8d223ad751b1c Merge: b748198 bf08a4a Author: Trilok Soni Date: Thu May 27 07:06:35 2010 -0700 Merge "defconfig: 8x55 SVLTE, SDIO Abstraction and SDIO for RMNET" into android-msm-2.6.32 commit b748198bf29a2e9a458fd911ca9102a53b659ef4 Merge: 6f0d530 43be50a Author: Trilok Soni Date: Thu May 27 07:05:32 2010 -0700 Merge "defconfig: msm8660: enable diag" into android-msm-2.6.32 commit 6f0d530173b5372c5a99c69af11f390393774497 Merge: 8c52b45 7fecbd1 Author: Murali Palnati Date: Thu May 27 05:04:38 2010 -0700 Merge "msm: 7x30: Add flip switch platform device" into android-msm-2.6.32 commit 8c52b4500da7a366b1ed19037c6df991b4256bff Merge: 588f1d3 9a76cf0 Author: Murali Palnati Date: Thu May 27 05:04:14 2010 -0700 Merge "input: flip_switch: Add flip switch state detection driver" into android-msm-2.6.32 commit 588f1d3b9694fc4e581b081d5f1e57de8d471ed5 Merge: 9a19949 c3fdbc0 Author: Murali Palnati Date: Thu May 27 04:11:59 2010 -0700 Merge "diag: Increase max client limit for DIAG driver" into android-msm-2.6.32 commit 9a19949f1a36faf9d6404f24a2d7001e7cd2dcbe Merge: 2c729be eff56b7 Author: Murali Palnati Date: Thu May 27 04:11:38 2010 -0700 Merge "regulator: pmic8901-regulator: Add support for PMIC8901 regulator" into android-msm-2.6.32 commit 2c729bec70b4efe887253dbf5b2854451eb742b5 Merge: d3d1eca f5509e71 Author: Murali Palnati Date: Thu May 27 04:11:21 2010 -0700 Merge "EHCI: msm: keep AXI bus frequency at maximum during bus suspend" into android-msm-2.6.32 commit d3d1eca2574752e25549e9b52930cff32ca5411f Merge: bf54140 95cae0b Author: Murali Palnati Date: Thu May 27 04:11:11 2010 -0700 Merge "msm: audio: qdsp5v2: Cleanup LPA Decoder Driver" into android-msm-2.6.32 commit bf541406fc99f0b95e95f8f25c0d0cec040c18b3 Merge: 4ab5c80 e9ebc07 Author: Murali Palnati Date: Thu May 27 04:11:02 2010 -0700 Merge "arm: msm: allow CONFIG_GPIOLIB to be enabled." into android-msm-2.6.32 commit 7fecbd1a5477826271491052b37a6c28516f7799 Author: Mohan Pallaka Date: Thu May 6 12:57:04 2010 +0530 msm: 7x30: Add flip switch platform device Add flip switch support which is present on pmic keyboard connected through PMIC8058 MPP. Change-Id: I6749d69f9cabc00be86a630b91ac2380ef9dae51 Signed-off-by: Mohan Pallaka commit 9a76cf0882d92c57dbdf99e650fe36508fe1466f Author: Mohan Pallaka Date: Thu May 6 12:35:13 2010 +0530 input: flip_switch: Add flip switch state detection driver PMIC8058 based keypad used with MSM7x30 has flip switch connected over PMIC8058 MPP pin. This switch when pressed towards left is used for indication to enable left side QWERTY keypad and for the right side it is used to indicate alpha-numeric keypad. This driver doesn't load new keymap based on the status of the flip switch, as this switch can be used for other usecases as well. So, userspace application framework has to read the switch status over input device node and load the new keymap using setkeycode and getkeycode functionality of linux input framework. CRs-Fixed: 211770 Change-Id: Iac921b83cf47e303e34359cb075c51c05904299c Signed-off-by: Mohan Pallaka commit 4ab5c80ef7bfcd1ab7dc900ad9d673a4f2233b2b Merge: 2641617 a323271 Author: Trilok Soni Date: Thu May 27 01:48:57 2010 -0700 Merge "msm: kgsl: Support per-process pagetable for the 2D graphics core" into android-msm-2.6.32 commit 264161716304773860b41ca79bc1e713fc2128de Merge: cf47629 11772ad Author: Trilok Soni Date: Thu May 27 01:48:19 2010 -0700 Merge "msm: 7x30: Decrease pmem_adsp size from 32MB to 24MB" into android-msm-2.6.32 commit cf47629cfe0ab751a282e71ff49f2b5d77cfdaf1 Merge: 6df9057 60155dc Author: Trilok Soni Date: Thu May 27 01:47:47 2010 -0700 Merge "[ARM] msm_fb: remove lock_fb_info() for private driver ioctl" into android-msm-2.6.32 commit 9041689c1fd4d03f5f37091aa911099e8125cb73 Author: Naseer Ahmed Date: Thu May 27 11:38:37 2010 +0530 msm: pm: add 'cpu' argument for calling acpuclock functions. To support frequency control of multiple application processors, acpuclock APIs were extended to take an additional 'cpu' argument. Add the 'cpu' argument where we are calling the acpuclock functions. Change-Id: Ie11c8a47222bfce06040f56fb4686f434164b96f Signed-off-by: Naseer Ahmed commit f5509e71c39ba363c4599cc9011ef5989ebcc483 Author: Pavankumar Kondeti Date: Mon May 17 20:46:19 2010 +0530 EHCI: msm: keep AXI bus frequency at maximum during bus suspend USB core suspends the bus if all the interfaces of the attached device are idle for 2 sec and respective drivers support auto suspend. Phy stuck issues are observed during bus suspend with peripherals attached. Workaround this by keeping AXI bus frequency at maximum during bus suspend. Change-Id: Ia270b4de0801b47d9381751a6cb3f02667c2a135 Signed-off-by: Pavankumar Kondeti commit 43be50a2de54163c1cc505a079589da7ee55d9be Author: Shalabh Jain Date: Wed May 26 11:58:47 2010 -0700 defconfig: msm8660: enable diag Change-Id: I93434b3200591677fc2b71faee78b36a50b26ff9 Signed-off-by: Shalabh Jain commit c3fdbc00dded0324c6c2695ee903329effdfbc66 Author: Shalabh Jain Date: Wed May 26 18:27:56 2010 -0700 diag: Increase max client limit for DIAG driver With the increase in number of technologies using DIAG on Linux Apps Processor, we need to raise the cap on number of clients. Now at least 15 modules can simultaneously use DIAG APIs. Change-Id: I05b231ab411cd95f299e05b5788552218b2a2587 Signed-off-by: Shalabh Jain commit bf08a4a8a0245a52ae535da2528b674b2bdd48f5 Author: Ashish Singhal Date: Wed May 26 18:00:36 2010 -0600 defconfig: 8x55 SVLTE, SDIO Abstraction and SDIO for RMNET Change-Id: I76c204ac58f95f9fb8b9fbd776e0ccea507a4cd6 Signed-off-by: Ashish Singhal commit 6df90577c2accbaa2c494c27f46224a7adadc94f Author: Jeff Ohlstein Date: Wed May 26 16:52:10 2010 -0700 defconfig: Turn on CONFIG_HOLES_IN_ZONE on 8x60 Change-Id: Ib4d1080bd03347e090a6e965d95c5635701c4869 Signed-off-by: Jeff Ohlstein commit eff56b70e91001bd64f3bb587d2d5d9f4cee6e05 Author: Bobby Crabtree Date: Thu May 13 15:01:53 2010 -0700 regulator: pmic8901-regulator: Add support for PMIC8901 regulator On 8x60 PMIC LDO/SMPS/LVS are controlled from the apps processor. This driver talks directly to the PMIC over SSBI through the PMIC8901 core driver. This driver utilizes the regulator framework to enable, disable, and change regulator voltage levels. Change-Id: I21c272a490a2526c2fde9fe3ef7590a57418269a Signed-off-by: Bobby Crabtree commit 56918c1ac51559f00e30149e05fba459ef585c40 Merge: 04627ee af5721f Author: Sridhar Parasuram Date: Wed May 26 13:54:11 2010 -0700 Merge "msm: sdio: Abstraction layer unit test." into android-msm-2.6.32 commit 04627eea18f5adffe37f21396c47d01c3b5fbd6f Merge: 53d4f26 5566ea3 Author: Sridhar Parasuram Date: Wed May 26 13:53:56 2010 -0700 Merge changes I1b6c45e8,I0b0cea7a into android-msm-2.6.32 * changes: msm: RMNET driver for SDIO interface msm: RMNET SDIO Data Mux module. commit d19d5db81879909329bc6f55af0349fb7f02b822 Author: Shubhraprakash Das Date: Tue May 25 15:40:23 2010 -0600 msm_kgsl: Workaround for rbbm read errors and spurious interrupts Sometimes read errors are generated from rbbm while trying to read the CP interrupt status register. Also, there is a delay between acknowledging CP interrupts and the master interrupt line going down which causes spurious interrupts to be generated. Hence, we loop a finite number of times to successfully read the interrupt status register to workaround the above mentioned problems. Change-Id: Iff8f8c71777ad4ada32bef6bb15f4e0d00964638 Signed-off-by: Shubhraprakash Das commit e9ebc078ce9b47078ec0553da72ecf05c470ab48 Author: Gregory Bean Date: Mon May 24 15:49:33 2010 -0700 arm: msm: allow CONFIG_GPIOLIB to be enabled. Add the ability for gpiolib to be enabled on Qualcomm's MSM targets. If GPIOLIB is not enabled, the system will fall back to the legacy Google-gpiochip implementation. Change-Id: Ibc5149d02f5324b9feec771749210067365fbff6 Signed-off-by: Gregory Bean commit 11772add5d941db28f46370dc0468e4966069c2a Author: Dinesh Garg Date: Tue May 25 17:51:57 2010 -0700 msm: 7x30: Decrease pmem_adsp size from 32MB to 24MB Worst case scenario with maximum pmem memory consumption is camcorder which works fin with 24MB pmem_adsp. Decrease the size of pmem_adsp device such that the remaining memory gets available in the userspace. Change-Id: I5ad92c62ba7278c32d9da3e0916c6fab633da116 Signed-off-by: Dinesh Garg commit af5721f72884ad9b3e76391f28b01551e75b6730 Author: Amir Samuelov Date: Wed May 26 12:17:19 2010 +0300 msm: sdio: Abstraction layer unit test. This module is for testing the SDIO-Abstraction-Layer. The testing requires Qualcomm SDIO-Card on the other end of the bus. The test can be used in the following ways: 1. Loopback - The SDIO-Card performs a loopback on SDIO RPC Channel. 2. Sender - The SDIO-Card send SYNC data on the QMI channel, and receive the same data back. Loopback on the SDIO-Client side. 3. Performance - The SDIO-Card send ASYNC data on the RMNET channel, and receive any data back. Loopback on the SDIO-Client side. Change-Id: I190e16cb7c346bb3a95cd90a15546742848be907 Signed-off-by: Amir Samuelov commit a323271cd307e5fdc136e334ae16deb4d6679ebc Author: Jon Ashburn Date: Wed May 26 10:26:47 2010 -0600 msm: kgsl: Support per-process pagetable for the 2D graphics core This patch, along with associated user driver patch, allows the 2D Z180 MMU to use per-process pagetables instead of a single global pagetable for all processes. Per-process pagetable is still CONFIGed to be off by default. Once it is enabled, then it will work for 2D graphics using Z180. Change-Id: Ifbfd88c0ce9881350723cf363bbc1f59990a35d4 Signed-off-by: Jon Ashburn commit 53d4f265a3e35857eb06b2f5757c870db7b53fc0 Author: Ashish Singhal Date: Tue May 25 20:40:40 2010 -0600 defconfig: Add options from msm7630-perf to msm8655-sr defconfig All new options are left unset. Change-Id: I771669ca3337b3c60d483d5ae045cce08ace1439 Signed-off-by: Ashish Singhal commit 22f8ae60a0d27561b40c525b43e35b2bfb023052 Author: Trilok Soni Date: Thu May 20 00:23:42 2010 +0530 mfd: marimba-tsadc: Make TSSC as sub-device of TSADC TSSC (Touchscreen controller) resides on MSM and it is memory mapped, whereas TSADC (Touchscreen ADC) resides on external Marimba chip, and driven over SSBI bus. TSADC driver is designed as sub-device driver of Marimba and TSSC driver is as standard platform bus driver, but there is no linkage between ADC and TSSC driver because we can't plug the TSSC directly as sub-device of the TSADC because it is on MSM SoC and memory mapped. TSSC driver should have parent device pointer pointing to the TSADC's device so that kernel PM takes care of suspend/resume sequence and calls the suspend routine of TSADC only after the TSSC has been suspended and reverse for resume cycle. We can't use the MFD apis here because MFD apis mandates that memory mapped resource needs to have the parent memory resource, whereas in our case TSADC doesn't have memory mapped resource and it is over serial bus, so we are adding custom subdev API in the driver which is specific for TSSC. CRs-Fixed: 236365 Change-Id: I061334b3a74d39edb85cf2d7d2fcae9d47c50b94 Signed-off-by: Trilok Soni commit 3e066ca4b3f8c57c1d7db2d4c1dda3713b0c3790 Merge: fff4599 f54ef75 Author: Murali Palnati Date: Wed May 26 04:29:18 2010 -0700 Merge "msm: acpuclock-7x30: Update for new voltage plan" into android-msm-2.6.32 commit fff4599ccace347db101470e9cf966c8be0b5aeb Merge: f83084a 5601a63 Author: Murali Palnati Date: Wed May 26 04:29:09 2010 -0700 Merge "msm: board-7x30: Add support for TSC2007 device" into android-msm-2.6.32 commit f83084a868169da969eee1b2d0d63c38009e74a1 Merge: abb3b08 05a107e Author: Murali Palnati Date: Wed May 26 04:28:33 2010 -0700 Merge "msm: Add configs for 8x55 SVLTE boards" into android-msm-2.6.32 commit abb3b08ac52dbf7e0309bffd312bebf056733d58 Merge: c721415 a3224f7 Author: Trilok Soni Date: Wed May 26 04:14:03 2010 -0700 Merge "Revert "msm_fb: display: add zorder check during overlay_set"" into android-msm-2.6.32 commit 05a107efb9dbf95e825d90218e2f07624089d40f Author: Sahitya Tummala Date: Wed May 26 15:19:57 2010 +0530 msm: Add configs for 8x55 SVLTE boards Change-Id: I5ddc1af78847af59eee07f3cd6f137f5861afe63 Signed-off-by: Sahitya Tummala commit c721415a4acebca6609adef13154e8d233fa0234 Merge: 47af4d0 f704398 Author: Trilok Soni Date: Wed May 26 00:47:25 2010 -0700 Merge "regulator: pm8058-regulator: add support for ncp" into android-msm-2.6.32 commit 5601a63ef6259da3825bfa4a6f76ae31505b5f06 Author: Anirudh Ghayal Date: Mon May 24 20:08:28 2010 -0700 msm: board-7x30: Add support for TSC2007 device CRs-Fixed: 234522 Change-Id: I03940a3504017503a9bb1fa8a28cb49c283a59dc Signed-off-by: Anirudh Ghayal commit 47af4d0d5fb7885c98bfee0feab62111310c4a3b Merge: b477ae7 887fe43 Author: Zach Pfeffer Date: Tue May 25 23:04:09 2010 -0700 Merge "gpio: sx150x: Remove unecessary irq_sense config field." into android-msm-2.6.32 commit b477ae7d346b0578d5b17cf3f85fc8a7374c943d Merge: 9128e41 e63b019 Author: Zach Pfeffer Date: Tue May 25 22:54:34 2010 -0700 Merge "msm: Add SDIO Control Driver to support Control Plane over SDIO." into android-msm-2.6.32 commit 9128e4179916f24688a092689378c49342900ce3 Merge: 12b0008 f75f7cb Author: Zach Pfeffer Date: Tue May 25 22:48:36 2010 -0700 Merge "msm: SDIO-AL for RMNET data." into android-msm-2.6.32 commit e63b019b7d74bb9a330527fdf1d49a6f76aeb908 Author: Karthikeyan Ramasubramanian Date: Sun May 2 02:52:25 2010 -0600 msm: Add SDIO Control Driver to support Control Plane over SDIO. This driver contains SDIO Control Channel Driver & SDIO CMUX Driver. SDIO Control Channel Driver implements Control Port interface to user-space. SDIO CMUX Driver multiplexes control data from multiple SDIO Control Ports onto the SDIO. Change-Id: I25f1e9cf7d8afe969b045dd0331cec6256b603aa Signed-off-by: Karthikeyan Ramasubramanian commit bf54b5a9ba94076fa2909b7a5400eb127ae403c9 Author: Matt Wagantall Date: Thu May 20 00:39:14 2010 -0700 msm: clock-8x60: Add #define's for all register addresses Use of register names instead of hex offsets may make the code easier to understand. Change-Id: I4695a2d0045cc38d465cde159185bf4b6fa653f5 Signed-off-by: Matt Wagantall commit 12b00080601f61c4c93baf2b5fcc39f309547bb9 Merge: d0dfa87 71787df Author: Zach Pfeffer Date: Tue May 25 18:40:55 2010 -0700 Merge "Revert "Merge "defconfig: msm: 7x30: Enable the serial console by default." into android-msm-2.6.32"" into android-msm-2.6.32 commit d0dfa87c3646f80cf34f6a0b17b9bcccce4baa7e Merge: b45d39d 7f06c3b Author: Zach Pfeffer Date: Tue May 25 18:40:39 2010 -0700 Merge "msm: acpuclock-8x60: Decrease max CPU frequency to 1080 MHz" into android-msm-2.6.32 commit b45d39db73ad8dd8a1a5452395013c708982a888 Merge: cb8b3d3 e7fa3c2 Author: Zach Pfeffer Date: Tue May 25 18:40:06 2010 -0700 Merge "msm_kgsl: Flush tlb only before submitting commands to 2D/3D hardware" into android-msm-2.6.32 commit cb8b3d3fe537d7d2ed7e3255277455f14ed06a87 Merge: d67467a afa2a04 Author: Zach Pfeffer Date: Tue May 25 18:39:23 2010 -0700 Merge "msm: clock-8x60: Warn if a clock is enabled before its rate is set" into android-msm-2.6.32 commit d67467a615dca8bff065c181b040f5f45d5be68c Merge: 6c16774 ed8a4b2 Author: Zach Pfeffer Date: Tue May 25 18:39:09 2010 -0700 Merge "msm: clock-7x30: Warn if a clock is enabled before its rate is set" into android-msm-2.6.32 commit 6c167742d7da3e6d4d1f1ce31d9b8203ce0d3ab8 Merge: 00a9e10 e47bcd8 Author: Zach Pfeffer Date: Tue May 25 18:38:47 2010 -0700 Merge "input: touchscreen: Add additional features to the driver." into android-msm-2.6.32 commit 887fe43448c7ea3dd052fe89aeefa75b2393303b Author: Gregory Bean Date: Sun May 23 13:58:26 2010 -0700 gpio: sx150x: Remove unecessary irq_sense config field. Remove the irq_sense configuration field from startup pdata. This field is redundant and confusing, and the job of configuring irq types already belongs to irq_set_type. Change-Id: If3798eb82f48e64364ee23c6ae4a46de427edbf5 Signed-off-by: Gregory Bean commit 5566ea3c57757eadeddeae33badd83e64a0ef2e3 Author: Niranjana Vishwanathapura Date: Wed May 5 17:51:55 2010 -0600 msm: RMNET driver for SDIO interface Driver to plugin packets to/from SDIO RMNET Data Mux driver to kernel IP framework. Change-Id: Ia6ba2049ae2257c05e8c889d9211a9dbb67c27d7 Signed-off-by: Niranjana Vishwanathapura commit f704398e6c15ea4f117ff3aab02786313ad81e63 Author: Bobby Crabtree Date: Tue May 25 15:15:11 2010 -0700 regulator: pm8058-regulator: add support for ncp The negative charge pump regulator is needed by the pmic8058 OTHC module for mic bias. Change-Id: I800d82f48ddfe37601bc844fcc767660143aa5c7 Signed-off-by: Bobby Crabtree commit 00a9e10802de2ebd724bcca7003d90448cc2c348 Merge: 38f4cf4 40e6ede Author: Zach Pfeffer Date: Tue May 25 17:49:26 2010 -0700 Merge "msm_fb: pull LCDC gpio pins low when LCDC power off" into android-msm-2.6.32 commit 38f4cf498c5036a203b981a0f28ee4aeec75a308 Merge: 32af736 ba92f2d Author: Zach Pfeffer Date: Tue May 25 17:49:16 2010 -0700 Merge "msm: enable SMD/SMSM on 8x60" into android-msm-2.6.32 commit 32af736c949518c07a4b32d64a3ada94d86596d9 Merge: d4dc72a 9e9f2dd Author: Zach Pfeffer Date: Tue May 25 17:48:33 2010 -0700 Merge "msm: Update SMD, SMSM and proc comm to support 8x60" into android-msm-2.6.32 commit 6e2932cabf828d1b01fb990dd560d224e0631160 Author: Niranjana Vishwanathapura Date: Wed Apr 28 11:09:34 2010 -0600 msm: RMNET SDIO Data Mux module. Module to allow RMNET over SDIO link. As multiple rmnet ports need to use single SDIO line (function), muxing of the rmnet packets is required. Change-Id: I0b0cea7a2135ba4afdc00ce4faf6a28fda5dc929 Signed-off-by: Niranjana Vishwanathapura commit 71787dfe2db167c4eda6c0207e474825b723a89e Author: Zach Pfeffer Date: Tue May 25 13:43:04 2010 -0700 Revert "Merge "defconfig: msm: 7x30: Enable the serial console by default." into android-msm-2.6.32" Enabling the console breaks the HSUART on 8x55 SVLTE FFAs. The underlying issues has not been found, but the HSUART is the fundamental link to the radio and needs to work. This reverts commit fe07adaf855c49f7f4b9be814e79810c2d4a706b, reversing changes made to 9476a82d97a49d7cc6438f429a79fb68195d41e7. Change-Id: Ief668cd317d2384b4f1585cc2906b51167d8a8d8 Signed-off-by: Zach Pfeffer commit 95cae0b2a3159a3a2f808f74f69a208949109ec4 Author: Swaminathan Sathappan Date: Mon May 24 21:16:12 2010 -0700 msm: audio: qdsp5v2: Cleanup LPA Decoder Driver Handle Pause command inside device switch case. Convert device switch bitmasks into device switch state values. Change-Id: I8eb244566c31d93615ca7abfeccd94861453cd37 Signed-off-by: Swaminathan Sathappan commit 00a2f9d357a5382b5d648e42c64af39c3df5d861 Author: Michael Bohan Date: Tue May 25 14:07:55 2010 -0700 hwmon: Add driver for msm dal adc interface This driver provides both a hwmon sysfs interface and ioctl interface to the msm dal adc. The driver abstracts the multiple adc devices found on the modem and presents them as a flat set of channels. A lookup ioctl call can be made to discern which local channel number corresponds to a particular name. The driver supports both blocking and non-blocking conversion requests, although only the blocking can be accessed from sysfs. In non-blocking mode, a user may choose to block on a transfer completion. The user may also choose to block on the availability of transfer request slots, since this resource is finite. Change-Id: I1c398f2c964cc0ec4354293ca8400c2feb4d962c Signed-off-by: Michael Bohan commit 7f06c3bdf09acbecfe9bfbf42abddd8fb7dea6e9 Author: Matt Wagantall Date: Tue May 25 13:17:59 2010 -0700 msm: acpuclock-8x60: Decrease max CPU frequency to 1080 MHz Until additional hardware profiling has been completed, use a more conservative max CPU frequency. Change-Id: I544fbac2185c9b52ee1cca13961e91ae4ed51ccd Signed-off-by: Matt Wagantall commit afa2a04a16c3f9735c51bdbe7767b48b31f3eef9 Author: Matt Wagantall Date: Thu May 20 10:23:11 2010 -0700 msm: clock-8x60: Warn if a clock is enabled before its rate is set A clock's rates must be set before it's enabled. Doing otherwise will result in undefined behaviour. Enforce this with a stern warning and a stack dump. Change-Id: I89175fd8516107fcc46ae8e4eeb537e3b1e9f39b Signed-off-by: Matt Wagantall commit 40e6ede5762eb8ec1fd9d534cd445680fa084359 Author: kuogee hsieh Date: Sun May 23 11:44:00 2010 -0700 msm_fb: pull LCDC gpio pins low when LCDC power off Since LCDC gpio pins are configure to OUTPUT with NOPULL, these gpio pins are in low power state alread. Therefore no need to configure them to GPIO_DISABLE when LCDC is power off. Pulling them low to prevent power from leaking is enough. CRs-fixed: 236277 Change-Id: Ia366e96bbcc61bf4fb0967e7f58b7f1bc1c121c2 Signed-off-by: Kuogee Hsieh commit d4dc72af94a478f7052fa3aeb0352ae67dbbd91c Merge: b14190f 515edd1 Author: Brent Degraaf Date: Tue May 25 11:42:25 2010 -0700 Merge "msm: timer: Only initialize timer registers on boot" into android-msm-2.6.32 commit ba92f2d2380025bce570917d7299c66e4caf8113 Author: Niranjana Vishwanathapura Date: Wed May 19 18:57:35 2010 -0600 msm: enable SMD/SMSM on 8x60 Enable SMD/SMSM related kernel config items, add io descriptor for shared memory region, add device msm_smd_device. Change-Id: Iad97d8f58c4b56b388b328cab27fa9a19dd29f47 Signed-off-by: Niranjana Vishwanathapura commit 9e9f2ddf327124020ef86f968951ae73e6d17c67 Author: Niranjana Vishwanathapura Date: Wed Apr 28 11:13:03 2010 -0600 msm: Update SMD, SMSM and proc comm to support 8x60 In 8x60, modem will not be available during kernel boot, update the SMD/SMSM/PROC_COMM accordingly. Add interrupt support for SMD/SMSM/PROC_COMM for CONFIG_ARCH_MSM8X60. Change-Id: I650b9c902651594f357607af08f3fdc6ada805f8 Signed-off-by: Niranjana Vishwanathapura commit e47bcd8caa1a5de55d656bcdbbd187b71d9b4aee Author: Anirudh Ghayal Date: Mon May 17 17:13:17 2010 -0700 input: touchscreen: Add additional features to the driver. The following features have been added. 1. Specify IRQ flags from platform data 2. Inverse coordintes 3. Suspend/resume hooks Change-Id: Ic3ca7b20f16630ec3277185cfe0378b412569496 Signed-off-by: Anirudh Ghayal commit a3224f712002dbf029fab77d9c848de3a01bde9d Author: kuogee hsieh Date: Tue May 25 09:17:49 2010 -0700 Revert "msm_fb: display: add zorder check during overlay_set" This reverts commit a048cadbbfbf89e28802d3ce2da5c7b997c49b42. Change-Id: I1ce7311f326a99b738d32055f98879754e5b25b6 Signed-off-by: Kuogee Hsieh commit b14190ff1be431ee231211a2621b9bf4eb336369 Merge: 8b3b9fc 1a7b110 Author: Brent Degraaf Date: Tue May 25 08:34:50 2010 -0700 Merge "mmc: core: Workaround to fix a hardware bug in Qualcomm-SDIO client on MDM" into android-msm-2.6.32 commit 8b3b9fc92025fde84756f625b8a2d8299d73677c Merge: f62ffe6 e20c533 Author: Brent Degraaf Date: Tue May 25 08:34:15 2010 -0700 Merge "msm: pmic8058-mpp: add direct PM8058 MPP configuration" into android-msm-2.6.32 commit f62ffe6a92f245ef7b28f2e07db480af35da3d1a Merge: 5c3461d 40581fd Author: Brent Degraaf Date: Tue May 25 08:31:17 2010 -0700 Merge "msm: enhance error handling in display power functions" into android-msm-2.6.32 commit 5c3461dcc8b3772bbbcc125af8e68b2afd41c6aa Merge: 3cc6c41 0f10b45 Author: Trilok Soni Date: Tue May 25 05:00:16 2010 -0700 Merge "msm_rmnet: support IPV6, QoS, and raw IP framing" into android-msm-2.6.32 commit f75f7cbd4ec2ac9909ebb7b1a60e7d5ecf4b0c6f Author: Amir Samuelov Date: Tue May 25 13:46:32 2010 +0300 msm: SDIO-AL for RMNET data. Add platform-device per channel to allow RPC and RMNET to probe independently. Avoid "over-notification" for streaming channel Rx data. Read some channel configuration from SDIO-Card. i.e. total buffers size, and buffers block size. Remove user-space interface. Change-Id: I1cedb05b433ee133354939b64903e79133615c5c Signed-off-by: Amir Samuelov commit 3cc6c411e6906af88ce3f59b846146ec38abfed7 Merge: 6a2beae 78fdb6b Author: Trilok Soni Date: Tue May 25 02:56:48 2010 -0700 Merge "msm: 8x60: remove redundant gpio pull-ups." into android-msm-2.6.32 commit 6a2beaed15f6fc0b1eb8cbbf4b75c9e210857b78 Merge: 8ccfe6b 82b14b9 Author: Trilok Soni Date: Tue May 25 02:56:28 2010 -0700 Merge "serial: msm_serial_hs: Do not disable_irq inside interrupt handler" into android-msm-2.6.32 commit 8ccfe6b1c6a3e71b7781a7a8d27b692c2047a9d1 Merge: d2f296b 9fa7a6c Author: Trilok Soni Date: Tue May 25 01:43:02 2010 -0700 Merge "msm: kgsl: Remove the need to poll for timestamp completion" into android-msm-2.6.32 commit d2f296b942f010e941055971251f42c282846e2c Merge: 1a36327 b95e7fc Author: Trilok Soni Date: Tue May 25 01:42:38 2010 -0700 Merge "msm: audio: 7x30: Define headset mono tx for FLUID" into android-msm-2.6.32 commit 1a36327370d42b7d80f11dc2011c21f2761a8604 Merge: c4a6f13 27793f1 Author: Trilok Soni Date: Tue May 25 01:42:14 2010 -0700 Merge "diag: Add On-device logging feature" into android-msm-2.6.32 commit 82b14b9ab3268c66a03fb2a6c6d35bee16f410da Author: Sankalp Bose Date: Fri May 21 19:54:12 2010 +0530 serial: msm_serial_hs: Do not disable_irq inside interrupt handler disable_irq waits for completion of interrupt handler and hence cannot be used inside the corresponding interrupt handler. Change to disable_irq_nosync which returns immediately. Change-Id: Ia58233832df900391632272481192fc2b1977f6d Signed-off-by: Sankalp Bose commit 78fdb6b5eb308dad614f647b1931f00c738e2ede Author: Gregory Bean Date: Mon May 24 10:32:05 2010 -0700 msm: 8x60: remove redundant gpio pull-ups. Remove redundant PM8058 GPIO pull-ups for lines which have pull-ups already installed on the board. There is no need for a double pull-up. Change-Id: I638567ad215525b2794b987a3f382956d9856ca9 Signed-off-by: Gregory Bean commit c4a6f13ec2ece995897101638402b055b26dc8e3 Merge: c354138 9a5f79c Author: Trilok Soni Date: Tue May 25 00:07:48 2010 -0700 Merge "defconfig: 7x30: Disable use of NPA for System Bus performance management" into android-msm-2.6.32 commit c354138c65ce60f8ce912103158d6dffd061d279 Merge: e7820b3 99f885d Author: Trilok Soni Date: Tue May 25 00:07:22 2010 -0700 Merge "gpio: sx150x: fix bug in irq_set_type." into android-msm-2.6.32 commit e7820b34d139c63ce92b305451d694488b0c8efc Merge: 550f66c e302e64 Author: Trilok Soni Date: Tue May 25 00:06:34 2010 -0700 Merge "usb: gadget: Fix bug in serial driver RX path" into android-msm-2.6.32 commit 550f66ccb2da4dda74ef2a7db0ec4f22749395a8 Merge: 39aad6c a725d84 Author: Trilok Soni Date: Tue May 25 00:06:21 2010 -0700 Merge "msm: Rename SMD Control Driver to SMD Packet Driver" into android-msm-2.6.32 commit 39aad6c314fafe464174cae3cc11b0c90d8416b0 Merge: 0fee73f 4fa05a8 Author: Trilok Soni Date: Tue May 25 00:06:00 2010 -0700 Merge "msm_fb: display: retransmit set_backlight pmapp rpc request" into android-msm-2.6.32 commit 0fee73f45424e36e605298a7c3690d8b6d78b9ba Merge: b0057b3 729501c Author: Trilok Soni Date: Tue May 25 00:05:41 2010 -0700 Merge "serial: Do not enable clocks before setting rates" into android-msm-2.6.32 commit b0057b33f3293f74cb8c6145d2473f60f1046914 Merge: c7d19e4 8f37258 Author: Trilok Soni Date: Tue May 25 00:05:04 2010 -0700 Merge "msm: Fix buffer release problems in rpc client and server frameworks." into android-msm-2.6.32 commit 40581fd9aaeb724c57e124146f148bd21d3d6200 Author: Bobby Crabtree Date: Wed May 19 15:52:02 2010 -0700 msm: enhance error handling in display power functions Board-specific power function signatures are changed. Functions now have a return type so that error codes can be propagated to display drivers. Change-Id: I53c4242bbab2405c46b4fdf2c3ca6097cf70a7da Signed-off-by: Bobby Crabtree commit c7d19e440885cd6067611cd3660220d20bd85b91 Merge: 285411c 58ce370 Author: Willie Ruan Date: Mon May 24 17:31:57 2010 -0700 Merge "msm: audio: qdsp5v2: Modify fsync for low power audio decoder driver" into android-msm-2.6.32 commit 0f10b45041a55db23fee3bbf7b81bfc2621c2cd0 Author: Abhijeet Dharmapurikar Date: Tue Apr 27 23:15:51 2010 -0700 msm_rmnet: support IPV6, QoS, and raw IP framing The RmNET network driver is updated to support additional functionality. To improve performance, the Modem offers use of raw IP framing over RmNET channel. The userspace application can select to use either Ethernet (default) or raw IP framing via IOCTL command. This change requires minor updates to kernel network code to support raw IP mode in IPV6 address configuration. Additionally, the Rx packet protocol (IP version) must be assigned before sending packet to data stack by examining the IP header field. To support end-to-end quality of service (QoS) packet handling, the Modem requires tx frames to have a QoS header pre-pended. The header contains the Modem QoS flow handle, which is specified in the skb "mark" field provided by data stack. This value is zero by default, indicating Modem primary flow. When required, the mark value will be assigned by IP table mangle rule configured by userspace application. The userspace application can enable driver QoS support via IOCTL command. Change-Id: I69f126a033940179ba1b75581baf4cd9e98e667f Acked-by: Andrew Richardson Signed-off-by: Abhijeet Dharmapurikar commit 285411c16bd86d8dc1cf6bcd99ec931a2e181e78 Merge: fde3e2f 5ff3ffd Author: Zach Pfeffer Date: Mon May 24 15:11:56 2010 -0700 Merge "msm: Add SDIO_RPC platform driver in RPC Router - SDIO XPRT interface" into android-msm-2.6.32 commit fde3e2fa7fd690229f971c549898761eaf9834d3 Merge: 59b3945 1ace8cf Author: Zach Pfeffer Date: Mon May 24 15:11:10 2010 -0700 Merge "msm: sdcc: Move clock parameters to platform data." into android-msm-2.6.32 commit a725d84012fe995e61277ef40c96697c195696f1 Author: Karthikeyan Ramasubramanian Date: Tue May 11 23:30:39 2010 -0600 msm: Rename SMD Control Driver to SMD Packet Driver SMD Control Driver provides packet interaface to user-space. Rename this SMD Control Driver as a generic SMD Packet Driver. Change-Id: I081dcdd4f701b982d5c781d44073404ecefd025b Signed-off-by: Karthikeyan Ramasubramanian commit 9a5f79c7f746ac19eccaf572eadc3456ee56aaeb Author: Matt Wagantall Date: Fri May 21 15:38:13 2010 -0700 defconfig: 7x30: Disable use of NPA for System Bus performance management NPA System Bus management requires modem support, which is not currently available for all 7x30 modems. Disable it until support is available. Change-Id: I79399fa100c9274222acdd61fa3bf90ae54dfcb1 Signed-off-by: Matt Wagantall commit 58ce37050758c0f12bb01fa8524b3fec751a48dd Author: Swaminathan Sathappan Date: Fri May 14 18:48:53 2010 -0700 msm: audio: qdsp5v2: Modify fsync for low power audio decoder driver Change the fsync handling. Send Zero length buffer and exit during flush Change-Id: Ice0f2590d03a41ef5a6309f773a17be45453c392 Signed-off-by: Swaminathan Sathappan commit e7fa3c201b5b40d1b31eda689fe5218e15e21002 Author: Shubhraprakash Das Date: Fri May 21 15:33:53 2010 -0600 msm_kgsl: Flush tlb only before submitting commands to 2D/3D hardware Change-Id: I8e5bf6d64df61d93fad01622e562ce15d616adf3 Signed-off-by: Shubhraprakash Das commit b95e7fc34eac031d1936c5292d7858be4b41e37a Author: Patrick Lai Date: Thu May 20 16:22:54 2010 -0700 msm: audio: 7x30: Define headset mono tx for FLUID Change-Id: I0427c327316a79c72f4a563acf8429481a966de4 Signed-off-by: Patrick Lai commit 59b3945db3911f6cb778157f35e090e6f51403e9 Merge: c7bdcb5 1089380 Author: Murali Palnati Date: Mon May 24 10:20:37 2010 -0700 Merge "msm: video: Add reconfig event changes in Decoder and Encoder driver" into android-msm-2.6.32 commit 1a7b11050663b9b39fb270376cb2b53af1b62892 Author: Sahitya Tummala Date: Mon May 24 15:03:19 2010 +0530 mmc: core: Workaround to fix a hardware bug in Qualcomm-SDIO client on MDM Qualcomm-SDIO client on MDM contains NULL tuple for all SDIO functions 1 to 7 and doesn't contain any valid data. This patch is a temporary software workaround (not to read CIS if it is NULL tuple) until the hardware bug is resolved. Change-Id: I30411f9771b8d43561d0c5a7cab9cb4a1d7ad183 Signed-off-by: Sahitya Tummala commit 4fa05a83d4bcc394d536cd2490c3c95e74f5fb11 Author: kuogee hsieh Date: Mon May 24 09:04:24 2010 -0700 msm_fb: display: retransmit set_backlight pmapp rpc request Re-transmit set_backlight pmapp rpc request in case of rpc failed. Change-Id: I2ed01bd7ec40da313a75d441a438491a13a875a7 CRs-fixed: 236277 Signed-off-by: Kuogee Hsieh commit 99f885d147f7bd00b8250ebb524631671f802960 Author: Gregory Bean Date: Tue May 18 18:55:44 2010 -0700 gpio: sx150x: fix bug in irq_set_type. Fix the container_of call in the irq_set_type work function in order to produce the correct sx150x_chip pointer. Change-Id: If45bab05a7d3a69ad837a161f0898c1a091822ce Signed-off-by: Gregory Bean commit 1ace8cf3040e2055a890930ba1107da5be7918e0 Author: Aparna Mallavarapu Date: Mon May 24 11:10:43 2010 +0530 msm: sdcc: Move clock parameters to platform data. Move SDCC clock parameters to the mmc_platform_data. Fetch the SDCC clock values from the MMC platform data for each slot. Clock parameters vary per target hence moving them to the mmc_platform_data makes driver generic. Change-Id: Ifc1a1e41344850b095a9cf2e35573c2837c9d107 Signed-off-by: Aparna Mallavarapu commit 729501ce243094e98b5f67b81c1cd402662df7bd Author: Sankalp Bose Date: Mon May 24 18:48:55 2010 +0530 serial: Do not enable clocks before setting rates Change-Id: I362207f6e6d0cb6f037c54a187720ff4715a13ab Signed-off-by: Sankalp Bose commit c7bdcb5fb65fa30954c724ca35bd094b8374b5ac Merge: f331754 d896eb6 Author: Zach Pfeffer Date: Sun May 23 21:45:59 2010 -0700 Merge "defconfig: Add msm8655-sr defconfig" into android-msm-2.6.32 commit e302e64de09a91467b42e7b5054f4c0b03abc50e Author: Pavankumar Kondeti Date: Wed May 19 11:44:39 2010 +0530 usb: gadget: Fix bug in serial driver RX path If low_latency flag is set tty_flip_buffer_push() API push the data to line discipline in the same context. When line discipline buffer reaches above/below threshold throttle/unthrottle. TTY use termios mutext to serialize throttle/unthrottle methods. Replace tasklet with work queue so that TTY can acquire mutex. A dedicated worker thread is created for achieving good throughput. Change-Id: I1ebbe1c9fee5591dace18940fb5c8716829f2dd2 Signed-off-by: Pavankumar Kondeti commit d896eb6c3cc6424fc1a4f1d0c4116250c3e3e25d Author: Ashish Singhal Date: Sun May 23 16:08:34 2010 -0600 defconfig: Add msm8655-sr defconfig The defconfig is based on the msm7630-perf_defconfig. It contains changes to enable the serial port and FB console. Change-Id: I5c144f757ffdb744eeb38cf269e7978b0b08ac60 Signed-off-by: Ashish Singhal commit f331754fe30de9f8a9bebee170496e38417b68ad Author: Gregory Bean Date: Fri May 21 09:09:50 2010 -0700 msm: 7x30: Prioritize UART2 initialization. Move the UART2 init to the earliest possible point in order to make serial console output available as early as possible during the boot sequence. Change-Id: Ibe2e85ff708ddf92ce12698706aa45e6ec97537f Signed-off-by: Gregory Bean commit 5ff3ffd0030d0d95ad10adce3678f1569f65bb53 Author: Karthikeyan Ramasubramanian Date: Thu May 20 16:05:35 2010 -0600 msm: Add SDIO_RPC platform driver in RPC Router - SDIO XPRT interface Add SDIO_RPC platform driver to probe for updated platform devices in SDIO Abstraction Layer. Change-Id: If13f45d08856f24e69a365f2d5e846e8e0eb294a Signed-off-by: Karthikeyan Ramasubramanian commit d5090bc73edbfb2f11328b428f3460a6c766e9d3 Author: Michael Bohan Date: Wed May 19 11:47:40 2010 -0700 msm: Add support for 8x55 SVLTE boards Change-Id: I3b814e2bf7ba067b61afebc6621ed493c7424e5d Signed-off-by: Michael Bohan commit 0a4e5c174acb342299e4ee48d70bbb48d0c125b2 Merge: 63932d1 10380b2 Author: Willie Ruan Date: Sat May 22 15:49:30 2010 -0700 Merge "msm: 7x30 board: add pm8058-nfc for a sub device of PM8058" into android-msm-2.6.32 commit 63932d10cce651a24e5cf0137160ddee6af4c2bb Merge: e066004 13dc316 Author: Willie Ruan Date: Sat May 22 15:49:20 2010 -0700 Merge "gic: implement set_type" into android-msm-2.6.32 commit 10380b21edc7ad337942a7f5a97a165e5d3b8677 Author: Willie Ruan Date: Tue May 18 20:39:46 2010 -0700 msm: 7x30 board: add pm8058-nfc for a sub device of PM8058 NFC is a small module in PM8058 chip, and its driver is a sub device of pmic8058 core driver. Adding this sub device field to make it work. Change-Id: I954d4a1ec8a0d38c6b18c1580e7dc54f8e41d5bf Signed-off-by: Willie Ruan commit e06600427de351803b18cae574fef5d6480f1b7e Merge: 1a0d568 8ed33cf Author: Willie Ruan Date: Sat May 22 10:05:29 2010 -0700 Merge "misc: add pmic8058-nfc driver to support NFC" into android-msm-2.6.32 commit 1a0d5683922290188d0b2e022b24509492b03f92 Merge: b9ae3e3 79d0159 Author: Willie Ruan Date: Fri May 21 22:37:48 2010 -0700 Merge "msm: clock-8x60: Add multimedia AXI and AHB interface clocks" into android-msm-2.6.32 commit b9ae3e3fe29e7ebea930d6cc616615a85989e023 Merge: f649bd2 90aaaf6 Author: Willie Ruan Date: Fri May 21 22:34:42 2010 -0700 Merge "msm: clock-8x60: Combine VFE and VFE_SRC clocks" into android-msm-2.6.32 commit f649bd29e19310ab8701cadfe5484f5ac2a4d053 Merge: c06f727 cbc7c0c Author: Willie Ruan Date: Fri May 21 22:33:38 2010 -0700 Merge "msm: clock-8x60: Clean-up 8x60 USB names and macros." into android-msm-2.6.32 commit c06f727af1bdba11860420567308879ee5471788 Merge: ff72a74 df1bdc0b Author: Willie Ruan Date: Fri May 21 22:32:25 2010 -0700 Merge "msm: clock-8x60: Support LPASS MIC and SPKR I2S clocks." into android-msm-2.6.32 commit ff72a743cb79a789d8bb90b4f295c56f804b7e24 Merge: fe07ada e63d5a1 Author: Willie Ruan Date: Fri May 21 22:31:00 2010 -0700 Merge "msm: 7x30: Remove bma150 configuration." into android-msm-2.6.32 commit fe07adaf855c49f7f4b9be814e79810c2d4a706b Merge: 9476a82 71ee327 Author: Willie Ruan Date: Fri May 21 22:30:48 2010 -0700 Merge "defconfig: msm: 7x30: Enable the serial console by default." into android-msm-2.6.32 commit 9476a82d97a49d7cc6438f429a79fb68195d41e7 Merge: c955824 8d8f202 Author: Willie Ruan Date: Fri May 21 22:30:34 2010 -0700 Merge "regulator: pmi8058-regulator: fix voltage programming bug" into android-msm-2.6.32 commit c9558241227ce3a33f0bb75d43acfbffc40cecae Merge: c661b20 5a5ffd0 Author: Willie Ruan Date: Fri May 21 22:29:01 2010 -0700 Merge "msm: audio: qdsp5v2: Send hardware volume command after device enable" into android-msm-2.6.32 commit c661b20f28ef151b9f9b6a4a5ae85b0bf1379655 Merge: 9c25227 d041a5c Author: Willie Ruan Date: Fri May 21 22:28:40 2010 -0700 Merge "mfd: add PMIC8901 driver for QCOM PM8901 chip" into android-msm-2.6.32 commit 9c25227c723573beceb65544a87178f58df0da9f Merge: f921d20 6a34acf Author: Willie Ruan Date: Fri May 21 22:28:17 2010 -0700 Merge "msm: kgsl: correct implementation of kgsl_sharedmem_writel" into android-msm-2.6.32 commit f921d201a271c42e5eca27733028ab7b11b4c57c Merge: b0a6be7 4b4e08c Author: Willie Ruan Date: Fri May 21 22:28:03 2010 -0700 Merge "msm: audio: qdsp5v2: Update encoder driver for incall error handling" into android-msm-2.6.32 commit 27793f1912bceae0e3af96722ef16ba4a275620f Author: Shalabh Jain Date: Tue May 18 18:57:56 2010 -0700 diag: Add On-device logging feature Until now, all DIAG traffic was routed to USB. Now the user will have the option to either send all traffic to USB OR to log the traffic on a memory card mounted on the phone itself. Change-Id: I7708010eb70490f61c1d433a0699aa7e54b9b2d2 Signed-off-by: Shalabh Jain commit f54ef75cb0f19dfeab471f6b528c9671e95d84ca Author: Stephen Boyd Date: Fri May 21 10:52:10 2010 -0700 msm: acpuclock-7x30: Update for new voltage plan The voltage levels for the frequency table has changed a bit. Update it to reflect the new voltages. Change-Id: I1db863ed9272bd16c0f6a3a96adcad8c8ae163ba Signed-off-by: Stephen Boyd commit 10893804fccdeeddb7a862e8f6cbf99194de9782 Author: Ravishangar Kalyanam Date: Fri May 21 10:52:29 2010 -0700 msm: video: Add reconfig event changes in Decoder and Encoder driver Add input and output reconfig event changes in Video Decoder and Encoder driver. This ensures compatibility with Firmware version 19 Change-Id: Id7c12bc4415c8b2bc3ae7ced46789a7e9e550b0c Signed-off-by: Ravishangar Kalyanam CRs-Fixed: 235789 commit d041a5c233a885d5e96eca999e1f4a0c1b5fa0da Author: Bobby Crabtree Date: Thu May 13 14:59:05 2010 -0700 mfd: add PMIC8901 driver for QCOM PM8901 chip This driver is to provide a shim layer between ssbi driver (under i2c framework). It provides interrupt multiplexing and MPP control. Change-Id: I13c05d8477f3ea66dd368f167453ec19c8a622c3 Signed-off-by: Bobby Crabtree commit 79d01593a7b1e0eeeadb1db43fb4fbc48291b014 Author: Matt Wagantall Date: Fri May 14 16:27:22 2010 -0700 msm: clock-8x60: Add multimedia AXI and AHB interface clocks Add on/off control for those multimedia AXI (MM Fabric) and AHB (MM FPB) clocks that do not support dynamic hardware gating. For clocks that do support dynamic hardware gating, driver support is not added. These clocks are presently turned on at boot and left on. Eventually, hardware gating mode will be enabled after sufficient testing has taken place. Change-Id: Id22e8e2f2600ce23700944fedc11193168e2b2b1 Signed-off-by: Matt Wagantall commit 90aaaf646819457f1178711e82ca4af0b58f6f7f Author: Matt Wagantall Date: Mon May 17 20:35:12 2010 -0700 msm: clock-8x60: Combine VFE and VFE_SRC clocks When the VFE_CSIx clocks are needed, the VFE clock will also be needed. Hence, make the VFE clock the parent of VFE_CSI0 and VFE_CSI1. Change-Id: Ief287531a52d70985dcbe4441d8e1bb6a3476b94 Signed-off-by: Matt Wagantall commit cbc7c0cf7c96c0fd4474665c23a0e286d8e8b4ff Author: Matt Wagantall Date: Thu May 13 17:37:54 2010 -0700 msm: clock-8x60: Clean-up 8x60 USB names and macros. Rename the 'USB_FS' and 'USB_HS' clocks to 'USB_FS_XCVR' and 'USB_HS_XCVR' to resolve some ambiguity. This makes the difference between the transceiver clocks (_XCVR) and the core clocks (_SYS) more obvious. The string names are left unchanged to maintain backward-compatibility with older drivers. Also, move the core reset ability from the _SRC clocks to the _SYS clocks, since this lines up better with the purpose of the reset. Change-Id: I9a2a1ebb6a6c236f373acfde528edc162250c186 Signed-off-by: Matt Wagantall commit df1bdc0b4b380f8c8cfe3f1deaf31b84377edf0a Author: Matt Wagantall Date: Thu May 13 12:23:27 2010 -0700 msm: clock-8x60: Support LPASS MIC and SPKR I2S clocks. Change-Id: I71cbc58b15ad6adb8d000d1fb25841b411698de9 Signed-off-by: Matt Wagantall commit 8ed33cf042cbe24fe7db03e7ccaffe0644e257f5 Author: Willie Ruan Date: Thu May 13 14:26:19 2010 -0700 misc: add pmic8058-nfc driver to support NFC There is a small module in PM8058 chip to provide power and pin control for NFC (Near Field Communication). This driver is to enable the NFC support of PM8058 for any 3rd party's NFC chip, like FeliCa chip. Usage: - include - call pm8058_nfc_request() to get the handle - call pm8058_nfc_config() to set any signals to 1 or 0 - call pm8058_nfc_get_status() to get the status of any pins - call pm8058_nfc_free() after finishing using pm8058 NFC CRs-fixed: 236132 Change-Id: I8a7ed74210e45464d229d7500379bc85acd0836f Signed-off-by: Willie Ruan commit e63d5a10331e03394a4551d3fe893bfbd5e1626a Author: Gregory Bean Date: Fri May 21 09:27:37 2010 -0700 msm: 7x30: Remove bma150 configuration. The bma150 device configuration in 7x30 has problems: First, it uses the same GPIO line as the serial UART. The serial console is a required feature. Second, the source code for this driver no longer appears in the kernel, so this configuration code is effectively "dead", unless the driver is closed-source and distributed as .ko only. Change-Id: I359150c35556ef54443dbd35258babf40ae3922d Signed-off-by: Gregory Bean commit 8f37258c000200c8025162fdf19a522d1d7ff0b7 Author: Niranjana Vishwanathapura Date: Fri May 21 13:23:17 2010 -0600 msm: Fix buffer release problems in rpc client and server frameworks. When rpc read fails, buffer is not initialized and panics if tried to free it. Also when closing the clients buffer is not properly released. Initialize the buffer properly and release while closing the client. Change-Id: I164f4e471423d40d23bba55882f12d47874e4972 CRs-Fixed: 239699 Signed-off-by: Niranjana Vishwanathapura commit 5a5ffd088596c83d66439bb2dffd1d79bc21b95b Author: Swaminathan Sathappan Date: Fri May 21 13:03:31 2010 -0700 msm: audio: qdsp5v2: Send hardware volume command after device enable Problem: After a device disable, HLB device will play with default gain Impact: Lead to file playing with a higher volume after voice call ends Solution: Send the last stored volume in LPA driver after a device switch, when the device ready event comes for next device. Change-Id: I77d827d18bc579a8f7dedbcc9ceeca7040e5a736 Signed-off-by: Swaminathan Sathappan commit b0a6be790a6d7f0d8cd8b4f3b09c78a180478366 Author: Sahitya Tummala Date: Thu May 20 16:32:22 2010 +0530 mmc: msm_sdcc: remove the feature MMC_MSM7X00A_RESUME_IN_WQ The feature MMC_MSM7X00A_RESUME_IN_WQ can no longer be used in 2.6.32 kernel because of the removal of its dependent feature MMC_BLOCK_PARANOID_RESUME in the block layer. Change-Id: Iac4cbfb6aad196f6fc000a7d8f07f1eee1d5e64f Signed-off-by: Sahitya Tummala commit 60155dc1d2f9afc6d6a9f9db8f6fdb07606254d0 Author: Rajesh Sastrula Date: Thu May 14 16:40:52 2009 -0700 [ARM] msm_fb: remove lock_fb_info() for private driver ioctl On 29 kernel framebuffer, new lock_fb_info() is being put everywhere to protect private info data. This will make all fb calls to be serialized (eg. MSMFB_BLIT can't run while doing FBIOPUT_VSCREENINFO for updating screen). As msm_fb ioctl doesn't access private info data, it's safe to remove the lock around user ioctl. Change-Id: Iea70f4287d52a498ab8a48109a07ae328c1e3edb Signed-off-by: Rajesh Sastrula commit aa9aa881a49b47cd86e073137a943ddb0926a40e Merge: 6b9e388 7606478 Author: Murali Palnati Date: Fri May 21 09:03:17 2010 -0700 Merge "mtd: msm_nand: Use the platform data pointer only if available." into android-msm-2.6.32 commit 71ee3273fd3367c5b233b2ea3a2e4e9b39168512 Author: Gregory Bean Date: Fri May 21 08:47:13 2010 -0700 defconfig: msm: 7x30: Enable the serial console by default. Change-Id: Ib6700cdbcb61dd0a1d9d802cba855b526bf98084 Signed-off-by: Gregory Bean commit 6b9e388163f56b01f8590919751781ea8e8c414e Merge: ef7df59 b649b4b Author: Trilok Soni Date: Fri May 21 07:46:25 2010 -0700 Merge "mmc: msm_sdcc: Enable SDC host->clk only after setting the rate." into android-msm-2.6.32 commit ef7df59044594229c00d35d8f891f601798e9a56 Merge: 59ca6c3 d13a698 Author: Trilok Soni Date: Fri May 21 07:45:45 2010 -0700 Merge "msm: board-8x60: Add board info for PM8058-OTHC" into android-msm-2.6.32 commit 59ca6c31d0b1572c2b7822cccf657532a4d5d6ce Merge: f938c1c be94feb Author: Trilok Soni Date: Fri May 21 06:30:45 2010 -0700 Merge "msm: audio: qdsp5v2: Handle device events during decoder running" into android-msm-2.6.32 commit b649b4b5050095a2aab6e2902ba354a087e57fe8 Author: Murali Palnati Date: Fri May 21 12:04:30 2010 +0530 mmc: msm_sdcc: Enable SDC host->clk only after setting the rate. For clocks that support rates which can be set (most clocks other than _pclk AHB clocks), a rate must be set using clk_set_rate() before the clock is enabled for the first time with clk_enable(). Subsequent calls to clk_enable() need not be preceded with the clk_set_rate() calls unless we wish to change the clock rate that is set previously. SDC host->clk is currently enabled without setting the clock rate even once. This patch fixes this, by ensuring that the clock rate for this clock is first set before enabling the clock. Change-Id: I8523f970990e2c85048d78dd6ebdbf9cbaf20bef Signed-off-by: Murali Palnati commit 7606478ae9eaac4c331df7fda5b7ea9a1b25f670 Author: Murali Palnati Date: Fri May 21 18:03:37 2010 +0530 mtd: msm_nand: Use the platform data pointer only if available. Platform data pointer is used by the driver probe function to check for the presence of the interleave mode. This pointer can be used only if it is not NULL. Add a sanity check to check for platform data to be present. Change-Id: If242ed4a3f8005f5e52bc945386aa01e18936a54 Signed-off-by: Murali Palnati commit d13a698076512b3cf190c7b5f58996c0d4aacb8a Author: Anirudh Ghayal Date: Tue May 18 18:05:48 2010 -0700 msm: board-8x60: Add board info for PM8058-OTHC Change-Id: I9b85cb06aaf60eaf7be66bbed3a19cb22623dfbf Signed-off-by: Anirudh Ghayal commit f938c1c90324192e60535bb80b47c92b278c8206 Merge: 3a07bc9 9cb6a87 Author: Trilok Soni Date: Fri May 21 05:21:05 2010 -0700 Merge "msm: 7x30 board: add configuration calls for pwm channels" into android-msm-2.6.32 commit 3a07bc99af97ec5a3d878390d27f65ba84dc9dd3 Merge: a8d5404 7db6d2e Author: Trilok Soni Date: Fri May 21 05:20:55 2010 -0700 Merge "misc: pmic8058-pwm: add pwm led configuration function and callback" into android-msm-2.6.32 commit a8d5404f157f8ce386476b2888325c99a7b49e7e Merge: cc6adeb 41ee09e Author: Murali Palnati Date: Fri May 21 05:07:47 2010 -0700 Merge "mmc: msm_sdcc: cleanup of unused code in the driver" into android-msm-2.6.32 commit be94feba3d65130db9b0a5c84b22373df2cab035 Author: Swaminathan Sathappan Date: Fri May 14 15:56:16 2010 -0700 msm: audio: qdsp5v2: Handle device events during decoder running Problem Description: Device events populate even when the decoder is not in play state. At this time, device events should be handled; but device switch states which are internal to driver should not be moved as there are no active buffers which are rendering Impact Description: If device switch states are propogated and the decoder is not active in DSP, control events such as pause, query avsync will fail which leads the device switch states in a bad state and hence no buffers will be passed to DSP, resulting in no audio Solution Description: Handle device switch states in occurrence of device switch events only during decoder consuming buffers. Decoder driver to be in running state and is enabled Change-Id: Icbcf4ed2996acf797e557302f24a4cd7d96bdbb1 Signed-off-by: Swaminathan Sathappan commit a422c79e8e529b2bb5c368b815d1dbac8ee443a5 Author: Chiranjeevi Velempati Date: Wed May 19 14:14:24 2010 +0530 USB: gadget: Add compilation support for RNDIS Add compilation support for RNDIS and fix compilation issues. Change-Id: Ic407591a5c4d1027b7f502e42c358f1703d1295b Signed-off-by: Chiranjeevi Velempati commit cc6adeb8f24a8b04efacac4760e42ac3e06a75a5 Merge: 86473ce 149f35f Author: Trilok Soni Date: Fri May 21 02:55:34 2010 -0700 Merge "msm_reqs: Add video Flow IDs for additional screen resolutions" into android-msm-2.6.32 commit 86473ce10219d0f5080b4c0dec22303147b4fd12 Merge: d56b5f8 33c07ed Author: Trilok Soni Date: Fri May 21 02:55:06 2010 -0700 Merge "msm: audio: 7x30: Created dual-mic device for FLUID." into android-msm-2.6.32 commit d56b5f8925cbf96dfabfa3a426f4f25e7a53fc78 Merge: 56c11f9 cd72fac Author: Trilok Soni Date: Fri May 21 02:54:48 2010 -0700 Merge "msm: audio: 7x30: Define handset rx and tx devices for FLUID" into android-msm-2.6.32 commit 56c11f981a0cb44e090f9c94a121b68c5e4d24b6 Merge: 9241c5c 549ddab Author: Trilok Soni Date: Fri May 21 02:21:17 2010 -0700 Merge "msm: video: Fix conformance issues in Core Decoder and Encoder" into android-msm-2.6.32 commit 9241c5c1813fe652c3c24fd222be5910c4161c58 Merge: cba1b29 73934b7 Author: Trilok Soni Date: Fri May 21 02:21:00 2010 -0700 Merge "msm: clock-8x60: Implement clk_set_min_rate()" into android-msm-2.6.32 commit cba1b292d36733c2705d34546b047affbf5a834a Merge: 7e202c0 83dc862 Author: Trilok Soni Date: Fri May 21 02:20:38 2010 -0700 Merge "msm: adsp: qdsp5v2: Update adsp driver for wakeup in idle power collapse" into android-msm-2.6.32 commit 7e202c08f8a043486422dfac6bd0d137ac0a1b66 Merge: 25fdf22 cda7463 Author: Trilok Soni Date: Fri May 21 02:20:18 2010 -0700 Merge "i2c-ssbi: Remove suspend/resume methods from the driver" into android-msm-2.6.32 commit 25fdf22b84185b738d6d9fdf2dfc3c8b3d712669 Merge: b4d6b73 7b81da3 Author: Trilok Soni Date: Fri May 21 02:19:18 2010 -0700 Merge "msm: audio: qdspv2: Change volume command during audpp enable" into android-msm-2.6.32 commit b4d6b73eb4a055c5d894de23316116f616547221 Merge: 0fb5014 19d5e45 Author: Trilok Soni Date: Fri May 21 02:19:00 2010 -0700 Merge "msm: board-8x60: Add board info for ShinEtsu TouchDisc" into android-msm-2.6.32 commit 9cb6a87a94ad6a78dfae33b573c55a5021d02e19 Author: Willie Ruan Date: Wed Apr 14 21:12:54 2010 -0700 msm: 7x30 board: add configuration calls for pwm channels Put all default configurations for PWM channels into the new pm8058_pwm_config calback function. This is to provide convenience for targets and customers. Change-Id: Ia256db4849431bef413be9d36c014e81318b3252 Signed-off-by: Willie Ruan commit 7db6d2e64f2e9658920159a34fe7ed071a58001a Author: Willie Ruan Date: Wed Apr 14 21:09:50 2010 -0700 misc: pmic8058-pwm: add pwm led configuration function and callback Configuring each PWM channel can be board specific, and there was no easy way to do that. Adding pwm led configuration function to fill the gap, which can be called from a board file through the callback added in this patch to configure a pwm channel to different mode. Change-Id: I108cbda3c004213ef36c823e31f50392d0d470fb Signed-off-by: Willie Ruan commit 0fb5014ef1760bb2e99aed57a3f8c68dd9d86b86 Author: Stephen Boyd Date: Fri May 7 14:39:14 2010 -0700 msm: clock: Invert debugfs directory layout There are currently 3 separate directories for clock debugging in debugfs: clk_enable, clk_rate, and clk_local. Each of these directories contains a list of clocks. This is rather annoying when you are focusing on one clock and want to enable/disable it and then check its rate. You either have to cd to the other directory or cat ../clk_rate/. Invert the layout so that there is one clock directory containing a directory for each clock. Inside each respective clock directory place an enable, rate, and is_local file relating to the clk_enable, clk_disable, and clk_local directories that exist today. Change-Id: Ibf28c6305574239c7fd41c38938b501b6dfc9548 Signed-off-by: Stephen Boyd commit 549ddaba3b4173499b739dc0ef5e0598536e1375 Author: Ravishangar Date: Wed May 19 12:18:08 2010 -0700 msm: video: Fix conformance issues in Core Decoder and Encoder Fix conformance issues in Core Decoder and Encoder which are related with repeated open/close, start/stop call sequences on the driver. Fix byte-count slice size validation in AVC decoder. Change-Id: I1b306890a26d2da3f52b1f09f16228f018d04b5e Signed-off-by: Ravishangar Kalyanam commit 19d5e4567587b28ac97e880f119c42568fdebf08 Author: Anirudh Ghayal Date: Tue May 18 11:21:49 2010 -0700 msm: board-8x60: Add board info for ShinEtsu TouchDisc Change-Id: I2bcf7f8d218df57e8d4587c90effebd603767d7b Signed-off-by: Anirudh Ghayal commit 9fa7a6caad680db6c0b8b8bc0dbea5b8f39448a9 Author: Shubhraprakash Das Date: Wed May 19 17:40:08 2010 -0600 msm: kgsl: Remove the need to poll for timestamp completion Use conditional RB interrupt generation when we need to wait on timestamps to avoid polling in userspace. Change-Id: I24f33b1a7d7b41266db86451e2be9b46b490a428 Signed-off-by: Shubhraprakash Das commit ed8a4b255ff047e480da93191a276fe4018ae48d Author: Matt Wagantall Date: Thu May 20 10:58:16 2010 -0700 msm: clock-7x30: Warn if a clock is enabled before its rate is set A clock's rates must be set before it's enabled. Doing otherwise will result in undefined behaviour. Enforce this with a stern warning and a stack dump. Change-Id: Iec5f91bc3e538947c7ae0aeb3489b4cfafb36e65 Signed-off-by: Matt Wagantall commit 8d8f2022fb8df16944bdb6857a735adb484536e2 Author: Bobby Crabtree Date: Thu May 20 10:18:59 2010 -0700 regulator: pmi8058-regulator: fix voltage programming bug Switched-mode power supply (SMPS) voltages were being programmed incorrectly. This patch is necessary in order for regulator_get_voltage to return the same voltage set with regulator_set_voltage. Change-Id: Ib178599661f3bce9b7423cf276ef40a3dab70271 Signed-off-by: Bobby Crabtree commit 41ee09eda9ff5691ae8ff9c29cd8d0eacd78e809 Author: Sahitya Tummala Date: Thu May 20 16:10:10 2010 +0530 mmc: msm_sdcc: cleanup of unused code in the driver Change-Id: I002a22e8b38c10d1a493cc62ffa97c9822d9c298 Signed-off-by: Sahitya Tummala commit f3dd803d2474077c6bb68021a94ae4ad9d221714 Merge: e4c1f16 e031259 Author: Trilok Soni Date: Wed May 19 23:16:10 2010 -0700 Merge "input: pm8058-othc: Add support for boot time headset detection" into android-msm-2.6.32 commit e4c1f16bf3b8fdd8d6c3c948a2723e9f37ad30b6 Merge: eabfa35 787adb2 Author: Trilok Soni Date: Wed May 19 23:11:20 2010 -0700 Merge "misc: isa1200: Add gpio request for Haptic enable gpio" into android-msm-2.6.32 commit eabfa350d23291a75967d4ed6b10e0757eb8c23f Merge: 1c0ba5f c91cf51 Author: Trilok Soni Date: Wed May 19 23:10:51 2010 -0700 Merge "mfd: pm8058: Add OTHC IRQ entries" into android-msm-2.6.32 commit 1c0ba5f9a78dc90f59e1c04994e10fcde9fd4c52 Merge: a726978 ae4cafd Author: Trilok Soni Date: Wed May 19 23:09:37 2010 -0700 Merge "msm: pm: control low power modes of the memory" into android-msm-2.6.32 commit a7269789c78d85c57bac7463fce8040918a7117c Merge: 8f00427 bcbc7e4 Author: Trilok Soni Date: Wed May 19 23:09:01 2010 -0700 Merge "defconfig: msm: 8x50: Enable the serial console by default." into android-msm-2.6.32 commit 8f00427fba7c0bef6745b76cfb44d595172aa1bc Merge: 7808348 a9923f5 Author: Trilok Soni Date: Wed May 19 23:08:39 2010 -0700 Merge "misc: pmic8058-pwm: change nSec to uSec to support large PWM period" into android-msm-2.6.32 commit 7b81da32f17dec3c4497320d3af339f86e73e385 Author: Swaminathan Sathappan Date: Tue May 18 12:18:17 2010 -0700 msm: audio: qdspv2: Change volume command during audpp enable Problem: During audpp enable Per Stream Volume (POPP) being set using a variable which is basically meant for Device volume control(COPP) Impact: Resulting in volume levels mismatch when skipping to next file Solution: Set volume of LPA device using only COPP in audpp enable Change-Id: I8f43b01aca787e55ed26dddb4d61470413e13fb6 Signed-off-by: Swaminathan Sathappan commit 4b4e08cdd1f09b4d15f7012f5a06e2389117bd94 Author: Rajesha Kini Date: Tue May 11 11:50:09 2010 +0530 msm: audio: qdsp5v2: Update encoder driver for incall error handling Updated encoder driver not to allow in call recording when voice is not active. Also register for voice state change events. Change-Id: I18b8a848af4502282ed40169264aff98238bd05e CRs-Fixed: 234902 Signed-off-by: Rajesha Kini commit 78083486f304ff630d11e5d9742004699b63376f Merge: 8e99a39 ff99883 Author: Murali Palnati Date: Wed May 19 21:12:16 2010 -0700 Merge "mmc: msm_sdcc: Grab host->lock in the pio irq handler." into android-msm-2.6.32 commit 73934b7b8004b0d85ea5fb44bf72a3efa413f0d1 Author: Matt Wagantall Date: Fri Apr 2 16:00:51 2010 -0700 msm: clock-8x60: Implement clk_set_min_rate() This function will set the clock rate to a value no less than the one specified. If a matching frequency is not found, -EINVAL will be returned. Change-Id: Ic4981fbee1467da2b43548b327c354238910d763 Signed-off-by: Matt Wagantall commit 8e99a39acfa3675bee9400b0efee9bd0d1b29874 Merge: 00d30fa 3ffffc8 Author: Bryan Huntsman Date: Wed May 19 16:12:04 2010 -0700 Merge "serial: msm_serial_hs: Handle tty allocation failures gracefully" into android-msm-2.6.32 commit 00d30fa63dc973298129777da5d3eb873beeefbf Merge: e60d870 2fa0bca Author: Bryan Huntsman Date: Wed May 19 16:11:52 2010 -0700 Merge "msm: audio: qdsp5v2: Notify voice state to Audio Device Control driver" into android-msm-2.6.32 commit 83dc8622696046dab35feeb72416ae162779d489 Author: Suresh Vankadara Date: Thu May 20 00:38:25 2010 +0530 msm: adsp: qdsp5v2: Update adsp driver for wakeup in idle power collapse Problem: ADSP driver uses IRQ 20(INT_ADSP_A11) to get messages from ADSP. In the Idle Power-Collapse case the Modem is not waking up Apps because it is defined as SMSM_FAKE_IRQ. As a result, the Apps processor is not woken up when the DSP has messages to deliver to it. Solution: The Modem detects IRQ 20 as a wakeup source, but INT_ADSP_A11 is defined as a fake interrupt. Therefore, swap the definitions of INT_ADSP_A11 and INT_ADSP_A9_A11. Change-Id: I3ad965ae1e64c6fef226e95b0c4a870f5ee637fd Signed-off-by: Suresh Vankadara commit c91cf514a94e24920d9446702474bb49332db676 Author: Anirudh Ghayal Date: Tue May 18 17:52:25 2010 -0700 mfd: pm8058: Add OTHC IRQ entries Change-Id: I7a9ad9704698a037e55b571f855b8f0e3e1eebdd Signed-off-by: Anirudh Ghayal commit e60d870f33a19b38fb293abc854b6e89bc26caf9 Author: Asish Bhattacharya Date: Mon May 17 13:15:39 2010 +0530 msm: audio: qdsp5v2: add device usage count to device structure Problem The device is typically used by different independent applications in user space, each opening and closing the device. This results in concurrency issues Impact The fist application to terminate closes all other applications as device is no longer available. if there is no central device manager available the concurrency will not be possible Solution Added a device usage count to help manage the usage independently in kernel instead of user space in order to have a centralized device management. Change-Id: I6866be11bd61729e8704c49d8ff98df5f682c556 Signed-off-by: Asish Bhattacharya commit 149f35f73482b62fbacc3d86ff4a7292ea077644 Author: Matt Wagantall Date: Wed May 19 10:24:50 2010 -0700 msm_reqs: Add video Flow IDs for additional screen resolutions The following flows are added: MSM_AXI_FLOW_VIDEO_PLAYBACK_WVGA MSM_AXI_FLOW_VIDEO_PLAYBACK_QVGA MSM_AXI_FLOW_VIDEO_RECORDING_QVGA Change-Id: I4b806c469c9cc743e5285c0a4de9ace0b353afc1 Signed-off-by: Matt Wagantall commit 6a34acf2b45261247bde565a175bfdfd995ba484 Author: Jeremy Gebben Date: Wed May 19 11:00:50 2010 -0600 msm: kgsl: correct implementation of kgsl_sharedmem_writel Change-Id: Ic769a0b29a5a79752234e4a78d370250af121be2 Signed-off-by: Jeremy Gebben commit 01a7dc79c87e1a3ff5d37fc1053194e6896cdbe2 Merge: f2d3701 0fc778f Author: Trilok Soni Date: Wed May 19 08:24:21 2010 -0700 Merge "mmc: core: Decrease minimum length requirements for SDIO CIS_FUNCE" into android-msm-2.6.32 commit f2d3701b77ea23211aec649de2fa53c7535a756f Merge: 6f880af 9f11b60 Author: Trilok Soni Date: Wed May 19 08:24:01 2010 -0700 Merge "mtd: set read ahead value of read queue to 4KB" into android-msm-2.6.32 commit 6f880af35a711eecd81cc599ea2955bd31f225b7 Merge: 7f4a2c2 f9e6f2f Author: Trilok Soni Date: Wed May 19 07:39:03 2010 -0700 Merge "msm: audio: qdsp5v2: Add new broadcast event AUDDEV_EVT_VOICE_STATE_CHG" into android-msm-2.6.32 commit 0fc778f946f4ce895d72398b3a4d5ff0e48b4c98 Author: Yunsen Wang Date: Tue Sep 22 21:57:13 2009 -0700 mmc: core: Decrease minimum length requirements for SDIO CIS_FUNCE Decreasing min length to 34, to temporarily fix Libra wlan SDIO chipset detection, will be removed once we move to new Libra wlan chipsets. Change-Id: I2e99347673c949fbc28d4cf090bfa2802d6fbea6 Signed-off-by: Yunsen Wang Signed-off-by: Sahitya Tummala commit ff998838320b7a37e05f0695db108b8cc830a8d9 Author: Murali Palnati Date: Wed May 19 17:44:19 2010 +0530 mmc: msm_sdcc: Grab host->lock in the pio irq handler. In PIO IRQ handler we access host data structure without holding the host->lock and this can potentially lead to shared data problems. So grab this lock in this IRQ handler whereever required. Change-Id: Idacd6c021df2b59cb53b45fcdac4368aa1414125 Signed-off-by: Murali Palnati commit 787adb29b824af7d8c5b6ad7b1bd09c2dd2f048b Author: Mohan Pallaka Date: Wed May 19 15:54:40 2010 +0530 misc: isa1200: Add gpio request for Haptic enable gpio Add gpio request to enable haptics. Change-Id: Idcdfffc6b4ca262ee41e5531ac7e358809fab2b1 Signed-off-by: Mohan Pallaka commit 7f4a2c226796c1ac8a25691c9193bfd4c71f461c Author: Trilok Soni Date: Mon Apr 5 21:28:42 2010 +0530 msm: board-7x30: Add power stabilization delay for marimba-tsadc Add 5ms delay after enabling or disabling the XO in-order to ensure that power is stable. We have observed that after multiple suspend-resume cycle the touchscreen becomes unresponsive, this delay ensures that we have sufficient time before re-program the tsadc. CRs-fixed: 237812 Change-Id: I622b142471f04e7424f26182bab6eae718de7806 Signed-off-by: Trilok Soni commit 564b708f0b50964eca98579354d0e2639f8cf6c8 Merge: 49a7d5d 7d305a7 Author: Trilok Soni Date: Wed May 19 02:01:56 2010 -0700 Merge "Revert "usb: msm_otg: Add phy reset support to tranceiver driver"" into android-msm-2.6.32 commit a9923f5cd8422dcc8b57de777437d73ceeded74b Author: Willie Ruan Date: Tue May 11 21:36:07 2010 -0700 misc: pmic8058-pwm: change nSec to uSec to support large PWM period PM8058 can support PWM period from 7 micro second to 393 second, but a 32-bit unsigned integer in nano second can only represent 4.096 second. Thus we have to change the unit of period in API like pwm_config() to micro second. Bugs of overflow, underflow and search algorithm are found and fixed as well. Change-Id: I60c96e88b49c1c554b42d8c8145124f0ae2404cc Signed-off-by: Willie Ruan commit 2fa0bcae210de0ef6665f69b6d972465f135bf8d Author: Rajesha Kini Date: Tue May 11 11:48:05 2010 +0530 msm: audio: qdsp5v2: Notify voice state to Audio Device Control driver Audio device control driver support voice call state notification events to registered clients. The driver can get voice state information only from voice driver. So updated voice driver to provide voice state information to Audio device control driver. Change-Id: I11c199c48f1881cfd12fdf2c2ca2065cf73cd2ab Signed-off-by: Rajesha Kini commit f9e6f2f3dbeb928be3efde942f441b913a49bd7c Author: Rajesha Kini Date: Tue May 11 11:46:59 2010 +0530 msm: audio: qdsp5v2: Add new broadcast event AUDDEV_EVT_VOICE_STATE_CHG Clients like encoder drivers need voice call state to allow voice call recording option. Added new event to notify voice states to all clients registered to listen on that event. Change-Id: I96216d56f5c4184f645bf30459fa81a14d992e80 Signed-off-by: Rajesha Kini commit 9f11b60d17707cf525610e9ebcf725a945293fad Author: Jeegar Lakhani Date: Tue May 18 19:09:37 2010 +0530 mtd: set read ahead value of read queue to 4KB The read ahead value was set to 4 KB in the .29 kernel since it was found to be the optimal value for boot time. This setting isn't present in the .32 kernel hence setting the read ahead value to 4 KB in the .32 kernel. Change-Id: Ic562045c07cb8cf774f432100193e3f5d591ce9a CRs-fixed: 237799 Signed-off-by: Jeegar Lakhani commit cda74635d1e668812c4c83dde9cd9944bfd07d65 Author: Kenneth Heitke Date: Fri May 14 17:40:37 2010 -0600 i2c-ssbi: Remove suspend/resume methods from the driver Remove the suspend and resume methods since they are not being used and can result in a false error being reported back to the clients when the driver believes that it is in the suspended state. Change-Id: Iae1051cdb067018928d9e297263656c8459a3f62 Signed-off-by: Kenneth Heitke commit e0312598f6210f5927b8c9979c4d44ac56cc5e3c Author: Anirudh Ghayal Date: Tue May 18 18:07:12 2010 -0700 input: pm8058-othc: Add support for boot time headset detection Change-Id: I5643f9a5cb1789fa8e0b4c68061142fc189e6eac Signed-off-by: Anirudh Ghayal commit 49a7d5d86be9fd6ada613b9a15eb7ed7abcc71f4 Author: Sankalp Bose Date: Fri May 14 18:35:12 2010 +0530 serial: Add device data for UARTDM lite instances Change-Id: I858be1ff1606e25e3ed4e4555d259cfc180005d3 Signed-off-by: Sankalp Bose commit 33c07eda45991912098ab82d1841bad51ff56fad Author: Patrick Lai Date: Mon May 17 17:46:47 2010 -0700 msm: audio: 7x30: Created dual-mic device for FLUID. Change-Id: I6b935a86f3c2b79559caeea623a07da8241a0725 Signed-off-by: Patrick Lai commit 7d305a7ecb7e2a49ec000ae4e3d9ab47b96d9a80 Author: Vamsi Krishna Date: Tue May 18 14:08:50 2010 -0700 Revert "usb: msm_otg: Add phy reset support to tranceiver driver" This change seems to be causing ulpi timeouts in .32 kernel. Till we find the rootcause reverting the change This reverts commit fb9bb50bc7a13250794eb94b74e215ed9fb0def1. Change-Id: I631c15410c7e5a91d305dedfb722bce789d19f89 Signed-off-by: Vamsi Krishna commit ae4cafd8c9d757d0fef872b54f0eea2fc2213871 Author: Ai Li Date: Tue May 18 13:02:08 2010 -0600 msm: pm: control low power modes of the memory Inform Modem that the application processor will control the low power modes of the memory. The feature is turned on by MSM_MEMORY_LOW_POWER_MODE. Change-Id: Icff036f09584e333453cc1e07b335906c8a3687b Signed-off-by: Ai Li commit bcbc7e42d37bff451578b483c7a1088f15152806 Author: Gregory Bean Date: Mon May 17 16:00:50 2010 -0700 defconfig: msm: 8x50: Enable the serial console by default. Signed-off-by: Gregory Bean Change-Id: Ic9af69c55869e8df181874e8c5a343f97c823c25 commit 2040fa565aa064b09d40b088097ba0b6504ffeb4 Merge: 8d22dd0 b26308b Author: Steve Muckle Date: Tue May 18 10:52:55 2010 -0700 Merge "defconfig: msm8660: Enable input device event interface" into android-msm-2.6.32 commit 8d22dd0c7d8f36e2bdc9231ad03670ce1a185ec9 Merge: b34760b f05c6fc Author: Steve Muckle Date: Tue May 18 10:52:48 2010 -0700 Merge "Modified build to be able to use an uncompress kernel image" into android-msm-2.6.32 commit cd72facb5007e523ffd93f8ecbaf1a6e15ac894a Author: Patrick Lai Date: Mon May 17 17:12:57 2010 -0700 msm: audio: 7x30: Define handset rx and tx devices for FLUID FLUID does not have built-in earpiece. So, handset_rx device is not applicable for FLUID. However, audio HAL does not have the logic to recognize that handset is not available and fall back to speaker as default device for voice call. The temporary workaround is to provide handset_rx and tx devices which essentially map to speaker rx and speaker tx. Change-Id: Ieaf801ff12959f13f22bf6d7f5e6e70ff907b44d Signed-off-by: Patrick Lai commit b34760b341d4a9fa38f29a50dc4dd6a51bb02dde Merge: 8f884765 3a1715f Author: Sridhar Parasuram Date: Tue May 18 10:17:22 2010 -0700 Merge "Revert "msm_rmnet: support IPV6, QoS, and raw IP framing"" into android-msm-2.6.32 commit 8f8847652b33de51907ef91bad5140e523f5b439 Merge: 2653712 2667bc8 Author: Trilok Soni Date: Tue May 18 08:33:37 2010 -0700 Merge "defconfig: Enable USB rmnet" into android-msm-2.6.32 commit 3ffffc8efaa7068e2cfd2c8d3fffe4c527dcfd80 Author: Sankalp Bose Date: Sun May 9 23:40:15 2010 +0530 serial: msm_serial_hs: Handle tty allocation failures gracefully Inserting a string to tty flip buffer may accept less characters than requested if tty buffer limits are reached. Unfortunately, tty buffering provides no mechanism for serial drivers to wait asynchronously for room in tty buffer and this needs to be handled by polling. This is a reasonable solution if we make the assumption that serial polling work would usually run after the tty buffer flushing work and hence would succeed in inserting to tty buffer. CRs-fixed: 235520 Change-Id: I2833b0c60ad26477523e28030055375834c377c9 Signed-off-by: Sankalp Bose commit 2653712d4c3bf208420993d4a2e744bb0aa6abcc Merge: 6a06ac0 dcc2732 Author: Trilok Soni Date: Tue May 18 01:55:43 2010 -0700 Merge "msm:venc:7k: Update video encoder command Ids" into android-msm-2.6.32 commit 6a06ac0a3753326f4295e4a6e511c3c6589a296a Merge: d75131c 81d1741 Author: Trilok Soni Date: Tue May 18 01:55:13 2010 -0700 Merge "msm: l2x0: Bring in changes from .29b" into android-msm-2.6.32 commit d75131c2885fad9b801113e5f524fbf62cffa2e2 Merge: 4c32d1c 795d1b3 Author: Trilok Soni Date: Tue May 18 01:54:41 2010 -0700 Merge "msm_fb: lcdc: Add support for clocks on 8660" into android-msm-2.6.32 commit 4c32d1c50690c19231c588f3bcc3db1e606319c0 Merge: 49d553d a048cad Author: Trilok Soni Date: Tue May 18 01:53:57 2010 -0700 Merge "msm_fb: display: add zorder check during overlay_set" into android-msm-2.6.32 commit 49d553d384f091e8fe7dba0b6ab8b4de9c12b0af Merge: 8f9e077 f0ff6c6 Author: Trilok Soni Date: Tue May 18 01:53:26 2010 -0700 Merge "msm: audio: qdsp5v2: Change Stream Volume Control event" into android-msm-2.6.32 commit 8f9e077747a46bbcbf3221b008b4ac14655cdb02 Merge: a41c5aa 76a9700 Author: Trilok Soni Date: Tue May 18 00:14:16 2010 -0700 Merge "msm: 7x30: Increase pmem memory for pmem_audio to 2 MB" into android-msm-2.6.32 commit 2667bc898ea2d5aab153c6b85771e8c5c3e4c5d3 Author: Pavankumar Kondeti Date: Mon May 17 16:56:56 2010 +0530 defconfig: Enable USB rmnet Change-Id: I6709b9ff3c05f15b23dc67ddaeb500ad4eac622a Signed-off-by: Pavankumar Kondeti commit b26308bfc298fe1788b8ae267694945a7e17ae52 Author: Anirudh Ghayal Date: Mon May 17 18:37:47 2010 -0700 defconfig: msm8660: Enable input device event interface Change-Id: I62a0746f9009ea02803b327be4986eac86ec79e2 Signed-off-by: Anirudh Ghayal commit 13dc316f6db5471e3e08fe322fffa248f7852e9d Author: Rabin VINCENT Date: Mon May 17 10:50:22 2010 +0530 gic: implement set_type From fe7b7388a543abcfa0cd7404e2c7521e2974848f Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Tue, 5 Jan 2010 09:56:34 +0530 Subject: [PATCH] gic: implement set_type Implement set_type() to allow configuration of the trigger type. Change-Id: Ib5c8128a2487e12e437fc18b93c122f700554115 Cc: Abhijeet Dharmapurikar Acked-by: Linus Walleij Signed-off-by: Rabin Vincent commit e20c53319cda064227ca11d293939254343db579 Author: Willie Ruan Date: Wed Apr 28 21:02:00 2010 -0700 msm: pmic8058-mpp: add direct PM8058 MPP configuration MPP (MultiPurpose Pin) on PM8058 chip can be configured for multiple purposes. This is the list of supported configurations: - digital input - digital output - digital bidirectional - analog input - analog input - current sink - test sink mode - test output mode Change-Id: I343d67c58ae43cf247ae65880724e64c7c6d86a6 Signed-off-by: Willie Ruan commit a41c5aa9a607025458fc4693f240fdff06962e7d Author: Steve Muckle Date: Mon May 17 16:58:18 2010 -0700 defconfig: msm8660: turn on ANDROID_BINDER_IPC Change-Id: Ia59d96eda35cbe6b0ba1457b073aa586c20f5e6d Signed-off-by: Steve Muckle commit 76a970086502f5d062219119c083d0ee439a661a Author: Ashraya Arya Date: Mon May 17 11:46:40 2010 -0700 msm: 7x30: Increase pmem memory for pmem_audio to 2 MB pmem_audio will be used for LPA playback. Requirement for this device is to use 4 output buffers of 512KB. Change-Id: I3c6ae08c24569012459340d18612e5b9103996f1 Signed-off-by: Ashraya Arya commit a048cadbbfbf89e28802d3ce2da5c7b997c49b42 Author: kuogee hsieh Date: Thu May 13 14:25:57 2010 -0700 msm_fb: display: add zorder check during overlay_set Add zorder check to avoid same zorder using by multiple overlay pipes. CRs-fixed: 232438 Change-Id: Ia6e66aba70f01a9b77ac6f2e1c565cc16496e613 Signed-off-by: Kuogee Hsieh commit 66ba02a1a81a226c1bf8e7ae138115b3499c9ae3 Author: Vamsi Krishna Date: Wed May 12 16:55:36 2010 -0700 usb: msm_otg: Do not vote for max axi in 8660 USB core in sps does not need to vote for max axi in 8660 Change-Id: I21e30498a54bb022a70da5d57f4ad9a4d95c7378 Signed-off-by: Vamsi Krishna commit 611bc4ec0a9b601c40fe80eb02b9a5bdfa5bc44a Merge: 69921d9 62a3b47 Author: Willie Ruan Date: Sun May 16 21:39:39 2010 -0700 Merge "mdf: mfd-core: prevent zero-byte plaform data allocations" into android-msm-2.6.32 commit 69921d9793f42dfbaa677372eac81c81fac95f54 Merge: 0604507 a90c8df Author: Trilok Soni Date: Sun May 16 09:00:39 2010 -0700 Merge "msm; board-msm8x60: add pmic8058 pwm device" into android-msm-2.6.32 commit 060450716933d078519f5347bd731b155b08392f Merge: 8ad9431 0ca79f1 Author: Trilok Soni Date: Sun May 16 08:59:56 2010 -0700 Merge "msm: board-msm8x60: Add support for LEDs" into android-msm-2.6.32 commit 8ad94313643ce60e8ea7eda849398ec5e790e761 Author: Matt Wagantall Date: Fri May 14 18:26:08 2010 -0700 msm: clock-8x60: Fix typo in CSI_VFE clock names The clocks should be called CSIx_VFE_CLK, not CSx_VFE_CLK. Change-Id: Ifdb8e964ab64412ea25be04a35418f37bc63095e Signed-off-by: Matt Wagantall commit dbe915ca8ac54bb822d9e9cfc41875899c560487 Merge: ade7f62 b544200 Author: Steve Muckle Date: Sat May 15 18:58:26 2010 -0700 Merge "msm: cpufreq: Use __cpuinit attribute to support CPU hot-plugging." into android-msm-2.6.32 commit ade7f62dc40138b8a7aab457db0a16489e11c53a Author: Steve Muckle Date: Sat May 15 13:35:06 2010 -0700 defconfig: automatic update Change-Id: I2ee5298243dbbdcd569726e1d8a701c79026cf3e Signed-off-by: Steve Muckle commit a90c8df1a9d97d95102ec79e6ee7423c17d6cebf Author: Steve Muckle Date: Wed May 12 22:48:55 2010 -0700 msm; board-msm8x60: add pmic8058 pwm device Change-Id: Ica0aa16c2268399a23982eb84be2f3231d3cd13a Signed-off-by: Steve Muckle commit 0ca79f1d91450b02a8983e5fe3756bc8cd6733ca Author: Anirudh Ghayal Date: Tue Apr 20 20:46:05 2010 -0700 msm: board-msm8x60: Add support for LEDs The LEDs are connected on the left and right GPIO expander lines. The generic gpio-leds driver is used to support these LEDs. Change-Id: I6ec0c9d5137e5f160b328ef843e7508621bb801c Signed-off-by: Anirudh Ghayal commit e40f8d36ce90c632e0dae37b1f6e347983616d87 Merge: 3194fb8 bcc43d9 Author: Steve Muckle Date: Sat May 15 13:27:14 2010 -0700 Merge "msm: clock: Correct "'ebi1_clk' not found" error checking" into android-msm-2.6.32 commit b5442007d994eab8653c6de20476cf07dcb979e9 Author: Matt Wagantall Date: Mon Apr 26 18:27:51 2010 -0700 msm: cpufreq: Use __cpuinit attribute to support CPU hot-plugging. msm_cpufreq_init() will be called when hot-plugging a CPU. Using the __cpuinit attribute will ensure the function remains available for the life of the kernel if hot-plugging support is compiled in. Change-Id: Ieb9e5dc60027da220462b21e730c4d4223181302 Signed-off-by: Matt Wagantall commit 3194fb8305a4b2816943fc32fb8d35a0e2811318 Author: Steve Muckle Date: Sat May 15 12:09:29 2010 -0700 defconfig: msm8660: turn on android configs, ffa, pmic, and more Change-Id: I1ecbb45d561b5c7b78acb1a726f50cef44315a16 Signed-off-by: Steve Muckle commit 29b2cf8cb13ff9cd45811f5bca4355d252dbd45b Author: David Ng Date: Sat May 15 11:27:25 2010 -0700 msm: board-msm8x60: add fake battery device Change-Id: I66526a239c44b9297ee21b2a4af1edb05b62b213 Signed-off-by: Steve Muckle commit 81a641a8265109c995f586e655eefeec18a49186 Merge: c35adfe a32a034 Author: Steve Muckle Date: Sat May 15 10:59:43 2010 -0700 Merge "msm: 8x60: Add support for write protect switch detection." into android-msm-2.6.32 commit c35adfe97d7b1716acc49dac3697efa02f72e0d2 Merge: 862a2e4 213eded Author: Steve Muckle Date: Sat May 15 10:59:01 2010 -0700 Merge "msm: board-msm8x60: enable GPIO expanders" into android-msm-2.6.32 commit 862a2e493c9ecec32a2da5707ab8ef422e074598 Merge: 1124d19 013a09a Author: Steve Muckle Date: Sat May 15 09:40:02 2010 -0700 Merge "[ARM] msm: kgsl: move translation error dummy space 32 bytes up" into android-msm-2.6.32 commit 1124d199afaf9253488c70634bf73cf1b4877e92 Merge: b7c01d4 cb3c141 Author: Steve Muckle Date: Sat May 15 09:33:31 2010 -0700 Merge "msm: kgsl: remove incorrect uses of kgsl_sharedmem_[read,write]" into android-msm-2.6.32 commit b7c01d4579029eb4442ed636cc8fa119cb0f6113 Merge: 609d987 a630185 Author: Steve Muckle Date: Sat May 15 09:33:22 2010 -0700 Merge changes Ib124c44d,Id91f085e into android-msm-2.6.32 * changes: [ARM] msm: kgsl: clear the dummyspace region at initialization [ARM] msm: kgsl: release the memory back into the free pool AFTER unmapping it commit 609d98730e40cd96c17e5417a298f5a94bc702b6 Merge: 2420b27 a3ca6ee Author: Steve Muckle Date: Sat May 15 09:32:57 2010 -0700 Merge "msm_fb: display: Fix calculating brightness duty level" into android-msm-2.6.32 commit 2420b27b27bab39b439ed950e44d084495215497 Merge: a447e73 a428e5a Author: Steve Muckle Date: Sat May 15 09:32:48 2010 -0700 Merge "msm: 7x27: Enable CONFIG_CPU_32v6K option in kernel config" into android-msm-2.6.32 commit a447e7319fcd32e20b0220dd4e2735f7336f9337 Merge: 91f473c 8cdda09 Author: Steve Muckle Date: Sat May 15 09:32:13 2010 -0700 Merge "mmc: msm_sdcc: Print the return code of clock handling functions." into android-msm-2.6.32 commit 8cdda098733d6c4660ebc8f7458c1d5ad5a35f8b Author: Murali Palnati Date: Fri May 14 16:12:22 2010 +0530 mmc: msm_sdcc: Print the return code of clock handling functions. In the function msmsdcc_reset_and_restore, capture and print the return code of clk_reset and clk_set_rate functions. With this we can now know what has caused these functions to fail. Change-Id: Ic4e1ed5a9b62b65f5988f925822486b72e6cd51b Signed-off-by: Murali Palnati commit a32a034a4f54a93ed3d2db0fb3e7d5d0012f0e5a Author: Aparna Mallavarapu Date: Mon Apr 19 17:05:54 2010 +0530 msm: 8x60: Add support for write protect switch detection. SD cards have a write protect switch, depending on the position of which, the host software can put the card in read-only mode, thereby preventing any write accesses to the card. Change-Id: Ic530613b8873d0be30ae41dbaec52e94f32f966e Signed-off-by: Aparna Mallavarapu commit 213eded40393a304c1e6377cd436a3cc310eea9e Author: Gregory Bean Date: Wed May 12 21:06:17 2010 -0700 msm: board-msm8x60: enable GPIO expanders The surf and ffa machines have multiple instances of sx150x gpio expanders. Change-Id: I4c7d97c4dd912344e8cb18bfba008eff45e427a2 Signed-off-by: Gregory Bean commit 91f473cd7718ccb6518a0f6a92c3a0f71bd0292d Author: Gregory Bean Date: Wed Apr 21 16:39:00 2010 -0700 gpio: sx150x: Optimize driver initialization. By writing the reset code to the sx150x chip's reset register instead of trying to fill in default values register-by-register, we obtain a fast, complete reset to a known state instead of a slow, piecemeal initialization. Change-Id: I435a8be3a231a56993423c84ff51512c05f05826 Signed-off-by: Gregory Bean commit 59f0598ed2efaeffd252e054d0ea588a4b5e2ce7 Author: Gregory Bean Date: Wed Apr 21 12:23:34 2010 -0700 gpio: sx150x: Enable shared interrupt. The sx150x driver had previously not supported shared interrupts, under the reasoning that since sx150x chips were on the far end of slow i2c busses, they could not determine interrupt ownership in hard-irq context and thus would never be placed on shared lines. That reasoning proved faulty. Change-Id: I9730968607cfe4007829b7867d3f1b2f12e13947 Signed-off-by: Gregory Bean commit 8959cc1cd33beea88ecac3f72a5be998ecd0da17 Author: Gregory Bean Date: Wed Mar 17 13:11:10 2010 -0700 gpiolib: sx150x: Added support for Semtech SX150x I2C GPIO expanders. Change-Id: I00b6c5f7a7315c60da4e198e61d95e97bbb0b895 Signed-off-by: Gregory Bean commit 4f16b50fbec0eb268d45231707bf0e50162c7905 Merge: 296c4a2 dc34a27 Author: Pavan Kumar Kondeti Date: Fri May 14 20:16:05 2010 -0700 Merge "msm_fb: display: initialize op_mode at every overlay play" into android-msm-2.6.32 commit 296c4a280be2947896bb0bbd0ad1f84aae9ed8c4 Merge: c8a14df 171130d Author: Pavan Kumar Kondeti Date: Fri May 14 20:14:50 2010 -0700 Merge "diag: Free up memory if write API fails" into android-msm-2.6.32 commit c8a14df130971a48a6c3b0d59bd3aa3034552935 Merge: a3571f9 4872cf3 Author: Pavan Kumar Kondeti Date: Fri May 14 20:14:05 2010 -0700 Merge "camera: Fix for regular snapshot post processing." into android-msm-2.6.32 commit a3571f97c7aa22ff85765d2614ec3b69d52a228f Merge: d3e90ae c1757ed Author: Pavan Kumar Kondeti Date: Fri May 14 20:13:12 2010 -0700 Merge "msm: clock-rpm: Add RPM clock control function stubs for 8x60" into android-msm-2.6.32 commit d3e90aed0dcce9df737d7949ec4eeb889c156fe3 Merge: fb92414 980bfb0 Author: Pavan Kumar Kondeti Date: Fri May 14 20:12:30 2010 -0700 Merge "msm: kgsl: Initialize driver variables properly." into android-msm-2.6.32 commit fb92414eee23d0ba74a476d8daec3a7a80807e57 Merge: 3e6d071 fb9bb50 Author: Pavan Kumar Kondeti Date: Fri May 14 20:11:53 2010 -0700 Merge "usb: msm_otg: Add phy reset support to tranceiver driver" into android-msm-2.6.32 commit f0ff6c65718969009389fd4159f524c381a90976 Author: Swaminathan Sathappan Date: Thu May 13 16:09:03 2010 -0700 msm: audio: qdsp5v2: Change Stream Volume Control event Modify stream volume change command to give LPA hardware decoder ID and COPP; Modify check for correct maximum decoders supported Change-Id: Ie14a082212ce36dfcfcfea9db0f4262e01b2e5a5 Signed-off-by: Swaminathan Sathappan commit 795d1b324ee9052b0d4ee96771bc87bf61088fce Author: Abhijeet Dharmapurikar Date: Fri Apr 2 17:03:53 2010 -0700 msm_fb: lcdc: Add support for clocks on 8660 8660 has different clocks than older platforms. Update lcdc to handle 8660 clocks as well as the older clocks. Change-Id: I0b57a525205af448207a1500e23910e5c13c3738 Signed-off-by: Abhijeet Dharmapurikar commit 3e6d0718ce2ee59a9bcb17b28ad38f22b85e2da6 Merge: cfe5719 b4ec136 Author: Willie Ruan Date: Fri May 14 17:27:33 2010 -0700 Merge "defconfig: Enable serial console" into android-msm-2.6.32 commit cfe57198cf8bddee9017cd59f6ec3a981a10c138 Merge: c319dd9 89c3294 Author: Steve Muckle Date: Fri May 14 17:26:01 2010 -0700 Merge "serial: msm_serial_hs_lite: HSUART legacy mode driver" into android-msm-2.6.32 commit c319dd9990578c2afc5b405636a97612f3cdb1a9 Merge: 3af647f e380a6a Author: Willie Ruan Date: Fri May 14 17:25:59 2010 -0700 Merge "msm: Use 'deadline' I/O Scheduler" into android-msm-2.6.32 commit 81d174192e4ac96232adad3590bac0a0a0983607 Author: Stephen Boyd Date: Sat May 2 12:49:33 2009 -0700 msm: l2x0: Bring in changes from .29b This brings in changes made to L2X0 cache code which missed the .32 merge. Bring them in to fix issues where neocore's FPS is getting cut in half. This squashed commit includes the following changes from .29b: 436680ab8b1cf1c2485c0125804c5d26555b64a0 L2 cache: add dmb() in suspend and l2x0_inv_all() in resume L2 cache needs to be invalidated upon power on in resume. When going to suspend, add memory barrier call dmb() to guarantee data being completely flushed out. 2f61c6a91b43552fcdf9ad4cb70eb4f4245787bb msm: add atomic operations to L210 cache Add invalidate, clean and flush atomic cache line maintenance operations to L210 cache. e5ce9f88a6e496a677e96a119029cc3f6905dfb4 msm: l2x0: Export L2 cache sync interface. cache sync will drain L2 write buffer, eviction buffer, and write allocate buffer. CRs-Fixed: 237805 Change-Id: I5d1178d0ddb61b48cc743fc54464c1e522009c09 Signed-off-by: Stephen Boyd commit 515edd173f6fd342f03d50ad633cbb1a9fff4b07 Author: Jeff Ohlstein Date: Fri May 14 16:49:13 2010 -0700 msm: timer: Only initialize timer registers on boot CPU hotplug will rerun local_timer_setup. We don't want to write to those registers when hotadding a cpu, as it will mess up the match value and stall the system until the timer catches back up. Change-Id: I886f28e1a3fa6d1b59715ad55713b4ace3e40b7f Signed-off-by: Jeff Ohlstein commit dcc273272e24152b85dc053d97d85ec159322f58 Author: Mahesh Lanka Date: Sat May 15 00:45:40 2010 +0530 msm:venc:7k: Update video encoder command Ids This commit correctly updates video encoder commandIds as per ARM-DSP interface specification Change-Id: I60741fdc77d65e6dc3b7adcd996e4fe7daa005bd Signed-off-by: Mahesh Lanka commit a3ca6eef9dff1c435fc48d51bbd71edc71f7b0c0 Author: Rajesh Sastrula Date: Fri May 14 15:05:42 2010 -0700 msm_fb: display: Fix calculating brightness duty level Calculate the brightness duty level based on the maximum brightness level supported by the panel rather than from a constant value. Change-Id: I4c8d371a59e38c084bddeaa827c3982b47bbc7ee Signed-off-by: Rajesh Sastrula commit 62a3b47ec9d8e19f84a74f04a98a6f910677c71a Author: Bobby Crabtree Date: Fri May 14 13:54:58 2010 -0700 mdf: mfd-core: prevent zero-byte plaform data allocations The mfd core allocates zero-sized platform data for its mfd cells if the data_size field in the mfd_cell structure is zero. Therefore, the mfd cell driver have no way of determining if the platform data passed into its probe function is valid. Dereferencing pointers that point to zero-sized chunks of memory yeilds undefined results. Change-Id: I2b3d03a08db0e6111ccba55e2752b0cc7d801bc4 Signed-off-by: Bobby Crabtree commit cb3c14105a96aa8fe22669bc1918f44d3a95e4a0 Author: Jeremy Gebben Date: Fri May 14 11:25:16 2010 -0600 msm: kgsl: remove incorrect uses of kgsl_sharedmem_[read,write] These functions are not atomic and shouldn't be used for individual word access. Use kgsl_sharedmem_[readl,writel] instead. Change-Id: Icdcd5f5c35a31fd744a1f36cb77d5fce40bd14aa Signed-off-by: Jeremy Gebben commit 171130ddb93b3ce1f43862f24fbb1b4b004f6dee Author: Shalabh Jain Date: Thu May 13 11:15:40 2010 -0700 diag: Free up memory if write API fails DIAG sends data to USB after allocating buffers from a mempool. If the write call to USB fails, the allocated buffer should be freed. Also the aggregation buffer pointer should be set to NULL. Change-Id: Id368797aa1bf40bb28f6e96ceacd037a945ac9d6 CRs-fixed: 238679 Signed-off-by: Shalabh Jain commit 3af647fe57ecd07ba9a6c7ed30c6ff2a9405522e Author: Aparna Mallavarapu Date: Wed Apr 21 12:50:38 2010 -0700 msm: board-msm8x60: Add support for hardware based SD card detection. On 8660 SURF the card presence can be detected via interrupts on PMIC GPIO 22. This patch adds necessary changes to enabled this. Change-Id: Ie6940e27c920e9eef8aff9c6118f5f7278982760 Signed-off-by: Aparna Mallavarapu Signed-off-by: Murali Palnati commit e962052be34986446fe1655f9f69d051ff723222 Author: Steve Muckle Date: Thu Apr 1 19:45:39 2010 -0700 msm: board-msm8x60: FFA ethernet support The interrupt for the ethernet controller on the 8660 FFA goes through the 8058 PMIC. Change-Id: I8da8e65b902187dcb63b3dbc50717bc2ecc0132a Signed-off-by: Steve Muckle commit ee26c619e29f7590cc36588e8214a5b8a5ee50ae Author: Trilok Soni Date: Tue Dec 1 18:59:59 2009 +0530 msm: board-msm8x60: Add 8660 FFA 6x5 key mappings Some of the keycodes assigned right now are experimental and they will change over time as the functionality becomes clear. CRs-Fixed: 211781 Change-Id: Ib2af4fa5c147223a593b3e5c22ca4740f10e9e81 Signed-off-by: Trilok Soni commit 4872cf3ae85c9920ac102beedc7ccf4624aff645 Author: Ninad Patgaonkar Date: Fri May 14 11:00:22 2010 -0700 camera: Fix for regular snapshot post processing. Added support to send the thumbnail image buffer information to the config thread in the user space. Also added a branch after main image information is collected there by avoiding raw snapshot buffer iformation from overwriting the main image buffer information. Change-Id: I8c52d3e0ef148ba12b1fd39265469820f3f17233 Signed-off-by: Ninad Patgaonkar commit 980bfb041bc7b521a0c10aa7a350348a3ee36ddb Author: Lucille Sylvester Date: Fri May 14 11:51:17 2010 -0600 msm: kgsl: Initialize driver variables properly. If this variable isn't in the correct state the G12 driver will fail to initialize when it is next opened. Change-Id: I61e8a7df71261210e98c8fb87ab36a4dc92dc831 Signed-off-by: Lucille Sylvester commit bcc43d910faef2af598e0d01c02bc797c0545133 Author: Matt Wagantall Date: Fri May 14 00:51:01 2010 -0700 msm: clock: Correct "'ebi1_clk' not found" error checking clk_get() will return an ERR_PTR if the clock is not found, so check for IS_ERR, not for a NULL address. Change-Id: I08961d547e5b669cf6b95ff2f7ec121f394bc59d Signed-off-by: Matt Wagantall commit c1757ed27550ee865adb2f45770e9408fe405db0 Author: Matt Wagantall Date: Thu May 13 18:37:32 2010 -0700 msm: clock-rpm: Add RPM clock control function stubs for 8x60 Remote 8x60 clocks will be controlled by the RPM processor. Add stub 'clk_ops' functions that will eventully be used as the clock interface to the RPM. A placeholder 'ebi1_clk' remote clock is also added for 8x60 so that ebi1_clk_set_min_rate() calls for this clock do not fail. Change-Id: Iab73c0dd255f72e6534cfc52c4f2063f11b5de76 Signed-off-by: Matt Wagantall commit 3a1715fe43c7d15a180343c088fee5f3d0e4376d Author: Abhijeet Dharmapurikar Date: Fri May 14 09:12:56 2010 -0700 Revert "msm_rmnet: support IPV6, QoS, and raw IP framing" This reverts commit af37071a914e77e84a372e17a050e259eaa4773e. It is not yet LOST approved. Change-Id: I63f8cb44ccaafa8b0cba5f52be641d265c8f3e67 Signed-off-by: Abhijeet Dharmapurikar commit a93592c46f31ce1fcae5787bfa5582122d30feb6 Merge: 1873954 347a643 Author: Stephen Muckle Date: Fri May 14 09:06:38 2010 -0700 Merge "msm_fb: Fallback to correct clock" into android-msm-2.6.32 commit 18739544b3251df81d4528ee04805aaa37e44ada Merge: 0df334b dae610e Author: Stephen Muckle Date: Fri May 14 09:06:24 2010 -0700 Merge "msm: clock-7x30: Fix tv src clock fallback" into android-msm-2.6.32 commit 0df334bc295d8ec649ff1a1f1de1bd61f28d32a1 Merge: f65f09c 5ad70e8 Author: Stephen Muckle Date: Fri May 14 09:06:10 2010 -0700 Merge "mtd: msm_nand: Select CRC16 and BITREVERSE for MSM Nand." into android-msm-2.6.32 commit f65f09c8d48cd15376f5bdad00080b043706216d Merge: 300bc20 f950762 Author: Stephen Muckle Date: Fri May 14 09:05:59 2010 -0700 Merge "diag: Fix return values for IOCTL command" into android-msm-2.6.32 commit 300bc2053079aa006a09d40579fe3ef88f51a120 Merge: 1837791 17c2244 Author: Stephen Muckle Date: Fri May 14 09:05:39 2010 -0700 Merge "mmc: msm_sdcc: Cleanup in the probe and remove functions" into android-msm-2.6.32 commit 1837791ef528757e40f7ba952363a9c5b1ffcecd Merge: 742ed46 f02eacc Author: Stephen Muckle Date: Fri May 14 09:05:25 2010 -0700 Merge "mmc: msm_sdcc: Correct IRQ free call for PIO interrupts." into android-msm-2.6.32 commit 742ed46c26147a138b21273f76c106dad1977f50 Merge: 1d736fb 6bea437 Author: Steve Muckle Date: Fri May 14 08:31:43 2010 -0700 Merge "input: pmic8058_keypad: remove dependency on MSM7X30" into android-msm-2.6.32 commit 1d736fb8cf622969dfbfd6fe2375d410874289a4 Merge: 9ebd7ff 183907e Author: Steve Muckle Date: Fri May 14 08:31:18 2010 -0700 Merge "Makefile: revert change to -gstabs" into android-msm-2.6.32 commit 89c329490d743eb76813bc6376a8ecc94e833543 Author: Sankalp Bose Date: Mon Apr 5 03:57:11 2010 +0530 serial: msm_serial_hs_lite: HSUART legacy mode driver Change-Id: If4e58e19fc637b689a36a2185c115189baf40f18 Signed-off-by: Sankalp Bose commit b4ec1369b64931e3769710870ea8d495d38a3a52 Author: Sankalp Bose Date: Fri May 14 20:03:55 2010 +0530 defconfig: Enable serial console Change-Id: I8c3b5bf5d4914a747c2b90236dad1f26cb78c0a5 Signed-off-by: Sankalp Bose commit f950762af01314492639852be62685f5f423cf0e Author: Shalabh Jain Date: Thu May 13 13:41:15 2010 -0700 diag: Fix return values for IOCTL command User space processes using DIAG library send ioctl to DIAG char driver for various purposes. The return values for various ioctl calls were not correct. Change-Id: I87b629b7aa00fbb4e5c571334031d237d2e59fa8 Signed-off-by: Shalabh Jain commit 9ebd7ff337c9091adbc27b094e625b3f45eb093f Merge: 9fa2074 ef46e93 Author: Pavan Kumar Kondeti Date: Fri May 14 04:56:44 2010 -0700 Merge "mmc: core: Add support for MMC cards with CSD structure revision 3." into android-msm-2.6.32 commit fb9bb50bc7a13250794eb94b74e215ed9fb0def1 Author: Vamsi Krishna Date: Wed May 5 17:40:08 2010 -0700 usb: msm_otg: Add phy reset support to tranceiver driver Change-Id: I6620cf71d3d43685cae30a84146a624a2f770a11 Signed-off-by: Vamsi Krishna commit 9fa207453116292b1a32c1432100577b2907bc3a Merge: ad00ed0 5f81ca3 Author: Pavan Kondeti Date: Fri May 14 00:58:40 2010 -0700 Merge "diag: Check for buffer limit before writing to it." into android-msm-2.6.32 commit 5ad70e8e160685d4117ebb3d453bb6ea555a11be Author: Murali Palnati Date: Fri May 14 13:02:15 2010 +0530 mtd: msm_nand: Select CRC16 and BITREVERSE for MSM Nand. CRC16 and BITREVERSE are needed by the MSM Nand driver for computing the ONFI CRC checsum. So select these automatically when MSM Nand is enabled. Change-Id: I553db45ecff90ad8c328ad672c11f64f91a87846 Signed-off-by: Murali Palnati commit ef46e937d5d7165fab8e401e141444fc42e6b5f8 Author: Murali Palnati Date: Mon Jan 11 09:52:07 2010 +0530 mmc: core: Add support for MMC cards with CSD structure revision 3. CSD structure version 3 and above are defined by MMC specification as reserved, to be specific, CSD version is encoded in the EXT_CSD register. Some manfacturers like SanDisk use this version for some of their latest MMC 4.3 plus, iNand cards. This patch adds support for these cards. Signed-off-by: Murali Palnati commit ad00ed0c34e194cc9c54d13000f858e928a8514d Merge: d28dbf6 1e7b30f Author: Pavan Kondeti Date: Thu May 13 20:31:34 2010 -0700 Merge "msm: Set & Reset SMSM_RPCINIT flag in SMSM_APPS_STATE from RPC Router." into android-msm-2.6.32 commit d28dbf6d06c56e27b97d9f98e8a3081408ba772e Merge: c5f3a41 2eab439 Author: Willie Ruan Date: Thu May 13 18:26:40 2010 -0700 Merge "board: msm7x30: Update the PMIC GPIO36 usage for SD card detection." into android-msm-2.6.32 commit c5f3a41eaa50568b4f8d1c30e3bb6c28f274f53c Merge: 166a149 1542bd9 Author: Willie Ruan Date: Thu May 13 18:26:07 2010 -0700 Merge "power: msm_battery: Fix dependency issue with fake battery driver" into android-msm-2.6.32 commit 166a14979e51380b449eb6a8b7e53fc888b12830 Merge: c1caa5f c1dd27a Author: Willie Ruan Date: Thu May 13 18:25:52 2010 -0700 Merge "mmc: msm_sdcc: Fix a possible race condition in the driver probe" into android-msm-2.6.32 commit 347a643f440b0ba370830d54cb85966df18d7023 Author: Stephen Boyd Date: Thu May 13 18:23:59 2010 -0700 msm_fb: Fallback to correct clock The tv_src clock should fallback to the TV_ENC clock and not the TV_DAC clock. This was already fixed in the devices.c table but wasn't fixed in the driver. Change-Id: I9dbf17d9123d25142e8123b54b1c5856482b087b Signed-off-by: Stephen Boyd commit dae610eecb4dbab4243fd974d7b3e548446c0244 Author: Stephen Boyd Date: Thu May 13 18:20:57 2010 -0700 msm: clock-7x30: Fix tv src clock fallback The tv source clock should fall back to TV_ENC if under proc_comm control. A mismerge happened when this table was prepared for 7x30 local control. Change-Id: I97fd95a4db5a321751727c5f09e825ac3470338b Signed-off-by: Stephen Boyd commit 6bea437ecfd0b516648ed6a81cdc74417474e779 Author: Steve Muckle Date: Wed May 12 18:19:54 2010 -0700 input: pmic8058_keypad: remove dependency on MSM7X30 Remove ARCH_MSM7X30 dependency as core driver takes care of top-level dependencies. Change-Id: I2eceb770f6a741bcaa1710db68482b1d9ea8d360 Signed-off-by: Steve Muckle commit 183907eae86ce0eea29d50be80fcb2d6fc98064a Author: Steve Muckle Date: Wed May 12 13:25:37 2010 -0700 Makefile: revert change to -gstabs The -gstabs format is not supported by some recent debuggers. Change-Id: I69221f6d3888843a2dda1394b332a03dc1b07ab7 Signed-off-by: Steve Muckle commit a428e5ae63efde975c6cf286b0d38a5e3cfa02c0 Author: Dinesh Garg Date: Mon May 10 17:47:43 2010 -0700 msm: 7x27: Enable CONFIG_CPU_32v6K option in kernel config Enable CONFIG_CPU_32v6K option in kernel config. 7x27 supports 'K' extension. This enables the kernel to use some instructions not present on previous processors. CRs-fixed: 238268 Change-Id: If79ae6b2b69c1d3e175d49d68c27ed2781530284 Signed-off-by: Dinesh Garg commit e380a6a95fd7545ce421642c8b367c4b1c40496f Author: Dinesh Garg Date: Mon May 10 18:19:34 2010 -0700 msm: Use 'deadline' I/O Scheduler Use 'deadline' scheduler for I/O Scheduling. Limited testing shows better performance with deadline scheduler for the kind of workload we have on android. Also this is the default scheduler used on android devices. Change-Id: Idedf934221153dd832ecd03c42906d9093e6613d Signed-off-by: Dinesh Garg commit 5f81ca3533797ee50a6e10a4bff624b801f829ea Author: Shalabh Jain Date: Thu May 13 11:51:54 2010 -0700 diag: Check for buffer limit before writing to it. DIAG user space library has a read thread which passes data from kernel to user space applications using DIAG. This read thread uses a buffer to pull data upwards. DIAG kernel driver needs to respect the boundaries of this buffer before writing data to it. Change-Id: Icf3a2fb3052142605f11b306c41922a16e257bb0 Signed-off-by: Shalabh Jain commit 1e7b30fd5bf76e969d9499cde7ef15dc926faf06 Author: Karthikeyan Ramasubramanian Date: Mon Apr 19 16:43:29 2010 -0600 msm: Set & Reset SMSM_RPCINIT flag in SMSM_APPS_STATE from RPC Router. Set the SMSM_RPCINIT flag after RPC Router opens the SMD port. Reset the SMSM_RPCINIT flag before RPC Router closes the SMD port. CRs-fixed: 230426 Change-Id: I35e4ea3fda2469a9537f93b7eeca43ca23e0ac4a Signed-off-by: Karthikeyan Ramasubramanian commit dc34a27a27d726d98b34046c9fa5175322d794ba Author: kuogee hsieh Date: Thu May 13 10:21:54 2010 -0700 msm_fb: display: initialize op_mode at every overlay play Re-initilize op_mode to have it update with new value according to new overlay play's configuration Change-Id: I7ee2489a93efa72e691746037bdf853d862a023b CRs-fixed: 230612 Signed-off-by: Kuogee Hsieh commit f05c6fcca9381a6d9aad5fbd9a970ad97d035d55 Author: Dominic Binks Date: Thu May 13 13:23:15 2010 -0700 Modified build to be able to use an uncompress kernel image Changes to the AndroidKernel.mk file to allow the board config makefile to request an uncompressed kernel image as it's output Change-Id: I5977f6a51ce6117ec62f01ca15d65c2776397a8e Signed-off-by: Dominic Binks commit c1caa5f503c689d36d357abdd99f4f9c676d5ae1 Merge: 87b0aed 227048b Author: Willie Ruan Date: Thu May 13 10:16:11 2010 -0700 Merge "msm: msm_nand: Generate CRCI mask only once during driver probe." into android-msm-2.6.32 commit 2eab439c81bb0333705cecc986fae1be1dbca2f8 Author: Aparna Mallavarapu Date: Thu May 13 16:01:41 2010 +0530 board: msm7x30: Update the PMIC GPIO36 usage for SD card detection. Currently PMIC GPIO is converted to MSM GPIO and MSM_GPIO_TO_INT macro is used to obtain the IRQ. Use the updated macro PM8058_GPIO_IRQ to convert PMIC GPIO to IRQ for SD card detection. This patch does this change. CRs-fixed: 238365 Change-Id: I1a6ffba95c1dd3ec21fa9526677d0c6de3e00a64 Signed-off-by: Aparna Mallavarapu commit 227048b63b5d6a66da7b5a2d5ef23cded4e069d6 Author: Murali Nalajala Date: Fri Apr 30 16:26:45 2010 +0530 msm: msm_nand: Generate CRCI mask only once during driver probe. Generate CRCI mask only once during probe and use it multiple times on every call to msm_dmov_exec_cmd from nand driver. Change-Id: I202993133bd349b5690810378e3c65671fce481a Signed-off-by: Murali Nalajala commit 87b0aedfd45cfe722bdb54f8b53365fe013e4f5c Merge: 457da9a af37071 Author: Trilok Soni Date: Thu May 13 01:50:53 2010 -0700 Merge "msm_rmnet: support IPV6, QoS, and raw IP framing" into android-msm-2.6.32 commit 457da9a0202c6f680b448736bcdb67373b8c18f2 Merge: 3db1307 fcad7a1 Author: Trilok Soni Date: Thu May 13 01:50:26 2010 -0700 Merge "msm: spi_qsd: Add QUP SPI support for 8x60" into android-msm-2.6.32 commit 17c22447c6881f006746d8a6597d68d354a56c79 Author: Aparna Mallavarapu Date: Thu May 13 11:40:08 2010 +0530 mmc: msm_sdcc: Cleanup in the probe and remove functions When host->plat and plat are available, consistently use one convention to improve readability. Change-Id: I69345cda088c2a158d4f1977a07d8a12b021294c Signed-off-by: Aparna Mallavarapu commit f02eacc298d66af624acc792c9de99acf496f952 Author: Aparna Mallavarapu Date: Thu May 13 11:33:13 2010 +0530 mmc: msm_sdcc: Correct IRQ free call for PIO interrupts. Change-Id: I953a3088a42c46c51033074b3b270f6e91695684 Signed-off-by: Aparna Mallavarapu commit c1dd27a647d851d908adeaf98daa6209a720a81c Author: Aparna Mallavarapu Date: Wed May 12 16:31:40 2010 +0530 mmc: msm_sdcc: Fix a possible race condition in the driver probe Card's old status is currently initialized after registering the interrupt handler for the interrupt based card detection. With this there is a possiblity that card detection interrupt can get fired before the old status is properly initialized. So, initialize old status before enabling the irq. Also reorder the probe function contents such that this IRQ is enabled just before registering the new host controller. CRs-fixed: 231331. Change-Id: I4e872f98d740a307dcfaeceadc7f8e520dc82a91 Signed-off-by: Aparna Mallavarapu commit 3db130709e66e2843e5b5008b9296b106b71c54d Merge: a40f26c b185e1f Author: Willie Ruan Date: Wed May 12 20:07:39 2010 -0700 Merge "msm: audio: 7x30: Add low power audio decoder driver support" into android-msm-2.6.32 commit a40f26c893341c1efb7a041d30a1c77bcbc994d0 Merge: 3c64234 b239b82 Author: Willie Ruan Date: Wed May 12 18:04:26 2010 -0700 Merge "msm: kgsl: move to drivers/gpu/msm" into android-msm-2.6.32 commit 3c642345c8f0bb88ac279e9aec36d9776bf5f756 Merge: d9c1040 e78996a Author: Willie Ruan Date: Wed May 12 16:55:56 2010 -0700 Merge "mfd: pmic8058: add api to get irq status" into android-msm-2.6.32 commit 1542bd9a6384d757942cd82a8bbd90ae4159168f Author: David Ng Date: Wed May 12 15:42:26 2010 -0700 power: msm_battery: Fix dependency issue with fake battery driver Remove MSM RPC dependency when using fake MSM battery driver. Change-Id: Id10249f0fe819150ce0ebbd73e224ebe16d1a0d7 Signed-off-by: David Ng commit e78996abcdcbf0b33991332c150b913b3dafff57 Author: Bobby Crabtree Date: Wed May 12 14:50:31 2010 -0700 mfd: pmic8058: add api to get irq status The new api pm8058_irq_get_rt_status returns the real-time irq status for the given irq. The irq status is useful for drivers, such as headset, that need to know if the irq was dispatched because of a rising or falling edge interrupt. Change-Id: I4f9e9d01c965fe70a92c32b6695bf1ae9d845c49 Signed-off-by: Bobby Crabtree commit d9c1040c7bb2aa2beacf921750e78a283eace6b6 Merge: a0ab22e a61321d Author: Willie Ruan Date: Wed May 12 14:20:24 2010 -0700 Merge "mmc: msm_sdcc: Remove CONFIG_MMC_MSM7X00A which is redundant." into android-msm-2.6.32 commit a0ab22e5013a7cbc8e9f354bc23225099a95e715 Merge: c07a66b ed15ff0 Author: Willie Ruan Date: Wed May 12 14:20:14 2010 -0700 Merge "mtd: msm_nand: Cleanup the prints in the probe function." into android-msm-2.6.32 commit 013a09a715838aa5ffd11d18ba79347f40aab5ce Author: Jeremy Gebben Date: Wed May 12 13:57:37 2010 -0600 [ARM] msm: kgsl: move translation error dummy space 32 bytes up Leave the bottom 32bytes of the dummy area zeroed out for other uses (like VGT dummy cycles). This is needed so that in case of a translation error, garbage written into this area does not have adverse effects. Change-Id: I3c7abe028bece82fec8c53bdf1d243dad1917746 Signed-off-by: Dima Zavin [jgebben@codeaurora.org: minor merge conflicts in kgsl_mmu_init()] Signed-off-by: Jeremy Gebben commit a630185eef6c6167f2da1b64a6234241055f2c08 Author: Dima Zavin Date: Wed Feb 24 01:29:10 2010 -0800 [ARM] msm: kgsl: clear the dummyspace region at initialization The dummyspace area is being used to insert dummy operation for some of the blocks when reprogramming the page tables. Non-zero data in that region was causing the VGT to go off into the weeds. Change-Id: Ib124c44df2eabb303675a4a10fb36418b173259a Signed-off-by: Dima Zavin [jgebben@codeaurora.org: minor merge conflicts in kgsl_mmu_init()] Signed-off-by: Jeremy Gebben commit b273d38644b8df3166eeb1fb2a45415179da6202 Author: Dima Zavin Date: Wed Feb 24 01:27:56 2010 -0800 [ARM] msm: kgsl: release the memory back into the free pool AFTER unmapping it Change-Id: Id91f085ef46b7a1bdbcff96b9c41c864a6943004 Signed-off-by: Dima Zavin Signed-off-by: Jeremy Gebben commit b239b82c8efa23759c5ab320cb2cb648b133e2fd Author: Jeremy Gebben Date: Wed May 12 12:05:15 2010 -0600 msm: kgsl: move to drivers/gpu/msm This location was recommended by google and matches where other chipset vendors are putting their gpu drivers for android. Change-Id: I1a1620871e5121363c8a080b80ec25d725065e4c Signed-off-by: Jeremy Gebben commit c07a66b5dd206b18e69bfd73450e9fb5ca85f5c3 Merge: 4c54db0 78beaf4 Author: Willie Ruan Date: Wed May 12 12:16:21 2010 -0700 Merge "defconfig: 8x50: Enable USB rmnet" into android-msm-2.6.32 commit b185e1f2da2d4c659a2d26d5ad401f1dc0876f58 Author: Swaminathan Sathappan Date: Fri Apr 16 17:42:36 2010 -0700 msm: audio: 7x30: Add low power audio decoder driver support Add low power audio decoder driver support; handle HLB audio playback. Add device switch changes relevant to the new buffer handling for low power audio driver. PCM and MP3 media types are supported in low power mode. Change-Id: Ic7a5c59d28f53df43dc7aa3209bc822f8f1b9047 Signed-off-by: Swaminathan Sathappan commit af37071a914e77e84a372e17a050e259eaa4773e Author: Abhijeet Dharmapurikar Date: Tue Apr 27 23:15:51 2010 -0700 msm_rmnet: support IPV6, QoS, and raw IP framing The RmNET network driver is updated to support additional functionality. To improve performance, the Modem offers use of raw IP framing over RmNET channel. The userspace application can select to use either Ethernet (default) or raw IP framing via IOCTL command. This change requires minor updates to kernel network code to support raw IP mode in IPV6 address configuration. Additionally, the Rx packet protocol (IP version) must be assigned before sending packet to data stack by examining the IP header field. To support end-to-end quality of service (QoS) packet handling, the Modem requires tx frames to have a QoS header pre-pended. The header contains the Modem QoS flow handle, which is specified in the skb "mark" field provided by data stack. This value is zero by default, indicating Modem primary flow. When required, the mark value will be assigned by IP table mangle rule configured by userspace application. The userspace application can enable driver QoS support via IOCTL command. Change-Id: Ibc98a27be47066ef5c5c278d30442e7f4c91cb2d Acked-by: Andrew Richardson Signed-off-by: Abhijeet Dharmapurikar commit fcad7a156ce68424b0790dc8d52c8fd3a25519be Author: Kenneth Heitke Date: Fri Apr 9 15:08:34 2010 -0600 msm: spi_qsd: Add QUP SPI support for 8x60 Add initial device and resource configuration for QUP SPI on 8x60 platforms. Change-Id: Icc724ebf24880162866b3db7d3dc61c29ad3ebbd Signed-off-by: Kenneth Heitke commit a61321d3b6f25494699ac921820ee097aa618ac5 Author: Murali Palnati Date: Wed May 12 18:05:19 2010 +0530 mmc: msm_sdcc: Remove CONFIG_MMC_MSM7X00A which is redundant. Support for MSM SDCC controller can be selected by the option CONFIG_MMC_MSM. CONFIG_MMC_MSM7X00A is the older option which is redundant now and should be removed. Change-Id: I999eb32134863a4e28ff72cd907d012fe831eb86 Signed-off-by: Murali Palnati commit ed15ff0fd40c10d531e9802eb9d9e31028c833be Author: Murali Palnati Date: Wed May 12 15:02:19 2010 +0530 mtd: msm_nand: Cleanup the prints in the probe function. There are some prints in the probe function which are really not necessary. Also some of the prints needed some cleanup like eliminating spaces at the end of the line and using __func__ instead of hard coded strings. Change-Id: Id42feeb9c21854adc1781bc297c236d643016726 Signed-off-by: Murali Palnati commit 4c54db062d5c4812f179fd353c69f1667264fe35 Author: Sriranjan Srikantam Date: Mon May 10 09:48:43 2010 +0530 msm: audio: qdsp5v2: Enable the AUDIO_START debug message by default Move the debug message that signifies the DSP AUDPLAYTASK state during AUDIO_START to MM_INFO to know the audio instance status which makes logs analysis during stress tests and when rarely reproducible issues are reported to check if decoder has moved to play state. This message gets printed only once per audio session Change-Id: Ibd3c7d94a7f01fc7dfe8068abe5110faf31ed2ec Signed-off-by: Sriranjan Srikantam commit e4069d4aa6c74d78e33fb17dd6ba637e66a82f3e Author: Anirudh Ghayal Date: Mon May 10 18:20:33 2010 -0700 msm: board-8x60: Add board info for PMIC8058 vibrator motor Change-Id: Ifde0d2ebc459b04612df76b8e9cd27ef587b0cbe Signed-off-by: Anirudh Ghayal commit 0c4d6d2e1f97bffedfe28e5348f9ffff99aad87b Merge: 2fad75a c4581cc Author: Willie Ruan Date: Tue May 11 15:56:13 2010 -0700 Merge "msm_fb: Fix for Crash observed while video streaming." into android-msm-2.6.32 commit 2fad75aa7b171f5dc33e62369e0ea08a39aff57f Merge: 08eb262 1b4aab4 Author: Willie Ruan Date: Tue May 11 15:55:59 2010 -0700 Merge "media: camera: In VFE 3.1,clear IRQ's immediately after reading" into android-msm-2.6.32 commit 1b4aab4a9e610e4f29cb97e62c22d7a61895c260 Author: Nagesh Subba Reddy Date: Thu Apr 29 14:50:27 2010 -0700 media: camera: In VFE 3.1,clear IRQ's immediately after reading Clear the pending IRQ immediately, rather than wait until ISR sends IRQ's for processing for VFE 3.1. Change-Id: Idf15c35932cc1bc4099d33a6f4bc408c0c2a3df8 Signed-off-by: Nagesh Subba Reddy commit 08eb26228fd817ad8d63f2dc643709344d1ab946 Author: Sriranjan Srikantam Date: Mon May 10 09:44:28 2010 +0530 msm: audio: qdsp5v2: Increase the AUDIO_START timeout value During stress tests when DSP is loaded with multiple audio sessions the PLAY state success message from DSP for decoder may get delayed. This is resulting in AUDIO_START failures due to less timeout value. Hence increasing timeout value to one second to avoid AUDIO_START failures in multiple audio instances scenario. Change-Id: Ie73bb3f84b655c620ba0805ca823d5dc86aa6f8d Signed-off-by: Sriranjan Srikantam commit 78beaf4c4e6f493bfa86cc490857b1ddc6600d9f Author: Pavankumar Kondeti Date: Tue May 11 22:22:58 2010 +0530 defconfig: 8x50: Enable USB rmnet Change-Id: Ic805c60f5488474580bbfd56eb9cbadf82b4af3e Signed-off-by: Pavankumar Kondeti commit 0d605f89e51ceca9d1fc420b1b6640e47a6c3274 Merge: f40fc0f 8875add Author: Pavankumar Kondeti Date: Tue May 11 05:30:41 2010 -0700 Merge "msm: board-8x60: Add board info for PMIC8058 PWR/END key" into android-msm-2.6.32 commit f40fc0f425aa05b59a3d4c95fd58136db833ddbf Merge: 96d4ad3 bb906c4 Author: Pavankumar Kondeti Date: Tue May 11 03:52:03 2010 -0700 Merge "msm_fb: Configure GPIO18 for HDMI Interrupt line." into android-msm-2.6.32 commit 8875addb05f33b0105976609f3390c07a5aaf519 Author: Anirudh Ghayal Date: Mon May 10 16:48:48 2010 -0700 msm: board-8x60: Add board info for PMIC8058 PWR/END key Change-Id: I5bc934db0747b2ec4aa62a88f07afa0b90bd7098 Signed-off-by: Anirudh Ghayal commit 96d4ad3dcc3e9a5d8bdd2c35a56904a7e777da8e Merge: 3197fa4 a13e5be Author: Pavankumar Kondeti Date: Tue May 11 02:16:55 2010 -0700 Merge "msm: audio: 7x30: Modify avsync feedback mechanism" into android-msm-2.6.32 commit 3197fa4d359fbc884c4995bb5ed9cbec2bf9dc61 Merge: a2898fc a7c69c8 Author: Pavankumar Kondeti Date: Tue May 11 02:16:40 2010 -0700 Merge "msm: kgsl: remove incorrectly merged copy of kgsl" into android-msm-2.6.32 commit bb906c4fd4cbbc9bd60c06f527052463b6795754 Author: Abhishek Kharbanda Date: Mon May 10 16:56:00 2010 -0700 msm_fb: Configure GPIO18 for HDMI Interrupt line. Configure MSM GPIO18 as "no pull" to get ADV7520 HDMI controller interrupts . Change-Id: Ib00ae3be7fbf799037a58e21554e3ee94be6cd44 Signed-off-by: Abhishek Kharbanda commit a2898fc66d320a5e2bee882e8630a399dc54b901 Author: Sriranjan Srikantam Date: Mon May 3 15:29:33 2010 +0530 msm: audio: 7k: Update the debug messages to use dynamic printk Dynamic printk feature will be used by all audio and adsp drivers to enable/disable the debug messages at runtime. Remove the existing debug level architecture and move unwanted messages to pr_debug so that they are not printed by default CRs-Fixed: 219086 Change-Id: I0d4feaa24a6008b2ad0126ddba93e58c036ed187 Signed-off-by: Sriranjan Srikantam commit 63bd53d0d9eed6a4845c18e920e4407c62180cb0 Merge: 49cf9e9 f2faea9 Author: Pavankumar Kondeti Date: Mon May 10 20:42:28 2010 -0700 Merge "mdf: pmic8058: allow subdevices to supply their own dev id" into android-msm-2.6.32 commit 49cf9e9e4bdedb0ee26c87fe31859465c646bd36 Merge: e16e426 5fb5967 Author: Pavankumar Kondeti Date: Mon May 10 20:40:41 2010 -0700 Merge "arm: cache page tables and set ACTLR on Scorpion" into android-msm-2.6.32 commit e16e42679acfb618e3015f370c3e508ab3c62dcc Merge: 450486f 8ed8d3e Author: Bryan Huntsman Date: Mon May 10 17:46:54 2010 -0700 Merge "msm: clock-7x30: Header cleanup" into android-msm-2.6.32 commit 450486fcfe98de6bd7de097cc45a6a7f225e8a9f Merge: 212b5ca ffd3b11 Author: Bryan Huntsman Date: Mon May 10 17:46:38 2010 -0700 Merge "msm: clock-8x60: Fix use of glitch-free MUX for banked multimedia clocks." into android-msm-2.6.32 commit 212b5ca8245c69405ff06b8a41fe40e8a2791838 Merge: d0f9cdc 6f8f5e5 Author: Bryan Huntsman Date: Mon May 10 17:46:22 2010 -0700 Merge "msm_fb: Enabled 32 bpp framebuffer for MDP 3.1" into android-msm-2.6.32 commit d0f9cdc60de7810d992c4560f7e158ceffc20401 Merge: cfddb77 b43e0df Author: Willie Ruan Date: Mon May 10 16:42:27 2010 -0700 Merge "msm: turn on L2 cache on 7x27" into android-msm-2.6.32 commit f2faea93a32c730b66ac8b99decd2230fe2b5a4e Author: Bobby Crabtree Date: Fri May 7 13:53:23 2010 -0700 mdf: pmic8058: allow subdevices to supply their own dev id The pmic8058 regulator driver, a subdevice of the pmic8058 core driver, uses device ids to distinguish between each regulator. Thus it is necessary for each regulator instance to supply its own device id for identification purposes. Change-Id: I989e5ba498dedba734369da358fb7d51fb07627c Signed-off-by: Bobby Crabtree commit cfddb77194a889294993b242ca8725ca3e120216 Merge: bc404a2 9224827 Author: Willie Ruan Date: Mon May 10 15:24:27 2010 -0700 Merge "media: camera: Fixed UB configration of stats write master." into android-msm-2.6.32 commit bc404a2d4ae48f983de2c53306ccbb9db0f91b9f Merge: 91c9a03 397d780 Author: Willie Ruan Date: Mon May 10 15:24:17 2010 -0700 Merge "msm: spm: migrate code that sets 7x30 Scorpion voltages to SPM driver" into android-msm-2.6.32 commit 91c9a03df1022e184a57d40c1e4e06c2274cc231 Merge: 8a4908a bb6fb3f Author: Willie Ruan Date: Mon May 10 15:23:58 2010 -0700 Merge "msm: remove bogus message in time_remote rpc server module" into android-msm-2.6.32 commit 8a4908a42ea75076a33b7822ed21e10523f51d8b Merge: d099100 a63a37a Author: Willie Ruan Date: Mon May 10 15:23:46 2010 -0700 Merge "[ARM] mtd: Collect bad block count for ecc stats lazily." into android-msm-2.6.32 commit a13e5bec26f93433ef790f5f4236742ac352c2f5 Author: Swaminathan Sathappan Date: Mon May 10 13:56:02 2010 -0700 msm: audio: 7x30: Modify avsync feedback mechanism Modify avsync feeback to handle on-demand avsync info got from DSP. Removed periodic updates of avsync info to user client Change-Id: Ib2ff394fb1f479e497aac001040f93abfe0ad1d6 Signed-off-by: Swaminathan Sathappan commit ffd3b114db82bd62589636500aaab23dce286c84 Author: Matt Wagantall Date: Fri May 7 12:51:22 2010 -0700 msm: clock-8x60: Fix use of glitch-free MUX for banked multimedia clocks. The glitch-free MUXes used for bank-switching can only switch sources when both inputs are clocked. When the clock is off, this may not be the case. Hence, don't switch banks when the clock is off. Change-Id: I0bbadbf4130da2e0390eae94d12d98595716d651 Signed-off-by: Matt Wagantall commit 8ed8d3e8c216e3736b9522ca2b714288d191d0b3 Author: Stephen Boyd Date: Mon May 10 12:06:15 2010 -0700 msm: clock-7x30: Header cleanup These functions were recently renamed and moved into clock-7x30.c exclusively to make clock.c more generic. Since they no longer exist remove them from the header file. We also no longer expose the 7x30 specific clock ops, so remove that from the header file as well. Change-Id: Ic04c6784f072275259e026079f53b44f7cec069b Signed-off-by: Stephen Boyd commit 9224827a4d5ffe8a3126f3d8a7b0af2d30b7f4d6 Author: Yannuo Yang Date: Thu May 6 12:26:09 2010 -0700 media: camera: Fixed UB configration of stats write master. According to SWI, UB offset definition is programming n-1 means n words. Correct the configurations for all stats UB buffer. Change-Id: I43a102808323c8960b79a3dbbb3503a7e04629c8 Signed-off-by: Yannuo Yang commit 5fb59679924cfc63d7799d00cb8a82e50a82169f Author: Larry Bassel Date: Fri May 7 14:59:30 2010 -0700 arm: cache page tables and set ACTLR on Scorpion These were set in .29, porting to .32 Change-Id: If49b277e7275b3a9bf1a575ca3c75118e431c18e Signed-off-by: Larry Bassel commit c4581cc91114979a3f290193579e5fb35ed56e58 Author: Abhishek Kharbanda Date: Mon May 10 09:00:03 2010 -0700 msm_fb: Fix for Crash observed while video streaming. Fix by restoring orginal value in iBuf.mdpImg.mdpOp everytime mdp_start_ppp( ) is called. CR's fixed: 233048 Change-Id: I32aeed34e79919bfd1855665261d40c7c630fe88 Signed-off-by: Abhishek Kharbanda commit 397d780588138e98ab4fff97855b0373c98f898b Author: Ai Li Date: Thu May 6 17:39:43 2010 -0600 msm: spm: migrate code that sets 7x30 Scorpion voltages to SPM driver Migrate code that sets the Scorpion voltages on 7x30 from acpuclk to the SPM driver. It serves two purposes: 1) it allows the SPM driver to restore Scorpion voltage to the correct level after coming out of power collpase; 2) it consolidates code that deals with the SPM AVS Wrapper hardware block to the same driver. Change-Id: I0e0f08648810c9a05e2ef3b916380b49fb243495 Signed-off-by: Ai Li commit a7c69c858ced0942f70fa33ac2cbb3984537c342 Author: Jeremy Gebben Date: Thu May 6 16:17:02 2010 -0600 msm: kgsl: remove incorrectly merged copy of kgsl There are currently 2 copies of the kgsl driver in the kernel, drivers/video/msm/gpu/kgsl and drivers/char/msm_kgsl. The former is obsolete code and isn't built, current development has been happening in the latter. Change-Id: Ibdcf9b9386a3862902a0e820d4bda18050b2d3ae Signed-off-by: Jeremy Gebben commit d099100ee50cc5eed8861b0c32ddaf7435190ccb Merge: 4015d5c a51bea7 Author: Asish Bhattacharya Date: Mon May 10 07:28:40 2010 -0700 Merge "msm: alsa: 7x30: Replace old event posting API to new exported API" into android-msm-2.6.32 commit 6f8f5e5325522b8691c35750cea5b2a28561a5a2 Author: Jeevan Shriram Date: Mon May 10 11:12:42 2010 +0530 msm_fb: Enabled 32 bpp framebuffer for MDP 3.1 Modified DMA routined to support RGBA 8888 format for 32 bit frame buffer. Change-Id: I755da9c8be0a23ef175c840064f9981923df1316 Signed-off-by: Neeraj Kumar Signed-off-by: Jeevan Shriram commit 4015d5c028615a38792be31db7b99f5702bd122e Author: Murali Palnati Date: Fri May 7 17:41:43 2010 +0530 mmc: msm_sdcc: Fix the irq return code for SDCC IRQ. The SDCC IRQ handler is incorrectly returning the IRQ return code as IRQ_NONE, though it has handled the interrupts. This can cause the IRQ unhandled count to increase, that would eventually result in the kernel disabling this IRQ. This change fixes this issue by returning proper IRQ handled status. Change-Id: I6878fb9d10c9220c7eab76d3c0cb8c4d3a5e0cde Signed-off-by: Murali Palnati commit 2f7a979387e1fc2673adf8475a4c0dfec662d840 Merge: 2eb1bb0 9b338a9 Author: Steve Muckle Date: Sat May 8 10:01:31 2010 -0700 Merge "msm_fb: Reduce number of framebuffers for HDMI driver." into android-msm-2.6.32 commit 2eb1bb06683bcabf5ec2ef52a69efe9d62810973 Merge: 58fd6ef 43286d1 Author: Steve Muckle Date: Sat May 8 10:00:48 2010 -0700 Merge "power: msm_battery: Add support to bypass MSM battery queries" into android-msm-2.6.32 commit 58fd6ef71397baf2866cc06cd91ede1d5260b392 Merge: 5313f92 8852eae Author: Steve Muckle Date: Sat May 8 10:00:33 2010 -0700 Merge "msm: clock-8x60: Enable AHB clocks and MM PLLs and AXI clocks at boot." into android-msm-2.6.32 commit 5313f92ab21a3b26e1ae67d283c1c39b9afe67f8 Author: Matt Wagantall Date: Wed May 5 14:31:35 2010 -0700 msm: acpuclock-8x60: Add SMP scaling support through CPUFreq. Introduce CPUFreq support for the msm8x60. This includes SMP Scorpion and L2-cache scaling. CPU voltage scaling, Application Fabric (AFAB) clock scaling, and PLL voting are not currently supported. The Scorpions will scale up to 1188MHz, and the L2 cache up to 864MHz. The clocks will be set to these rates during the acpuclock driver initialization. Change-Id: Ic7aef8e8b91325c14f9b17ca8a4269dfcfbfc7ab Signed-off-by: Matt Wagantall commit 9b338a9fd33b47b7e5d56f09cc78cbccf415b928 Author: Abhishek Kharbanda Date: Fri May 7 18:14:35 2010 -0700 msm_fb: Reduce number of framebuffers for HDMI driver. Reduce number for framebuffer from 2 to 1 for HDMI driver, as fb1 is not being used for dual display video playback. But still fb1 needs to be initalized with at least 1 framebuffer ,as hardware requirement, to get registered successfully. Change-Id: I4d24e1d0ec5bd0f9fe858157fe6f8a578a0c6f02 Signed-off-by: Abhishek Kharbanda commit 32116e235ad9040c11cf9d667c0d002786250934 Merge: fc13ad4 dce3f1b Author: Bryan Huntsman Date: Fri May 7 17:49:21 2010 -0700 Merge "msm: audio: 7k: Increase the AUDIO_START timeout value" into android-msm-2.6.32 commit fc13ad4190dc273d7ca6ca926256459f9f45812e Merge: b66baec 1d161d6 Author: Bryan Huntsman Date: Fri May 7 17:48:45 2010 -0700 Merge "mmc: msm_sdcc: Correct IRQ request call for PIO interrupts." into android-msm-2.6.32 commit b66baeca422bfa847b71e2754987da6571c9090b Merge: 48c8507 9802bce Author: Bryan Huntsman Date: Fri May 7 17:48:09 2010 -0700 Merge "msm: handset: Add support for 3-switch handset" into android-msm-2.6.32 commit 48c8507480a1ce389f33fe6b20ed727d0a56692a Merge: 8051293 c6c8111 Author: Bryan Huntsman Date: Fri May 7 17:47:50 2010 -0700 Merge "msm: pmic: add new pmlib APIs" into android-msm-2.6.32 commit 8051293e4e5e1cc3b61f31eb0f8d86e5145ae209 Merge: a9e2b4b 018d16a Author: Bryan Huntsman Date: Fri May 7 17:47:15 2010 -0700 Merge "msm_fb: CONFIG_PM=n warning fixes" into android-msm-2.6.32 commit a9e2b4bf4d23965737a740a1e2ea746091abf5b2 Merge: 7d12df3 d92c8f0 Author: Steve Muckle Date: Fri May 7 15:49:11 2010 -0700 Merge "msm: 8x60: Add android platform device and composition table" into android-msm-2.6.32 commit 7d12df33fe2480e4b42de16adcb9e945420c8087 Merge: f137f9c f252c4e Author: Steve Muckle Date: Fri May 7 15:47:07 2010 -0700 Merge "usb: msm_gadget: Fix NULL pointer reference" into android-msm-2.6.32 commit f137f9c5d2b32f54e280f6747c7cbfbb41220558 Merge: 335f2ce 31d9769 Author: Steve Muckle Date: Fri May 7 15:46:44 2010 -0700 Merge "usb: msm_otg: 8660 USB clk related changes" into android-msm-2.6.32 commit 335f2ce756a7498b3a607a51b7f283558ea36f33 Merge: 6e47e6d a630d10 Author: Steve Muckle Date: Fri May 7 15:45:55 2010 -0700 Merge "usb: msm_gadget: Stub out rpc apis for 8660" into android-msm-2.6.32 commit b43e0dfd3981a4d73491f454f88a893263ff07fa Author: Larry Bassel Date: Fri May 7 14:55:36 2010 -0700 msm: turn on L2 cache on 7x27 The L2 cache was turned on by default in .29, not yet in .32 Change-Id: Id52bd550d9dede58ff5b9194990c46d3904fabc2 Signed-off-by: Larry Bassel commit a63a37a27bfa0022534f936cbff72fa1737c2886 Author: Murali Palnati Date: Thu Jul 23 11:26:11 2009 +0530 [ARM] mtd: Collect bad block count for ecc stats lazily. Normally bad block counts for ECC stats are collected during boot time. This can be done lazily when the ECCGETSTATS ioctl is invoked on the partition. This can significantly decrease boot time, depending on the size of the partition. Also rescanning on every ioctl invocation helps in having the latest bad block count rather than depending on the count that is collected during boot. Change-Id: Ib6d445d5f74d832d09af0db34f1d8025e6ec2486 Signed-off-by: Murali Palnati commit 6e47e6dec0a1724d6117b883ba25a9f561ca12e2 Merge: d2f536b 35b4a7f Author: Jordan Crouse Date: Fri May 7 13:27:59 2010 -0700 Merge "defconfig: 7x27: Enable DYNAMIC_DEBUG option in defconfigs" into android-msm-2.6.32 commit d2f536b46fde5eeaaddf838bb9dec26d1d45cafb Merge: 44694da bc17b11 Author: Jordan Crouse Date: Fri May 7 13:27:38 2010 -0700 Merge "msm: audio: qdsp5v2: Fix for wrong events sent to all clients" into android-msm-2.6.32 commit 8852eaee36ee03c6083f4e7a7d26429041bdddab Author: Matt Wagantall Date: Wed May 5 21:39:26 2010 -0700 msm: clock-8x60: Enable AHB clocks and MM PLLs and AXI clocks at boot. Don't count on the bootloader to initialize these clocks and PLLs. For now, everything is enabled at boot and never disabled. This includes Peripheral and Multimedia AHB clocks, Multimedia AXI (Fabric) clocks, as well as the Multimedia PLLs. In the future, hardware control of supported AHB clocks should be introduced, along with software control of the remaining clocks. Change-Id: If7afc06827e5ea54ac8455264a7c723e3fece337 Signed-off-by: Matt Wagantall commit d92c8f02b56f5f132cc6a93d1efd7c1ade1702aa Author: Vamsi Krishna Date: Wed May 5 16:43:50 2010 -0700 msm: 8x60: Add android platform device and composition table Add android device along with composition table Change-Id: I4a21cf38d7ece71cd2442478e0e2c6daf2b8e000 Signed-off-by: Vamsi Krishna commit f252c4e15d61dbbfc81923af07c934f0d4b6d33f Author: Vamsi Krishna Date: Wed May 5 16:43:06 2010 -0700 usb: msm_gadget: Fix NULL pointer reference It is possible for the driver not to have any platform data. Check for platform data reference before accessing it Change-Id: I9afc94164b540acc92ce7e7078313558b8be8fc5 Signed-off-by: Vamsi Krishna commit 31d9769b1ae3683f25ba0935e488c632c79d401b Author: Vamsi Krishna Date: Wed May 5 16:40:54 2010 -0700 usb: msm_otg: 8660 USB clk related changes For USB HS core which is in SPS peripheral/ahb clock is not required. Set USB_HS_CLK to 60MHz explicitly Change-Id: If1e9767416c015d49b4b86101925a926a9977cfc Signed-off-by: Vamsi Krishna commit a630d104f12ed787fe3c22c343e4356974d65166 Author: Vamsi Krishna Date: Wed May 5 16:40:08 2010 -0700 usb: msm_gadget: Stub out rpc apis for 8660 For 8660 smd rpc router is not up yet. Stub out rpc calls when rpc router is not defined Change-Id: I548053309079e66d2b644b1d21128d1079e8ba2f Signed-off-by: Vamsi Krishna commit 44694da9c357a7a856589a61fe367752709cefc7 Merge: 4cb557f cfe54d5 Author: Trilok Soni Date: Fri May 7 11:20:15 2010 -0700 Merge "msm: handset: Add support for HS 3.0" into android-msm-2.6.32 commit 018d16a0649a3de7cc72cd7524a96e7035025067 Author: Stephen Boyd Date: Tue Jul 7 16:53:52 2009 -0700 msm_fb: CONFIG_PM=n warning fixes Disabling power management (CONFIG_PM) results in compilation warnings. drivers/video/msm/msm_fb.c:427: warning: 'msm_fb_resume_sub' defined but not used drivers/video/msm/mdp.c:1057: warning: 'mdp_suspend_sub' defined but not used drivers/video/msm/mddi.c:280: warning: 'mddi_suspend' defined but not used drivers/video/msm/mddi.c:290: warning: 'mddi_resume' defined but not used Change-Id: I74ec1040e2a8eddc893f96f596476f12bf06cfe5 Signed-off-by: Stephen Boyd commit dce3f1b09564b4a2db4d990545e2d2773c0975d1 Author: Sriranjan Srikantam Date: Fri May 7 18:43:23 2010 +0530 msm: audio: 7k: Increase the AUDIO_START timeout value During monkey and stress tests when DSP is loaded with multiple audio sessions the PLAY state for decoder may get delayed. This is resulting in AUDIO_START failures due to less timeout value. Hence increasing timeout value to one second to avoid AUDIO_START failures in multiple audio instances scenario. Change-Id: I087bab40f470b82bf161150c9245efd6d1ce5e9d Signed-off-by: Sriranjan Srikantam commit 4cb557f2bc5a5b0db5d94072b493f37c975f7d63 Merge: a8f85fd 40dbef6 Author: Trilok Soni Date: Fri May 7 05:20:36 2010 -0700 Merge "msm: 8x60: Add usb otg and peripheral platform devices" into android-msm-2.6.32 commit 1d161d634fbd1a9e01a18b7eccf3b914c83e96d7 Author: Murali Palnati Date: Fri May 7 17:29:06 2010 +0530 mmc: msm_sdcc: Correct IRQ request call for PIO interrupts. PIO interrupts are now handled by IRQ0, that corresponds to MMCIMASK0. This IRQ line corresponds to irqres->start and MMCIMASK1 corresponds to irqres->end. This change fixes the request_irq call to ensure that the PIO interrupt handler gets registered to the correct IRQ line. Change-Id: I42ca5fb7d8243fb2b553d1358b04d4ebef789c3f Signed-off-by: Murali Palnati commit a51bea7b4b88a01fb7b599a375daacc490817030 Author: Rajesha Kini Date: Thu May 6 23:32:18 2010 +0530 msm: alsa: 7x30: Replace old event posting API to new exported API The old exported API does not allow session id to be passed as a parameter resulting in event to be sent to unintended clients. With new parameter user can specify the intended client to be notified. Change-Id: Ib72a3675fc972b0d59b02c400fa785f205e0374b Signed-off-by: Rajesha Kini commit bc17b11e6fc888623007f03a3bb24b67b7560a22 Author: Rajesha Kini Date: Thu May 6 23:28:18 2010 +0530 msm: audio: qdsp5v2: Fix for wrong events sent to all clients Problem If the audio device has multiple sessions routed and one of the sessions gets derouted, DEV_RLS event goes to all the sessions currently running on the device. Impact If a same device has multiple sessions running all sessions close when a single session is attempted to closed. Solution Mask all other sessions for which the event is not intended before sending the DEV_RLS event.Also ensure that two simultaneous calls donot impact by taking appropriate locks. Change-Id: Iaa340b47a35986e2d1eb69d5dc7832157ae117d1 Signed-off-by: Rajesha Kini Signed-off-by: Asish Bhattacharya commit 9802bceb260082105bb76fb39db936f77c624c8c Author: Mohan Pallaka Date: Tue May 4 19:58:54 2010 +0530 msm: handset: Add support for 3-switch handset Add support for 3-switch handsets by receiving new keycodes from modem through rpc. The corresponding Linux keycodes are configured as VOLUP and VOLDOWN, and can be changed depending on requirement. Change-Id: Id99edc842b0195b2a331a153289e02e1b9b63d20 Signed-off-by: Mohan Pallaka commit 35b4a7fdb3b6d6375a19b10263adbcffaafa924e Author: Sriranjan Srikantam Date: Mon May 3 12:01:58 2010 +0530 defconfig: 7x27: Enable DYNAMIC_DEBUG option in defconfigs Audio drivers will use DYNAMIC DEBUG support to enable and disable audio debug messages at runtime. Enable the config option in defconfigs. Change-Id: Idad4b251cd97a54829c80b3ed74009fb549adb87 Signed-off-by: Sriranjan Srikantam commit 40dbef6a453a50c6be6a452ab99ccf546a18b70d Author: Vamsi Krishna Date: Wed May 5 16:39:07 2010 -0700 msm: 8x60: Add usb otg and peripheral platform devices Change-Id: I23a76005f0a4274c2731e8a7b8fad534ef9d8d81 Signed-off-by: Vamsi Krishna commit a8f85fd4fc2732cf337699c2e8335ce9cfa9a70c Merge: 0fd8bac a68a572 Author: Trilok Soni Date: Fri May 7 03:17:30 2010 -0700 Merge "msm: Remove output pointer validity check in oem rapi" into android-msm-2.6.32 commit 0fd8bac38470edc1cddd4732b7ae5f63d94d144b Merge: 6569bff 9030968 Author: Trilok Soni Date: Fri May 7 03:17:04 2010 -0700 Merge "msm: audio: 7x30: Update the debug messages to use dynamic printk" into android-msm-2.6.32 commit cfe54d554909f35a405a7d6bde6ab2f7e96b2a72 Author: Mohan Pallaka Date: Tue May 4 19:12:38 2010 +0530 msm: handset: Add support for HS 3.0 Add support for HS3.0 while maintaining the backward compatibility. Change-Id: If52ef79face053f161fcc404c63c283dd6551fc4 Signed-off-by: Mohan Pallaka commit 6569bfff0b1fb611287cea8842c577030d8b74f0 Merge: 83fe9d3 718d90a Author: Bryan Huntsman Date: Thu May 6 23:56:18 2010 -0700 Merge "msm: add pmic8058 support to msm8x60" into android-msm-2.6.32 commit 83fe9d354480f4140127c74ff0965d193d4ec575 Merge: 432baf7 3b76b86 Author: Bryan Huntsman Date: Thu May 6 23:56:06 2010 -0700 Merge "msm: rpcrouter: Turn off debug messages" into android-msm-2.6.32 commit 9030968dcc9485e1530b9cb293478f866ea1fae4 Author: Sriranjan Srikantam Date: Thu Apr 29 17:19:16 2010 +0530 msm: audio: 7x30: Update the debug messages to use dynamic printk Dynamic printk feature will be used by all audio and adsp drivers to enable/disable the debug messages at runtime. Remove the existing debug level architecture and move unwanted messages to pr_debug so that they are not printed by default Change-Id: I61d5fd4007aca52342a9ed35b07b6c47f7bcd91f Signed-off-by: Sriranjan Srikantam commit 432baf7ba410f6336023fa65927ac8032ad39765 Merge: 2f96a02 1f490a6 Author: Steve Muckle Date: Thu May 6 17:39:17 2010 -0700 Merge "msm_fb: Fix compile errors" into android-msm-2.6.32 commit 2f96a02eb77a63af331bffc1d5b32608f749797a Merge: bb5094c 5eb1987 Author: Steve Muckle Date: Thu May 6 17:39:12 2010 -0700 Merge "i2c-ssbi: Fix bug causing data corruption on multiple-byte writes" into android-msm-2.6.32 commit bb5094ce5edc66f087fba8078df8714446cb3bf2 Merge: 68f5a2e 632a573 Author: Steve Muckle Date: Thu May 6 17:38:24 2010 -0700 Merge "qup_i2c: Incorporate better RESET and interrupt clearing logic" into android-msm-2.6.32 commit 68f5a2ed49d35dc178f6c7482557cf61f47f7b1b Merge: 54beaea f54f418 Author: Steve Muckle Date: Thu May 6 17:38:16 2010 -0700 Merge "qup_i2c: Move QUP I2C mini core init earlier in boot sequence" into android-msm-2.6.32 commit 718d90ab2fb6830584e6fb17f6359458c8c00969 Author: Bobby Crabtree Date: Thu May 6 12:00:51 2010 -0700 msm: add pmic8058 support to msm8x60 Add platform data for the pmic8058 core driver, configure msm gpio as summary interrupt pmic, register pmic i2c board info. Change-Id: Ib808c309d27cc1bbac37eb8394229528226ed9c9 Signed-off-by: Bobby Crabtree commit 1f490a6233e090d223c33378e05574cf3aece2ad Author: Abhijeet Dharmapurikar Date: Fri Apr 2 12:52:32 2010 -0700 msm_fb: Fix compile errors Fix compile errors when CONFIG_HAS_EARLYSUSPEND, CONFIG_PM or CONFIG_ANDROID_PMEM are not defined. Change-Id: Ib3ccf62b9aea81586a67709871787e72f4a0f218 Signed-off-by: Abhijeet Dharmapurikar commit 5eb1987b070a3ab88b70c405e8f1be6162194b61 Author: Kenneth Heitke Date: Fri Apr 2 14:01:53 2010 -0600 i2c-ssbi: Fix bug causing data corruption on multiple-byte writes Signed-off-by: Kenneth Heitke commit 54beaeabe68f53cefbdce53d64b0de13af996f86 Author: Kenneth Heitke Date: Fri Mar 19 19:41:06 2010 -0600 i2c-ssbi: Add support for the PMIC Arbiter The PMIC Arbiter is a hardware wrapper around the SSBI 2.0 controller that is designed to overcome concurrency issues and security limitations. The driver will use this new interface when 'PMIC Arbiter' is specified as the controller type in the platform data. Change-Id: I6f6efa9f6793120c8419f4c86db8e995d5c49cc6 Signed-off-by: Kenneth Heitke commit 4fb571360c171b6f062b3eaa2a7e4ea34ed30d4a Author: Kenneth Heitke Date: Tue May 4 14:04:01 2010 -0600 msm: board-7x30: ssbi: Add controller type to SSBI platform data The controller_type field in the SSBI platform data is used by the i2c-ssbi driver to identify controllers that support the SSBI 2.0 protocol. Change-Id: I3ba0edf7ec85a988c39e5b17213a5ef002706703 Signed-off-by: Kenneth Heitke commit 34082478281bcee6698d6d266bc6ba8d0cb5af84 Merge: e25af9f cbd06c3 Author: Steve Muckle Date: Thu May 6 14:44:23 2010 -0700 Merge "misc: pmic8058-pwm: support the option of no lookup table" into android-msm-2.6.32 commit e25af9f7cb0368bfb65c2d081b515aa0343d1dd7 Merge: f3e2ab3 cc52786 Author: Steve Muckle Date: Thu May 6 14:43:46 2010 -0700 Merge "msm: camera: Add support for YUV recording on 7x30." into android-msm-2.6.32 commit a68a572bc68ea9d003a64607860d5f56522710d7 Author: Vishwanathapura, Niranjana Date: Thu May 6 14:03:40 2010 -0600 msm: Remove output pointer validity check in oem rapi In streaming_func procedure return data structure, remove the output pointer validity check as the xdr layer will allocate the memory and populate this field later. Change-Id: Ic6414ce2576c96563e55d49d7d2d9fb4ff90ef9b Signed-off-by: Niranjana Vishwanathapura commit 3b76b86bf33cba74bd3ce186376c19672661197e Author: Stephen Boyd Date: Thu May 6 12:16:31 2010 -0700 msm: rpcrouter: Turn off debug messages The debug flag was changed to include R2R_MSG in the recent SDIO abstraction layer patch. This is causing the kernel logs to be flooded with debug messages from the rpc router. Turn them off. Change-Id: I86ed7aedaad5f80faf3089ecba016c10373f2a00 Signed-off-by: Stephen Boyd commit f3e2ab3ffd2297595b067b6a6bc37e4b250598fc Merge: 58ffca7 533bc1d Author: Bryan Huntsman Date: Thu May 6 11:16:12 2010 -0700 Merge "defconfig: 7x30: Enabled DYNAMIC_DEBUG option in defconfigs" into android-msm-2.6.32 commit bb6fb3f545dbb34128bb5922393ac4c84694e6f0 Author: Vishwanathapura, Niranjana Date: Thu May 6 12:12:37 2010 -0600 msm: remove bogus message in time_remote rpc server module Remove the bogus message printed by time_remote rpc server module about AMSS version being used is old. Change-Id: I3be42f8f1ea9620a503bfe858c407b7ea74799d1 Signed-off-by: Niranjana Vishwanathapura commit 58ffca7c8f674e973cce72667f3f635987c45778 Merge: d367dbb 47d66fe Author: Bryan Huntsman Date: Thu May 6 10:59:17 2010 -0700 Merge "input: pmic8058-othc: Add support for PMIC8058 OTHC" into android-msm-2.6.32 commit 533bc1d299801b9ed2b88d9377f7987d80d58470 Author: Sriranjan Srikantam Date: Thu Apr 29 11:00:34 2010 +0530 defconfig: 7x30: Enabled DYNAMIC_DEBUG option in defconfigs Audio drivers will use DYNAMIC DEBUG support to enable and disable the audio debug messages at runtime. Hence enable the DYNAMIC_DEBUG config option in defconfigs Change-Id: I8deaf1877d90d6ea06b3ccf2244eb102d3fbf25b Signed-off-by: Sriranjan Srikantam commit 47d66fe8730e3d0f9c265ca7e04683e63216df92 Author: Anirudh Ghayal Date: Wed May 5 17:33:05 2010 -0700 input: pmic8058-othc: Add support for PMIC8058 OTHC The driver interfaces the OTHC (one-touch headset controller) module (of PMIC8058) with the input subsystem. It supports headset insert, remove and switch press, release operations. It supports both NO (normally open) and NC (normally closed) types of headset. CRs-Fixed: 211767 Change-Id: Id32cd32a59e058112d39db53fc666181ea2b6eeb Signed-off-by: Anirudh Ghayal commit d367dbb3cb649a280c8c6eff2f235651e07af5c7 Author: David Ng Date: Fri Apr 30 15:56:13 2010 -0700 defconfig: all MSM targets: Enable IPv6 CRs-Fixed: 227072 Change-Id: I8af06d9b52dabb26f90929643f06e12683be5416 Signed-off-by: David Ng commit 70f468537d52728082ba9433e6a29c2ecdef3f95 Merge: 31f8adb 3ce25f3 Author: Trilok Soni Date: Thu May 6 03:18:57 2010 -0700 Merge "msm: clocks: Add CE_CLK and CODEC_SSBI_CLK proc_comm support" into android-msm-2.6.32 commit 31f8adb82667c2437b44eda3ac3c223640b9ff2e Merge: f522989 5d50bcf Author: Trilok Soni Date: Thu May 6 03:18:41 2010 -0700 Merge "defconfig: Enable CDC-ACM support for USB host" into android-msm-2.6.32 commit f5229897cbadc404ec2237134e64f4b2d31144f0 Merge: 82ada47 2e77673 Author: Trilok Soni Date: Thu May 6 03:18:19 2010 -0700 Merge "mdp: update mdp_block_power_cnt to atomic type" into android-msm-2.6.32 commit 82ada47861558da010054d1dc59ef7ed96b71a32 Merge: 268329a a91968a Author: Trilok Soni Date: Thu May 6 03:18:09 2010 -0700 Merge "msm_fb: add proper locking around shared data" into android-msm-2.6.32 commit 268329a99bdfce1f0538bf8c6f034d8d05f7fe90 Merge: 7c0b4e0 96ad301 Author: Trilok Soni Date: Thu May 6 03:04:36 2010 -0700 Merge "input: pmic8058_pwrkey: Add support for power key" into android-msm-2.6.32 commit cc52786ff7486184699de11cf7b64b415d022a80 Author: Jeevan Shriram Date: Thu May 6 14:21:35 2010 +0530 msm: camera: Add support for YUV recording on 7x30. This patch includes support for YUV format recording. Change-Id: I77a7760be2cc735f0f7eb4d7bc511714da92f1e4 Signed-off-by: Azam Kapatrala Syed Signed-off-by: Jeevan Shriram commit 5d50bcf175665e2ea63a3e4de557bbc55833c9b0 Author: Manu Gautam Date: Tue May 4 13:08:57 2010 +0530 defconfig: Enable CDC-ACM support for USB host Change-Id: Iaa4981aa38a7b0215336f687d007d0a40a723a24 Signed-off-by: Manu Gautam commit 7c0b4e06c1dee17a7ca954f416917a9a6606f4c0 Merge: a967b67 9042057 Author: Trilok Soni Date: Thu May 6 00:00:58 2010 -0700 Merge "usb: msm_otg: Check ID status before b_sess_valid during initialization" into android-msm-2.6.32 commit a967b67ffa16514347126aa9321aecf9a9128187 Merge: 22f76b9 9a6bc21 Author: Trilok Soni Date: Thu May 6 00:00:36 2010 -0700 Merge "msm: acpuclock: Add 'cpu' argument to acpuclock APIs." into android-msm-2.6.32 commit 22f76b94d15e65c981ef7d6315fc3ab66fb8aa3b Merge: 4a89d7a 7724994 Author: Trilok Soni Date: Thu May 6 00:00:10 2010 -0700 Merge "defconfig: Enable CONFIG_TIMER_STATS" into android-msm-2.6.32 commit 4a89d7aee4b99bf15ef151dc5d399797bf5fb723 Merge: 85b6f44 6ce704a Author: Trilok Soni Date: Wed May 5 23:59:40 2010 -0700 Merge "msm: pmic8058-mpp: add support for gpiolib" into android-msm-2.6.32 commit 85b6f4405241001c11435adc4bf9fcc910dbc2b7 Merge: c77f74c 4a8009b Author: Trilok Soni Date: Wed May 5 23:59:30 2010 -0700 Merge "msm: pmic8058-gpio: add support for gpiolib" into android-msm-2.6.32 commit c77f74c254331e3e9623f8633ee28b838bf17d11 Merge: ca12a67 8ad3338 Author: Trilok Soni Date: Wed May 5 23:58:35 2010 -0700 Merge "input: joystick: Add support for ShinEtsu VTD518 Touchdisc" into android-msm-2.6.32 commit 2e776739856f38af0d6b3fc85410487829c6ee7e Author: Abhijeet Dharmapurikar Date: Mon Apr 26 17:10:16 2010 -0700 mdp: update mdp_block_power_cnt to atomic type The elements of mdp_block_power_cnt are accessed in a lockless fashion in the suspend fucntion. Changing it to have atomic_t to make it smp safe. Change-Id: I2085c2df53cc5842a5fb2fbe34c2d355cfdb7c83 Signed-off-by: Abhijeet Dharmapurikar commit a91968a1a911a66703975e74b4f95383cc427c23 Author: Abhijeet Dharmapurikar Date: Wed Apr 21 15:25:09 2010 -0700 msm_fb: add proper locking around shared data The writes to MDP_INTR_ENABLE, the variable mdp_intr_mask and dma->waiting flag needs to be protected. Add spin_lock calls around them. Change-Id: If9efef12da5606d1893be3f39382a75a7bcd8235 Signed-off-by: Abhijeet Dharmapurikar commit 9a6bc21a0581717181e60c2d6950c76e3fba02ea Author: Matt Wagantall Date: Wed Apr 21 11:15:13 2010 -0700 msm: acpuclock: Add 'cpu' argument to acpuclock APIs. To support frequency control of multiple application processors, extend the acpuclock APIs to take an additional 'cpu' argument. This argument is ignored by all existing acpuclock drivers. Change-Id: I13f4c069d49986080248d519090f656a6985bc3e Signed-off-by: Matt Wagantall commit 77249943b17cb917a48d4fddf86d2a810122b8c1 Author: Praveen Chidambaram Date: Wed May 5 10:44:19 2010 -0600 defconfig: Enable CONFIG_TIMER_STATS Change-Id: Iff6c81a61a69d6eed16cd12e33508d454b1bb8f2 Signed-off-by: Praveen Chidambaram commit 3ce25f3fd460a6291e5304ba8d5a07de4e43f364 Author: Stephen Boyd Date: Wed May 5 17:16:45 2010 -0700 msm: clocks: Add CE_CLK and CODEC_SSBI_CLK proc_comm support Change-Id: I28e87b58f8d4751749eb3d5f6f4023d75e48d3c3 Signed-off-by: Stephen Boyd commit ca12a67ef1c2d77d3e313dddf4d8b4f0d348899f Author: Gregory Bean Date: Sun Apr 4 22:29:02 2010 -0700 msm: add MSM8x60 FFA support The MSM8X60 FFA contains different components than the MSM8X60 SURF, and therefore requires a different ARCH type and machine ID. Change-Id: I845909512b5f3f9c4055b1fabbc76f893c3c2feb Signed-off-by: Gregory Bean commit 47a96fd6ae12ecab74f32fc6c365734ab3a1f33b Author: Murali Palnati Date: Fri Apr 2 17:31:56 2010 -0700 msm: board-msm8x60: Do necessary initialization for dedicated GPIOs. Set the drive strength and PULL configuration for the dedicated GPIOs. These dedicated GPIOs need to be initialized via the "_HDRV_PULL_CTL" registers. Change-Id: I71a73da3b4be04910475f9a0e539379d88f96492 Signed-off-by: Murali Palnati commit 7e046071dc6cfee118507a3de5003a8cb4955a72 Author: Murali Palnati Date: Fri Apr 2 15:27:11 2010 -0700 msm: board-msm8x60: Enable SDC GPIOs only if the slot is enabled. Change-Id: I03cfc50fa8bb2cb97a9c79233f64452287acdd62 Signed-off-by: Murali Palnati commit 73ed3237cb48930ecd4cd7a929199fb442a42f9b Author: Matt Wagantall Date: Wed Mar 31 19:43:35 2010 -0700 msm: board-msm8x60: Insert delays between EBI2 Ethernet reads and writes. The SMSC LAN9221 Ethernet controller requires at least 135ns between register reads and writes. At 64MHz, that's 9 clock cycles. These delays must be adjusted if the EBI2 clock rate changes. Change-Id: I74ef7f41d77c739826cd7f6b364fdc2240fd3a31 Signed-off-by: Matt Wagantall commit 93c63bfc3cf6d4a842356495788088b0e3165928 Author: Kenneth Heitke Date: Tue Mar 30 21:49:11 2010 -0600 msm: 8x60: Add GSBI7 QUP I2C device for SURF. Add platform data and TLMM configuration for the GSBI7 QUP controller which will be used for Marimba. Change-Id: Id3a376a323f4a950bdc14b672d9e4114b5ef610b Signed-off-by: Kenneth Heitke commit c7352e091a66226376b7c50ec6cef42223767bb3 Author: Murali Palnati Date: Tue Mar 30 20:39:40 2010 -0700 msm: board-msm8660: Add support for 8-bit bus width on internal eMMC. Internal eMMC is capable of working with 8 bit bus width. Enable the same based on the relevant config option. Change-Id: If8588e8010aa6b0fb3da86c9e4a48ad65c192b3e Signed-off-by: Murali Palnati commit 99c51dc5e249d352a8d1d5c99d12746df4db6760 Author: Murali Palnati Date: Wed Mar 24 12:41:02 2010 -0700 msm: board-msm8660: Add msm_sdcc devices for SURF. Add initial platform data and the TLMM configuration for SDCC for MSM8x60 SURF. Change-Id: I119a97b148ee153c02d6af240745a0852f3d9874 Signed-off-by: Murali Palnati commit 65e7d4ac08d3460e38166977dec0407200291e5b Author: Murali Palnati Date: Tue Mar 23 20:00:02 2010 -0700 msm: sdcc: Associate SDCC clocks with the corresponding devices. Fill up the .dev members and associate the sdcc clocks with their corresponding msm_sdcc devices. This ensures that the right clock gets enabled when the clock apis are called by the SD/MMC driver. Change-Id: I9c9c1b001031bde19215f043d420aaa7090b893c Signed-off-by: Murali Palnati commit a5a27262f195f94ebe5c0b28b30a8a9f395eb1ed Author: Murali Palnati Date: Sun Mar 21 17:37:52 2010 -0700 msm: sdcc: Add Support for MSM SDCC controllers. Add initial device and resource configuration for SDCC for MSM8x60 platforms. Change-Id: Ie523bdd9f1b2580b1b91b6f03883707ee6e900d0 Signed-off-by: Murali Palnati commit 333adc8ec53760c44b2db386525328972692638b Author: Steve Muckle Date: Wed May 5 12:49:31 2010 -0700 defconfig: automatic update Change-Id: Ice391ddd640636d6216486f715b93a672e181802 Signed-off-by: Steve Muckle commit 632a5737145d5d2a2ba33a2769e39ab3be4d7ffb Author: Sagar Dharia Date: Thu Apr 8 15:13:52 2010 -0600 qup_i2c: Incorporate better RESET and interrupt clearing logic Doing a SW_RESET takes 1 QUP HW logical cycle so we poll to ensure that RESET has happened before writing other registers. Level triggered interrupts are cleared by putting mini-core in RESET Change-Id: I97a5a46da263b2db6dfed10bb11032a5b8108925 Signed-off-by: Sagar Dharia commit f54f418cabbf6e5e5c41c5738eb668be3892f4d9 Author: Sagar Dharia Date: Fri Apr 2 13:48:22 2010 -0600 qup_i2c: Move QUP I2C mini core init earlier in boot sequence GPIO expanders at subsys_init requires qup_i2c init to have happened earlier that itself. Signed-off-by: Sagar Dharia commit 8ad333814b2b98ad86a3c699d001dcefd1cffdd2 Author: Anirudh Ghayal Date: Thu Apr 15 13:00:20 2010 -0700 input: joystick: Add support for ShinEtsu VTD518 Touchdisc VTD518 Touchdisc is a device from ShinEtsu supporting communication over I2C. It is a multifunction touchdisc which supports rotary scrolling, X/Y absolute positioning, X/Y relative movement, kinetic scrolling and 5-way switch input. The device reports various motion and key-press events via interrupts. Based on the interrupt status, the driver communicates with the device over I2c and receives the events. These events are then reported to the input subsystem. CRs-Fixed: 237218 Change-Id: Ib40bf4a6e294eae4b0199101a1725c226139da71 Signed-off-by: Anirudh Ghayal commit 6ce704adbc26e22953ac2389a89e0218842ab6e3 Author: Bobby Crabtree Date: Tue May 4 15:44:33 2010 -0700 msm: pmic8058-mpp: add support for gpiolib gpiolib-based implementation is required for 8660 as all pmic gpio clients use gpiolib APIs. 7x30 pmic gpio clients use legacy gpio APIs, thus, we must maintain backwards compaitibility on 7x30 until gpiolib is available. Legacy implementation will be removed once gpiolib is available on 7x30. Change-Id: Ic0bf31d6dc21a2ce701e939c77d9dd9d9a5f69cf Signed-off-by: Bobby Crabtree commit 4a8009b7da4ce11e7e06ab6e0bac9ab5c2ef0c59 Author: Bobby Crabtree Date: Tue May 4 15:39:45 2010 -0700 msm: pmic8058-gpio: add support for gpiolib gpiolib-based implementation is required for 8660 as all pmic gpio clients use gpiolib APIs. 7x30 pmic gpio clients use legacy gpio APIs, thus, we must maintain backwards compaitibility on 7x30 until gpiolib is available. Legacy implementation will be removed once gpiolib is available on 7x30. Change-Id: I7283864c965447c597e456df1bf782703b4f3d46 Signed-off-by: Bobby Crabtree commit bf8dc7af591d8c9f96ec0278fbd35ea848452566 Merge: be3e0ac 7768345 Author: Trilok Soni Date: Wed May 5 07:51:08 2010 -0700 Merge "media: camera: fix for luma config and IHIST,CS and RS stats collection." into android-msm-2.6.32 commit be3e0ac3f2fbb4cd15d930fd4d89d83ca35fcdf5 Merge: d328ac6 4863bd0 Author: Trilok Soni Date: Wed May 5 07:50:33 2010 -0700 Merge "mmc: core: Add 1ms delay after sending CMD6 to MMC cards." into android-msm-2.6.32 commit 96ad30159cd3afe3950c0e4fcdc7538ffc601b62 Author: Trilok Soni Date: Mon Oct 19 12:38:29 2009 +0530 input: pmic8058_pwrkey: Add support for power key Add support for PMIC8058 power key driven over dedicated KYPD_PWR_N pin. It allows the user to specify the amount of time by which the power key reporting can be delayed. CRs-Fixed: 211773 Change-Id: I78ced22c338fd3564d90412d0553751b3170bd24 Signed-off-by: Trilok Soni commit d328ac6107183473f95771afddebd3cfafff5001 Merge: 915ceae 7c46716 Author: Trilok Soni Date: Wed May 5 06:57:37 2010 -0700 Merge "misc: vibrator: PMIC8058 vibrator motor driver" into android-msm-2.6.32 commit 915ceae1b1fb8af6bbf55d58266ba450e96ba14b Merge: 044ae43 0070dcc Author: Trilok Soni Date: Wed May 5 06:42:05 2010 -0700 Merge "mmc: msm_sdcc: Select the right frequencies for 8x60." into android-msm-2.6.32 commit 044ae43a67f6581370aa8a5d1ac59e8e7a8a69f3 Merge: 73113e0 2e5b791 Author: Trilok Soni Date: Wed May 5 06:41:47 2010 -0700 Merge "mmc: msm_sdcc: Use predefined CRCI numbers from dma.h" into android-msm-2.6.32 commit 73113e0d2512403a165d1089b11c088eb9af75cd Merge: 6e7a56a f5c0806 Author: Trilok Soni Date: Wed May 5 06:41:32 2010 -0700 Merge "mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts." into android-msm-2.6.32 commit 6e7a56adf14f4f08ea213dae38dbd7cab9546a68 Merge: 1420d77 7aee268 Author: Trilok Soni Date: Wed May 5 06:41:15 2010 -0700 Merge "mmc: msm_sdcc: Add delay between writes to MCI_CLK and MCI_POWER." into android-msm-2.6.32 commit 1420d77b2b95307454ed4e4995cd03c6989d9104 Merge: 9cc6c66 17f00b9 Author: Trilok Soni Date: Wed May 5 06:40:50 2010 -0700 Merge "mmc: msm_sdcc: Control the pclk only if the clock is available." into android-msm-2.6.32 commit 9cc6c666a56751de1f98054ce71cdb0da290ea9c Merge: 3a569be 09da6a8 Author: Murali Palnati Date: Wed May 5 05:01:49 2010 -0700 Merge "mmc: msm_sdcc: Enable pio IRQ only if MCI_IRQ_MASK1 is available." into android-msm-2.6.32 commit 3a569be623aa1f0dfc7fa808f5fb17a0d8977e7b Merge: fa98d8b f870557 Author: Murali Palnati Date: Wed May 5 05:01:38 2010 -0700 Merge "mmc: msm_sdcc: Add support for upto 5 SDCC controllers." into android-msm-2.6.32 commit fa98d8bf4c57cfdf3c9655f746c5ca6952d31d2f Merge: 6149316 0183b24 Author: Trilok Soni Date: Wed May 5 04:30:21 2010 -0700 Merge "mmc: Handle requests properly when block queue is plugged" into android-msm-2.6.32 commit 61493161d198a97e87ef3951a41b7d443386639b Merge: 0ccab40 936ba74 Author: Trilok Soni Date: Wed May 5 04:29:46 2010 -0700 Merge "mmc: block: extend support for more than 8 partitions" into android-msm-2.6.32 commit 0ccab4042f9e47c5a8446d03c3f8a625ccdb0658 Merge: 433420f 7d881bb Author: Trilok Soni Date: Wed May 5 04:29:23 2010 -0700 Merge "mfd: pmic8058: change sub_devices field to pointer" into android-msm-2.6.32 commit 433420f7f3336c8c6cdd074ff4fae8efdf0e5638 Merge: f431294 f09e795 Author: Trilok Soni Date: Wed May 5 04:29:04 2010 -0700 Merge "mmc: msm_sdcc: Add config to select 5th controller on 8x60." into android-msm-2.6.32 commit f43129452f6fb967c263bdbb145100474e13c055 Merge: 228848a 81dcee2 Author: Trilok Soni Date: Wed May 5 04:28:47 2010 -0700 Merge "mmc: core: Accept cards that are compliant with MMC 4.4 spec." into android-msm-2.6.32 commit 7c467164afc51c661cf2a4d04fd33087888346cd Author: Trilok Soni Date: Wed Feb 17 17:23:21 2010 +0530 misc: vibrator: PMIC8058 vibrator motor driver PMIC8058 support negative voltage regulator from 1.2V to 3.1V with 100mV increments through dedicated VIB_DRV pin. CRs-Fixed: 226968 Change-Id: I46ec6ede30bdbb43bded4fffadd1199cc69f414c Signed-off-by: Trilok Soni commit 4863bd073f4b789b9f6de4b7617681a9a9f43855 Author: Aparna Mallavarapu Date: Mon Nov 23 22:53:07 2009 +0530 mmc: core: Add 1ms delay after sending CMD6 to MMC cards. Some eMMC cards require a delay of around 1ms after sending the CMD6 command, before accepting further commands. Change-Id: I23687fce354508cf546d7fc85ba34c8b2097b962 Signed-off-by: Aparna Mallavarapu Signed-off-by: Sahitya Tummala commit 0070dcc138bf98883286bf4ef24e7ed887b41b5d Author: Murali Palnati Date: Wed May 5 11:44:42 2010 +0530 mmc: msm_sdcc: Select the right frequencies for 8x60. For 8x60 target, the clock frequencies that need to be requested are slightly different from the previous targets. So, select the frequencies accordingly. Change-Id: I73eca65d65cc8c5d6861eb3613ea42dabb1399b8 Signed-off-by: Murali Palnati commit 2e5b791cbe1429467322b445ceaa3ba4c3a2cc74 Author: Murali Palnati Date: Mon Mar 22 22:05:20 2010 -0700 mmc: msm_sdcc: Use predefined CRCI numbers from dma.h Data mover driver already provides the CRCI assignments in dma.h. Use them instead of redefining them again in msm_sdcc driver. Change-Id: I77ba31d0ccf09eb4571127f8b1a2c37d0bc3ea79 Signed-off-by: Murali Palnati commit f5c0806e33558caa56f0e37fa2cedea9f5dedbdc Author: Murali Palnati Date: Thu Apr 15 22:13:16 2010 -0700 mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts. Not all targets have IRQ1 line routed from the SD controller to the processor. So we cannot rely on IRQ1 for PIO interrupts. This patch moves all PIO interrupts to IRQ0 and enables the PIO mode. Change-Id: Iae284131635f4aa1210adf6833b2ad9a135723be Signed-off-by: Murali Palnati commit 7aee2683db5410c9aa62f05dff1f6f2f81feb27e Author: Murali Palnati Date: Thu Apr 15 20:02:23 2010 -0700 mmc: msm_sdcc: Add delay between writes to MCI_CLK and MCI_POWER. There should be sufficient delay after we write to MCI_CLK register till we write MCI_POWER register in the SD controller. It can work even if an explicit delay is not provided, as long as we clock the CPU at lower rates, as the time consumed by these CPU instructions was sufficient enough to provide the required delay. However, once we move to higher CPU clock rates, this implicit delay gets reduced and an explicit delay is needed. Change-Id: I0c278d98a0f67c535804980130bc86bcc63b6769 Signed-off-by: Murali Palnati commit 17f00b980a1822853fd5f727bd19ba46138e0b18 Author: Murali Palnati Date: Sun Mar 21 19:26:36 2010 -0700 mmc: msm_sdcc: Control the pclk only if the clock is available. On some targets pclk is internally managed by the MSM and drivers need not enable/disable the same. So do not bail out when clk_get fails for pclk and handle pclk only if it is available. Change-Id: If92f3386efab4e83a0c706b2975e8c4e2b34fcea Signed-off-by: Murali Palnati commit 228848a27945fae19d34aa71eb9b7506cd861d2b Merge: 8b7e953 a55716e Author: Trilok Soni Date: Wed May 5 01:59:21 2010 -0700 Merge "leds: pmic8058: Add PMIC leds driver" into android-msm-2.6.32 commit 8b7e9532aa47d662daa2c4476f92f789a85b827a Merge: 4f6d49e df03593 Author: Trilok Soni Date: Wed May 5 01:58:56 2010 -0700 Merge "mtd: msm_nand: Correct the DMA buffer memory allocation in nand driver." into android-msm-2.6.32 commit 4f6d49e2741880b679b5f16c93205d45aec03b65 Merge: eb775ac cbb92f0 Author: Trilok Soni Date: Wed May 5 01:58:23 2010 -0700 Merge "msm_fb:enable MDP4 DTV and HDMI driver in kernelconfig" into android-msm-2.6.32 commit 09da6a87eaf380ff03f689699c0625c6f57f9791 Author: Murali Palnati Date: Sun Mar 21 18:36:31 2010 -0700 mmc: msm_sdcc: Enable pio IRQ only if MCI_IRQ_MASK1 is available. On some targets, MCI_IRQ_MASK1 is not routed to the MSM in which case pio mode cannot make use of this IRQ. Change-Id: Ie3e77ef6805f63975620c8a3710bd190d791c600 Signed-off-by: Murali Palnati commit f8705579a538652648d25e365f53db635a7a8e63 Author: Aparna Mallavarapu Date: Thu Mar 11 18:46:43 2010 +0530 mmc: msm_sdcc: Add support for upto 5 SDCC controllers. Change-Id: I3c8598736402e6878fd3c6945bd917ab4c76855f Signed-off-by: Aparna Mallavarapu Signed-off-by: Murali Palnati commit 81dcee25ce365ab81b659c813bc07e855c606767 Author: Murali Palnati Date: Sat Mar 27 20:04:58 2010 -0700 mmc: core: Accept cards that are compliant with MMC 4.4 spec. MMC specification version 4.4 defines additional card types via bits 2&3 of Card Type byte of EXT_CSD register. Because of this, the current driver rejects newer cards that follow this spec, as unknown card types. Hence mask out these bits while checking for the supported high speed modes. Change-Id: I479dcdfe201476f63b6983060d61f1c4370d98ca Signed-off-by: Murali Palnati commit f09e7950cdb5f4b2cdb0b393d6a78f528817579e Author: Murali Palnati Date: Mon May 3 12:20:19 2010 +0530 mmc: msm_sdcc: Add config to select 5th controller on 8x60. Change-Id: I1bd6e21cfc545a64d5d433b0f562045093dec1a7 Signed-off-by: Murali Palnati commit 0183b240596160c2d20971af512abfdf7ba976ea Author: Brent DeGraaf Date: Tue Jan 19 16:47:20 2010 -0500 mmc: Handle requests properly when block queue is plugged If the block queue becomes plugged (usually under heavy loading), an old request pointer will be used, possibly leading to corrupted data on the card. This change properly initializes the request pointer at every iteration so that a plugged block queue will be properly handled. Change-Id: I05aae6b76b4085daaa28329c9c70c192603e4c88 CRs-fixed: 223982 Signed-off-by: Brent DeGraaf Signed-off-by: Sahitya Tummala commit 936ba74310c4681e5e0783a2698ef3e4202cbe7b Author: Sahitya Tummala Date: Tue Oct 6 12:11:33 2009 +0530 mmc: block: extend support for more than 8 partitions For cards that can be used as bootable devices, there is a possibility for the number of partitions to exceed 8. So increasing MMC_SHIFT to 4 so that up to 16 partitions can be supported. Change-Id: I857e97906d7e004943784b3204a9030bda0cec43 Signed-off-by: Sahitya Tummala commit eb775ac96c36032960a8c0a9bb1783fa37dfea6b Merge: 61594f3 b9130eb Author: Saravana Kannan Date: Tue May 4 21:09:51 2010 -0700 Merge "msm: clock-7x30: Fix XO reference counting" into android-msm-2.6.32 commit 61594f31407f4427108e502d60cb4e802c8682cc Merge: 8c5ae83 3a45a0f Author: Steve Muckle Date: Tue May 4 20:33:44 2010 -0700 Merge "msm: 7x27: use apps bootloader and oemsbl memories for pmem allocations" into android-msm-2.6.32 commit 8c5ae839c3f4b9f54f08d1bf0a6da8c5f4e6f9f9 Merge: 3b4eb41 0f678e1 Author: Steve Muckle Date: Tue May 4 19:06:52 2010 -0700 Merge "msm: gpio-v2: set irq handler type" into android-msm-2.6.32 commit 3b4eb414f392d9e7edb497ce6891c627e68c75d3 Merge: 340eb77 0743c87 Author: Steve Muckle Date: Tue May 4 19:06:41 2010 -0700 Merge "msm: tlmm: Added api for generic cmd&config TLMM registers." into android-msm-2.6.32 commit 340eb7737c29d27efc2d207abf2e090c3bd30ee0 Merge: dc62294 ce8265c Author: Steve Muckle Date: Tue May 4 19:06:33 2010 -0700 Merge "msm: gpio: Added missing irq_chip methods." into android-msm-2.6.32 commit dc62294f2dbd3aa068ba1c1028afdab04967408f Merge: e04bd4e 7cf7e93 Author: Steve Muckle Date: Tue May 4 19:06:26 2010 -0700 Merge "msm: gpio: changed tlmm-config API to be backward-compatible with v1." into android-msm-2.6.32 commit e04bd4e78fd4df3535f44d2f38c425173c6b0825 Merge: 154ef75 44a9932 Author: Steve Muckle Date: Tue May 4 17:57:00 2010 -0700 Merge "msm: clock-7x30: Migrate 7x30 to local clock control" into android-msm-2.6.32 commit 154ef758afbaac1e5ff43cccf49824ad0ccdff7c Merge: a80b298 b725b47 Author: Steve Muckle Date: Tue May 4 17:56:51 2010 -0700 Merge "msm: internal_power_rail: Default MDP rail to manual" into android-msm-2.6.32 commit a80b29853d6b86c3807f05ef97640e079d44f9df Merge: 8c882fd abc4472 Author: Saravana Kannan Date: Tue May 4 17:54:21 2010 -0700 Merge "msm: clock-7x30: Check halt state when enabling/disabling clocks" into android-msm-2.6.32 commit 0f678e1b190d5dc0620a0c60598f5985a107bc61 Author: Steve Muckle Date: Thu Apr 15 22:34:59 2010 -0700 msm: gpio-v2: set irq handler type Set the irq handler, edge or level, in msm_gpio_irq_set_type(). Change-Id: I2a97d3f82c375fb2344294f2011b61597d2d58e3 Signed-off-by: Steve Muckle commit 0743c8786830f2abe8caec2c35d44ffe47d5d5c4 Author: Gregory Bean Date: Tue Mar 23 22:05:41 2010 -0700 msm: tlmm: Added api for generic cmd&config TLMM registers. Added a general-purpose API for reading and writing those TLMM registers which are classified as "miscellaneous control and configuration registers". Change-Id: I13a68a960afee953b85137d9fa77e43e42ddc5d9 Signed-off-by: Gregory Bean commit ce8265c1569be017accc8f70523b61a7274f3b68 Author: Gregory Bean Date: Wed Mar 24 09:17:14 2010 -0700 msm: gpio: Added missing irq_chip methods. Added missing irq_chip method stubs for unsupported features. Pointers to these had been left NULL in the irq_chip structure, under the assumption that the framework would provide reasonable defaults for missing methods. Instead, it dereferences the NULLs, so default stubs are being supplied for all unsupported behaviors. Change-Id: Ic7c04ab74b7ac44e1979c57494a6f053b292254f Signed-off-by: Gregory Bean commit 7cf7e93d0f3d5fc9bbcae28666a80fea872aa89c Author: Gregory Bean Date: Tue Mar 23 20:31:58 2010 -0700 msm: gpio: changed tlmm-config API to be backward-compatible with v1. Since a large volume of existing code relies on the existing tlmm-config API to initialize GPIO lines, the v2 api has been changed to be backward compatible. Change-Id: Id0df8ebe088782ff39645c9e02a63d4138d9601e Signed-off-by: Gregory Bean commit 7d881bbd27cdb83d86b85eafbe0fdd8d94e5c38c Author: Bobby Crabtree Date: Tue May 4 16:59:30 2010 -0700 mfd: pmic8058: change sub_devices field to pointer Change the sub_devices field in the pmic's platform data from an array to a pointer. This patch make maintenance easier when new subdevices are added since the ARRAY_SIZE macro can be used to determine the number of subdevices. Change-Id: Ic677ae0eeb867ee0833da7707cf1e60faf9a748d Signed-off-by: Bobby Crabtree commit 8c882fd8c5c7d7222193a09e0fac185d6c239a58 Merge: 4266129 419a66f Author: Jordan Crouse Date: Tue May 4 16:54:59 2010 -0700 Merge "mfd: pmic8058: Change driver to use threaded IRQs" into android-msm-2.6.32 commit 7768345b5280cd5c8af836af68f9dfee5e7be340 Author: Nagesh Subba Reddy Date: Wed Apr 21 16:29:17 2010 -0700 media: camera: fix for luma config and IHIST,CS and RS stats collection. Corrected the offset calculation for the histogram,DMI config table and added support to populate the physical memory for the image histogram, row sum, column sum statistics. Change-Id: I9e53f48f2cb80712d76a44a7ebf691eab73fdcd8 Signed-off-by: Nagesh Subba Reddy commit b9130eba3af93f559ba7cc35144b4725fdc797ee Author: Stephen Boyd Date: Tue May 4 14:48:34 2010 -0700 msm: clock-7x30: Fix XO reference counting proc_comm takes pointer arguments and modifies the arguments to indicate errors on the remote side. This fact causes the reference counts for xo voting to get messed up since we use the xo parameter to index into the xo voting array. For cases like LPXO, where the index is 1, calling the proc_comm would make xo into 0 and then the reference count for TCXO would be incremented when LPXO's reference count should have been incremented instead. Change-Id: I4e8d787f1e803e4cc59b43a9d635d9f8cfc3e60e Signed-off-by: Stephen Boyd commit cbb92f01061f5fb2c8570455063148442681ccc7 Author: Abhishek Kharbanda Date: Mon May 3 12:27:36 2010 -0700 msm_fb:enable MDP4 DTV and HDMI driver in kernelconfig Add CONFIG_FB_MSM_DTV and CONFIG_FB_MSM_HDMI_ADV7520_PANEL to enable both MDP4 DTV timer generator and HDMI ADV7520 driver. Change-Id: Ia42a232f5be3978226d78e8a8a5ac3fd09833ba4 Signed-off-by: Abhishek Kharbanda commit 42661291c6fb576b95d89b47d04ea0d219e1f57e Merge: 3087065 1c65193 Author: Steve Muckle Date: Tue May 4 14:19:05 2010 -0700 Merge "msm: gpio: Added missing mask_ack gpiolib method." into android-msm-2.6.32 commit 3087065b004f6e5b863900a91e4cc338c721c0f8 Merge: eaf76e6 8f863c4 Author: Steve Muckle Date: Tue May 4 14:18:57 2010 -0700 Merge "msm: board-msm8x60: initialization for FPGA access on ebi2" into android-msm-2.6.32 commit c6c81112a08c1a1e550cea35eda6ecd4dfa2a1a9 Author: Bobby Crabtree Date: Fri Apr 30 18:15:58 2010 -0700 msm: pmic: add new pmlib APIs Add new pmlib APIs to control high and low current leds. Change-Id: I0d0fe265082116fcb5951032419f876a3b88fee6 Signed-off-by: Bobby Crabtree commit 44a99327fe63a11525b6802220b273cc49426e72 Author: Stephen Boyd Date: Wed Mar 10 16:25:26 2010 -0800 msm: clock-7x30: Migrate 7x30 to local clock control Move the clocks which can possibility be under local control to the CLK_7X30 macro now that we have support for boot time clock ownership detection on 7x30. Change-Id: I2604e0f0ecc789571f3eab99e284db8fb49fff60 Signed-off-by: Stephen Boyd commit eaf76e6a5e13719e69c3aa7e429e3d8886050655 Merge: 91d3df3 990c313 Author: Steve Muckle Date: Tue May 4 04:40:08 2010 -0700 Merge "qsd8k: audio: call q6audio_dsp_not_responding() instead of BUG()" into android-msm-2.6.32 commit 1c65193e32a15bba1e4aaa2475135b0aa2d54724 Author: Gregory Bean Date: Sat Mar 20 20:20:54 2010 -0700 msm: gpio: Added missing mask_ack gpiolib method. Change-Id: I933f95f9b6c357520bfd548d2cc4ac5b0e5807ad Signed-off-by: Gregory Bean commit 8f863c40cc422e1ae498443dcd8219cf3bab016a Author: Steve Muckle Date: Tue Mar 23 15:03:59 2010 -0700 msm: board-msm8x60: initialization for FPGA access on ebi2 Two more GPIO lines need to be configured, as well as two EBI2 configuration registers. Change-Id: I821888ad7e9a25a568bddecd01fc9ccbb56f6c5e Signed-off-by: Steve Muckle commit 91d3df32c6850d85927edab984f838d60207d006 Merge: f129057 b409256 Author: Steve Muckle Date: Tue May 4 04:29:29 2010 -0700 Merge "msm: i2c-ssbi: Add SSBI support for 8x60" into android-msm-2.6.32 commit f1290576a205ce08c275f57e1e360518188122d7 Merge: 9a102866 2c9ce18 Author: Steve Muckle Date: Tue May 4 04:28:31 2010 -0700 Merge "msm: 8x60: Added support for GSBI8 and I2C on same." into android-msm-2.6.32 commit 9a102866eab7d19a459fdefc8be3591b9b47fb65 Merge: c94aecb 70d4c6b Author: Steve Muckle Date: Tue May 4 04:27:29 2010 -0700 Merge "msm: gpio: Added output-enable TLMM config flag." into android-msm-2.6.32 commit c94aecbf6d6867ddcec9270b2777f7eee84699d1 Merge: 0e1e743 0a886c4 Author: Steve Muckle Date: Tue May 4 04:26:53 2010 -0700 Merge "msm: gpio: refine definitions to support future gpio expanders" into android-msm-2.6.32 commit 0e1e7434176ab33c9f9dafb188802ffa5778741d Merge: 0fad50b 5996711 Author: Steve Muckle Date: Tue May 4 04:26:13 2010 -0700 Merge "msm: Fixed LAN91x ethernet IRQ configuration setting on RUMI3." into android-msm-2.6.32 commit 0fad50bfe361376cc2d52b5fa87d595b83a0dd90 Merge: 41356ff 0da867c Author: Steve Muckle Date: Tue May 4 04:25:42 2010 -0700 Merge "msm: board-msm8660: add smc911x for SURF" into android-msm-2.6.32 commit 41356ffa0fd88acdbf8ad2002cfd13c66f29c87e Merge: 5bd613c af279fc Author: Trilok Soni Date: Tue May 4 02:28:37 2010 -0700 Merge "media: camera: Time stamp support for video" into android-msm-2.6.32 commit 5bd613c75b025f90eea52d620e05936434e18325 Merge: 02a16c5 bd6d365 Author: Trilok Soni Date: Tue May 4 01:33:54 2010 -0700 Merge "msm_fb: Remove the op_enable flag check flag in msm_fb_ioctl" into android-msm-2.6.32 commit 02a16c5488ee4ee500df0755a3eb3515b404a08f Merge: fccaaad 0b26963 Author: Trilok Soni Date: Tue May 4 01:33:29 2010 -0700 Merge "msm_fb:remove EDID support from HDMI driver" into android-msm-2.6.32 commit 419a66ffdd81a8f50d84056521dce7748afd97d4 Author: Bobby Crabtree Date: Fri Apr 30 14:08:45 2010 -0700 mfd: pmic8058: Change driver to use threaded IRQs Threaded IRQs were added as an abstraction to solve the same problem we've solved indepenently in this driver. We should make use of it to simplify the driver code. Change-Id: Ia94d9746caca512f86929d6d23ff6a04f7e9d337 Signed-off-by: Bobby Crabtree commit cbd06c37ccdc65727a3285e0fb6a01149a8268c8 Author: Willie Ruan Date: Mon May 3 23:34:29 2010 -0700 misc: pmic8058-pwm: support the option of no lookup table Customer design could have one PWM channel to program the LUT table and other channels to share the LUT table without writing the table again. This patch is to provide such support. Change-Id: I041ab009d62866d413bfe9fe12d5176ac75ebfe7 Signed-off-by: Willie Ruan commit a55716eeb7f7657ab9e8391d652f840fe06769be Author: Trilok Soni Date: Fri Nov 27 18:22:03 2009 +0530 leds: pmic8058: Add PMIC leds driver Add PMIC8058 based keyboard backlight and low current leds driver. keyboard backlight led supports upto 16 levels of backlight intensity, which is mapped to 0..255 levels of brightness of led subsystem. Three low current(40mA) led drivers of PMIC are also supported in this driver. CRs-Fixed: 211772 Change-Id: Ia65b083f6070666aaad95851c9b843332ce35c82 Signed-off-by: Trilok Soni commit b725b47341be278e68aec1205d4d51e924893086 Author: Stephen Boyd Date: Mon May 3 16:52:59 2010 -0700 msm: internal_power_rail: Default MDP rail to manual This rail is defaulted to manual mode on the modem side upon boot so we should default it to manual mode as well. Change-Id: I55a2244b60b06d635559e96bc7ac6b70500f9797 Signed-off-by: Stephen Boyd commit abc4472496793f7c29a6cb190f1cc27f742f4828 Author: Stephen Boyd Date: Tue Apr 27 16:59:59 2010 -0700 msm: clock-7x30: Check halt state when enabling/disabling clocks We should wait for the the clock halt state bit to reflect the expected state when we enable and disable clocks. This prevents clock users from incorrectly using the hardware before the clock starts triggering it and also avoids getting the halt state's stuck at "on" when turning off clocks. Note: We don't check the halt state bit for shared clocks since another user could be voting to keep the clock on. Change-Id: I0d65c86eda82c01655359911891837a1d6967abb Signed-off-by: Stephen Boyd commit 3a45a0f623d0b4dae4f4e76223cc16448af483dc Author: Dinesh Garg Date: Thu Apr 29 10:55:23 2010 -0700 msm: 7x27: use apps bootloader and oemsbl memories for pmem allocations Use upper 512KB of Apps bootloader memory for pmem_audio and OEMSBL memory for kgsl buffer allocation to save ~1.5MB memory in the userspace. Also do not allow pmem_audio and kgsl sizes to be overridden using commandline. Change-Id: I7011f3686ae1e9a9f56c5ce5ef048e26fab55f40 Signed-off-by: Dinesh Garg commit 990c313d9b218a1774ecb184a9f995b40a4a6500 Author: Brian Swetland Date: Sun Feb 21 16:53:49 2010 -0800 qsd8k: audio: call q6audio_dsp_not_responding() instead of BUG() This hooks into the DSP crash notification / dumping mechanism. Change-Id: Id20de717069983689313eea8ebfa19824243d230 Signed-off-by: Brian Swetland Signed-off-by: Ashraya Arya commit fccaaadc571b0e8df23b829c4372654762e69cce Merge: adb3fe5 7c5ba8e Author: Steve Muckle Date: Mon May 3 16:35:57 2010 -0700 Merge "qsd8k: audio: fix incorrect length of data field printed by DAL trace dump." into android-msm-2.6.32 commit adb3fe597bb101adab71073f9ffc30053aa56d7f Merge: 3d363dd f5b2fd5 Author: Steve Muckle Date: Mon May 3 16:35:46 2010 -0700 Merge "qup_i2c: Enhance error reporting for NACKs." into android-msm-2.6.32 commit b4092564f04cee5a3d2f976e76b0f69668d6fa50 Author: Kenneth Heitke Date: Thu Mar 11 18:49:16 2010 -0700 msm: i2c-ssbi: Add SSBI support for 8x60 Add initial device and resource configuration for SSBI controllers on 8x60 platforms. Change-Id: I33d94cce072120312a43d73eabb30491d41b60ba Signed-off-by: Kenneth Heitke commit 2c9ce1881419e05388045c595a2bf7fd302947f4 Author: Gregory Bean Date: Sat Mar 20 18:00:03 2010 -0700 msm: 8x60: Added support for GSBI8 and I2C on same. Change-Id: Ic99c6623f7853a436c8e2c73c7ea0a27a639a991 Signed-off-by: Gregory Bean commit 70d4c6b0ba2d5d1514b7e6ad1b802f516bc609b9 Author: Gregory Bean Date: Sat Mar 20 17:55:49 2010 -0700 msm: gpio: Added output-enable TLMM config flag. While gpiolib already allows for controlling of gpio direction, a regular use-case for gpio lines turns out to involve connection to peripheral busses, and having to go through gpiolib to set these up is awkward and inconvenient. Adding OE to the TLMM API to provide a more natural control path for this other case. Change-Id: I11056dc3b33ad43001dfda4edb3622a4bc8e349e Signed-off-by: Gregory Bean commit 0a886c47290007df00de53dabd3db4be9a21c7fd Author: Gregory Bean Date: Tue Mar 16 19:22:09 2010 -0700 msm: gpio: refine definitions to support future gpio expanders Enhanced the NR_IRQS and ARCH_NR_GPIOS system definitions to accomodate the gpio expanders being added to the MSM8660. Change-Id: Ie1da3b53833ebc01fd93ca77898f9a2acdcd0382 Signed-off-by: Gregory Bean commit 5996711ece286320ac2adab0a85962aae85ab0c2 Author: Gregory Bean Date: Mon Mar 22 11:11:14 2010 -0700 msm: Fixed LAN91x ethernet IRQ configuration setting on RUMI3. Change-Id: Ieb4cdb47979ee2adc87fff9b99ce7476203b98d8 Signed-off-by: Gregory Bean commit 0da867c613ddf207d3374bc65faa2ad397ecf621 Author: Gregory Bean Date: Fri Mar 19 22:19:35 2010 -0700 msm: board-msm8660: add smc911x for SURF Add required resources and EBI2/TLMM configuration for SMC911X on MSM8x60 SURF. Change-Id: Ic815d1404d372504a299fe26dfbd4dac86755f1a Signed-off-by: Steve Muckle commit 3d363ddc39066820ff830808413655d1610bb0ef Merge: 2ebf3a0 c96fe9f Author: Steve Muckle Date: Mon May 3 15:32:40 2010 -0700 Merge "msm: remote-spinlock: Add dummy functions when building without CONFIG_SMD" into android-msm-2.6.32 commit 2ebf3a0d9675f2beac076d395c7a108470947d62 Merge: ba96acf 8db1725 Author: Steve Muckle Date: Mon May 3 15:32:18 2010 -0700 Merge "defconfig: msm8660: turn on 8660 surf, QUP, and SSBI" into android-msm-2.6.32 commit ba96acfc57ea40b3d7316bf54cfd7693cdb50d74 Merge: 180ff90 219dd6b Author: Steve Muckle Date: Mon May 3 15:32:02 2010 -0700 Merge "msm: add msm8x60_surf machine" into android-msm-2.6.32 commit 180ff903cb5adce41be55de7d25a6db4a7862d44 Merge: 52dbff8 e5baae7 Author: Steve Muckle Date: Mon May 3 15:31:29 2010 -0700 Merge "msm: i2c_qup: Add I2C QUP support for 8x60" into android-msm-2.6.32 commit bd6d365f006c46166b728cc418c6140bbb421c0f Author: Naomi Luis Date: Mon May 3 14:18:09 2010 -0700 msm_fb: Remove the op_enable flag check flag in msm_fb_ioctl Remove the check for the op_enable flag when in the msm_fb_ioctl function. This change fixes the case when the ioctl failure messages are returned if the msmfb ioctl calls are made during suspend or sleep. Change-Id: I73ef5faf8d2c07ab7618351df04f3e6fc3a38051 CRs-fixed: 236215 Signed-off-by: Naomi Luis commit 7c5ba8ef813ffb5b42fe8d312dbe433056be486d Author: Eric Laurent Date: Mon Mar 22 08:54:25 2010 -0700 qsd8k: audio: fix incorrect length of data field printed by DAL trace dump. Change-Id: Ia5822c703031565bf82eecb16d50b25ecb9545e7 Signed-off-by: Eric Laurent Signed-off-by: Ashraya Arya commit 0b2696322ac4232d0540b3ad254256a2c72a69c7 Author: Abhishek Kharbanda Date: Mon May 3 12:10:03 2010 -0700 msm_fb:remove EDID support from HDMI driver Remove panel detection feature by reading EDID memory in HDMI driver. Change-Id: I79a147bd2787be0e4cc1ecd46cc069557587822f Signed-off-by: Abhishek Kharbanda commit f5b2fd50884b7ae3d8715eb20fb1fdcdd297085f Author: Sagar Dharia Date: Mon May 3 11:54:55 2010 -0600 qup_i2c: Enhance error reporting for NACKs. Many I2C slave devices (e.g. camera sensors) are probed even if not connected. In that case, reporting NACK as "error" may mislead log-readers. So it is reported as device not connected with slave address for better understanding of what I2C slave is not connected. Change-Id: Ia231e6d12e1a3ed620f7014a8cc89f927ced5df4 Signed-off-by: Sagar Dharia commit 52dbff81b192f2887c3e32033e24f957ff6c20d5 Author: Mohan Pallaka Date: Tue Apr 27 16:09:33 2010 +0530 haptic: Delete haptic framework Haptic framework is used for isa1200 driver. There is no need for this framework as the driver moved to use timed output class supported by Android. Change-Id: Ic0c965c2764ee5c8563284f0cd71eb5cb5f08f69 Signed-off-by: Mohan Pallaka commit 41149e6e78eba82b1e046076e0d069f3663c7f67 Author: Mohan Pallaka Date: Tue Apr 27 16:01:58 2010 +0530 misc: Move isa1200 driver to misc Move isa1200 driver to misc as it uses timed output class. Change-Id: I98ea80336ecc8e6dfcdb3c8068dc5f060aa9f66e Signed-off-by: Mohan Pallaka commit 1626079b0fcf99118450d1246715d33016c4eb3a Author: Mohan Pallaka Date: Tue Apr 27 15:52:28 2010 +0530 msm: 7x30: Add isa1200 device Isa1200 chip is used to facilitate haptics for fluid. Add board specific data for this chip to operate. Change-Id: I452c7c0402102a60b20fce5133531a4c50d31543 Signed-off-by: Mohan Pallaka commit e8374c0ba05811da155b044dbf131398e3d4c3c9 Author: Mohan Pallaka Date: Wed Apr 21 19:37:28 2010 +0530 haptic: Update isa1200 driver to use timed_output class Android layer supports haptic devices through timed output class. So, to leverage capabilites of isa1200 this driver is moved to use timed output class. Change-Id: I1894e17f0c613076d6abc853920f1f6b25465e17 Signed-off-by: Mohan Pallaka commit df03593f041b764b131edfc494993b19b13766a0 Author: Murali Nalajala Date: Mon May 3 16:59:33 2010 +0530 mtd: msm_nand: Correct the DMA buffer memory allocation in nand driver. Add checks in the function nand_get_dma_buffer_request to ensure that it doesnt succeed when requested size is greater than the available memory. CRs-fixed: 233480 Change-Id: I0b93ba9afbfcf95a6d7d99ee204f87bb77dfdfb3 Signed-off-by: Murali Nalajala commit 904205706f529800f3a5154b98d76d3f7564e8d1 Author: Manu Gautam Date: Mon May 3 18:02:51 2010 +0530 usb: msm_otg: Check ID status before b_sess_valid during initialization Across soft reboots VBUS state might not change. This may result in OTG driver starting the link in peripheral mode after a soft-reboot, if the Host mode was active previously, and ignoring the ID pin status. Change-Id: I30c3882146d1e665cec26afb09e91634d0903503 CRs-fixed: 236545 Signed-off-by: Manu Gautam commit ea36df642116e2c2cad685552002e34aee4673b8 Merge: dbfc5e2 ce270f6 Author: Trilok Soni Date: Mon May 3 04:32:23 2010 -0700 Merge "drivers: spi: Support ADM3 in spi_qsd driver" into android-msm-2.6.32 commit dbfc5e2d70fb65b9d25c48a31208c3a954aa8644 Merge: f4ffba2 ba011a4 Author: Steve Muckle Date: Sun May 2 23:10:05 2010 -0700 Merge "msm: dma: Correct incorrect crci block sizes" into android-msm-2.6.32 commit f4ffba2a2b657004183fa8055b7c55894bc31273 Merge: 65fce1d 671c94c Author: Steve Muckle Date: Sun May 2 22:37:51 2010 -0700 Merge "cpufreq: Added hook to enable debug logs" into android-msm-2.6.32 commit c96fe9f8d7646fd70fb6b74b1936149bb0ee8df4 Author: Kenneth Heitke Date: Fri Mar 19 18:12:31 2010 -0600 msm: remote-spinlock: Add dummy functions when building without CONFIG_SMD Dummy remote-spinlock functions are required in order to resolve linker errors when building without CONFIG_SMD. Change-Id: I0834e1ab79307f28848093bf2aa9c6f5a9fde85e Signed-off-by: Kenneth Heitke commit 8db172514da4397a57fdaee44c4f37a5211b5759 Author: Steve Muckle Date: Sun May 2 20:17:44 2010 -0700 defconfig: msm8660: turn on 8660 surf, QUP, and SSBI Change-Id: I56402af9a6489f3637dfaeada2a4c5392916d78c Signed-off-by: Steve Muckle commit 219dd6b3074060672ef815941b5a29e0fbd99749 Author: Steve Muckle Date: Fri Mar 19 17:00:08 2010 -0700 msm: add msm8x60_surf machine Change-Id: I213f16e078fdded4141b7583369451db0aab24f0 Signed-off-by: Steve Muckle commit e5baae724fbc481685bec1c781fa7538b92cb525 Author: Kenneth Heitke Date: Wed Mar 3 16:36:45 2010 -0700 msm: i2c_qup: Add I2C QUP support for 8x60 Add initial device and resource configuration for I2C QUP controllers on 8x60 platforms. Change-Id: I7ff76e20df25c8e8340618d6a63715e3e064173d Signed-off-by: Kenneth Heitke commit ba011a4e9f89b29d2f58e1c435d637528667bc93 Author: Jeff Ohlstein Date: Thu Mar 25 17:08:41 2010 -0700 msm: dma: Correct incorrect crci block sizes DMA block size for the SD controller previously was set to 16 bytes. This causes it to hang during dma transfers because the SD controller expects 32 byte blocks, and expects only two of those for each 64 byte fill of its fifo. Additionally, correct block size from on crci 6 from 0x101 to 5. This is the proper value from the table. Change-Id: I3e961186257eb74742658f43adfbadd574341fee Signed-off-by: Jeff Ohlstein commit 65fce1d8c768324e8ba779d4b4df6cf21d9cd299 Author: Jeff Ohlstein Date: Sun Mar 21 16:34:08 2010 -0700 msm: dma: Update 8x60 dma client interface configuration The configuration for the client interfaces on the dma engine in 8x60 have changed. Configure the dma engine with the correct values. Change-Id: Ic2c881052f82741b6d6ec81c4a467376b1872120 Signed-off-by: Jeff Ohlstein commit 0f73624f32d9fc52ab8e50329bff3e6136aab6c2 Author: Jeff Ohlstein Date: Fri Mar 19 22:09:22 2010 -0700 msm: dma: update 8660 dma channel and crci mappings The channel and crci mappings for the datamover have changed. The macros for them have been updated appropriately. Change-Id: I123bd886fca73e9d5d181d7ae927d2396fc73864 Signed-off-by: Jeff Ohlstein commit 399c3675273cc7d883381451f5d1b0ada30c0c2e Author: Jeff Ohlstein Date: Thu Apr 1 17:58:43 2010 -0700 msm: timer: be resilient to spurious interrupts during boot Previously we assumed that the timers would all start out at zeroes. However, the bootloader is free to use the timer block, and might not leave it in such a nice state, leading to spurious interrupts during boot. Now we zero out the timer block, and handle the case of a null event handler field in the interrupt handler. Change-Id: I4aab41e0dbc4eee57eb880d79b3521b66cb6b1f6 Signed-off-by: Jeff Ohlstein commit f7f4c37d39c3f3db2cac3d7a6fba90358736934a Author: Jeff Ohlstein Date: Wed Mar 17 12:58:08 2010 -0700 msm: timer: call correct event handler on secondary cpus Previously the event handler for the global clock event was called regardless of what cpu the interrupt was coming in on. Instead, call the event handler for the local clock event if we are not running on the primary cpu. Change-Id: I48b86e8b097e1c8cc359f5a475db0475ec45079e Signed-off-by: Jeff Ohlstein commit 4e12b5229ed6929974ebe4307eef0e6f87bfc698 Author: Abhijeet Dharmapurikar Date: Fri Apr 2 12:54:36 2010 -0700 msm: irqs-8x60: fix mdp's interrupt name The mdp driver expects the mdp interrupt to be named INT_MDP rather than MDP_IRQ. Change the name to make mdp driver compile. Change-Id: Iea7016b56a3735614b9410ffc1daf2055f07051b Signed-off-by: Abhijeet Dharmapurikar commit af279fc09a4144989298a61d974b7f081727ebd7 Author: Nagesh Subba Reddy Date: Fri Apr 30 16:49:00 2010 -0700 media: camera: Time stamp support for video Added a time spec variable to msm_frame, to carry the timestamp of the video frames Change-Id: Iacfb8c8e745496740cf08e25d3b70cbf790d1e6a Signed-off-by: Nagesh Subba Reddy commit 36d36f33ee8483f555b13f0d32ca22ce239fe36c Merge: 03e3cb8 bebe562 Author: Steve Muckle Date: Sun May 2 09:26:07 2010 -0700 Merge "drivers: serial: Suppport ADM3 in msm_serial_hs driver" into android-msm-2.6.32 commit 03e3cb8d45a6a747b0d077bb4db37edc68671f47 Merge: 048fef4 5e6a456 Author: Steve Muckle Date: Sun May 2 09:25:54 2010 -0700 Merge "drivers: mmc: Support ADM3 in msm_sdcc driver" into android-msm-2.6.32 commit 048fef408a4cfd6317a6c210a23edb1474af7900 Merge: ea542db 2b64c4a Author: Steve Muckle Date: Sun May 2 09:25:47 2010 -0700 Merge "msm_fb: display: switch between DMA_P and DMA_S dynamically" into android-msm-2.6.32 commit ea542dbb58fb704fc5f768b3c66d7e52e0a47f27 Merge: cb0d5ea 8a2bcb0 Author: Steve Muckle Date: Sun May 2 09:25:41 2010 -0700 Merge "mfd: pmic8058: fix the issue of overwriting output buffer bit" into android-msm-2.6.32 commit cb0d5eaa8eb95121d1dc75c136b99ef96ce0ee9b Merge: c791311 920a4c5 Author: Steve Muckle Date: Sun May 2 09:25:17 2010 -0700 Merge "msm: clock-7x30: Don't touch usb clocks without ownership" into android-msm-2.6.32 commit c7913114b37b049632f3e36d8592ccb5831aae13 Merge: 50a6cb3 109f839 Author: Pavankumar Kondeti Date: Fri Apr 30 21:43:34 2010 -0700 Merge "msm: change qsd8x55 to msm8x55" into android-msm-2.6.32 commit 50a6cb36d12482764228445b010f10b4166b96a7 Merge: bd472de f7565fb Author: Pavankumar Kondeti Date: Fri Apr 30 21:40:06 2010 -0700 Merge "pmem: Add support to specify alignment during allocations." into android-msm-2.6.32 commit 109f839b85ac75bf585d6ae35e57d85613b0f115 Author: Willie Ruan Date: Fri Apr 30 13:49:09 2010 -0700 msm: change qsd8x55 to msm8x55 Not all 8xxx series chips use QSD as chip name. 8x55 starts with MSM. Change-Id: Ib437a62efc29218015abf50cf102846a5beb6d6b Signed-off-by: Willie Ruan commit bd472dec45a9f9334b10b62531ce2f4964fa8b3c Merge: 27cbf25 db4e0cf Author: Bryan Huntsman Date: Fri Apr 30 16:46:36 2010 -0700 Merge "msm: RPC Router communication over the SDIO Interface" into android-msm-2.6.32 commit 27cbf254bc631233ddfaf09d78901c997b6c50bb Merge: 2f05ee4 a7283d5 Author: Bryan Huntsman Date: Fri Apr 30 16:45:45 2010 -0700 Merge "msm: SDIO-Abstraction-Layer initial submission" into android-msm-2.6.32 commit 2f05ee48f14635f80f761f7556bd8cc6a8d17584 Merge: 1e8a51b ee8e6dc Author: Steve Muckle Date: Fri Apr 30 16:45:43 2010 -0700 Merge "defconfig: msm8660: initial defconfig" into android-msm-2.6.32 commit 1e8a51b456c61713bc35889ac447827b44172db1 Merge: da0287e 3ccdc14 Author: Steve Muckle Date: Fri Apr 30 16:43:41 2010 -0700 Merge "msm: 8x60: remove dummy arch_idle" into android-msm-2.6.32 commit f7565fb21c1613544851edabbd95d9f9dc6e4e75 Author: Naveen Ramaraj Date: Tue Apr 20 11:41:03 2010 -0700 pmem: Add support to specify alignment during allocations. Addresses passed to peripherals might need to be aligned at boundaries other than 4K. Add support in the pmem driver to specify a power of two alignment between 4K and 1M. User space can invoke a new IOCTL to specify this alignment in addition to size. The default alignment would remain at 4K. Change-Id: I4e99eacf3d2e900feea23d7c13c8c92f3169e0fc Signed-off-by: Naveen Ramaraj commit 43286d157f1b2412d359a756875d9706ea11ce38 Author: David Ng Date: Tue Apr 27 14:05:02 2010 -0700 power: msm_battery: Add support to bypass MSM battery queries Optional CONFIG_BATTERY_MSM_FAKE to bypass actual MSM battery queries and fake the battery connection. Change-Id: I54c304dc0d89f5c2702b4682682579590a6113c4 Signed-off-by: David Ng commit db4e0cf066250a4593cf1799a9759d8a01e397d7 Author: Karthikeyan Ramasubramanian Date: Mon Apr 5 19:41:54 2010 -0600 msm: RPC Router communication over the SDIO Interface Add a SDIO transport layer to the RPC Router. This transport layer along with an underlying SDIO Abstraction layer allows the RPC Router to communicate over SDIO. Change-Id: Iaacb18aba7e069e591632dc5b21a7c0a61f6689e Signed-off-by: Karthikeyan Ramasubramanian commit a7283d5c6df3f48f49b45239e683a622fc2b5c6e Author: Amir Samuelov Date: Thu Apr 29 20:39:36 2010 +0300 msm: SDIO-Abstraction-Layer initial submission The SDIO-Abstraction-Layer (a.k.a SDIO-AL) is used for RPC-Over-SDIO as a replacement for shared memory (SMD). It uses the SDIO-Host driver and provides SMD-Like API and communicates with Qualcomm SDIO-Client on the remote processor on the other chip. Change-Id: I07a7251519b06700c113c22ed904c8c1ca138249 Signed-off-by: Amir Samuelov commit 2b64c4a500d7cef17b947a24a66006d2add14ce7 Author: Kuogee Hsieh Date: Fri Apr 16 16:12:05 2010 -0700 msm_fb: display: switch between DMA_P and DMA_S dynamically This is software workaround for MDDI hardware problem. DMA_P is used When overlay is using. Otherwise DMA_S is used. CRS-fixed: 236430 Change-Id: I27e8195f9c0e9c83d424a3d60295a1884694e349 Signed-off-by: Kuogee Hsieh commit ce270f6f9198cf40ee5638b35e595da81116241e Author: Jeff Ohlstein Date: Thu Apr 29 13:40:53 2010 -0700 drivers: spi: Support ADM3 in spi_qsd driver Change-Id: I6dfa38a4c33a8e4619d56ce30787e1aeafc8356d Signed-off-by: Jeff Ohlstein commit bebe562a80fc0a68090dedd4971fa4edf1c31444 Author: Jeff Ohlstein Date: Thu Apr 29 13:40:07 2010 -0700 drivers: serial: Suppport ADM3 in msm_serial_hs driver Change-Id: I2924db107c19b64387c74cc3d70afdecb3e6b1c3 Signed-off-by: Jeff Ohlstein commit 5e6a456f63ee00013ed4a317fd6b0ad6cc01c5ab Author: Jeff Ohlstein Date: Thu Apr 29 13:38:48 2010 -0700 drivers: mmc: Support ADM3 in msm_sdcc driver Change-Id: I54ce6cf852d064b8dbe95e25ee83800be205f3a8 Signed-off-by: Jeff Ohlstein commit 920a4c510ff9ec5609c333b7197c3147504c0a50 Author: Stephen Boyd Date: Wed Apr 28 13:12:22 2010 -0700 msm: clock-7x30: Don't touch usb clocks without ownership We shouldn't be disabling and enabling the usb clocks unless we own them. This is especially important since we'll start checking the halt state of clocks in a later patch. Change-Id: Ib05913a0da68dac5e6bf903c0b8c32296abfe67c Signed-off-by: Stephen Boyd commit 8a2bcb0967c29f8341453840beeefa7f28d3b3f4 Author: Willie Ruan Date: Thu Apr 29 23:25:46 2010 -0700 mfd: pmic8058: fix the issue of overwriting output buffer bit It is a clear requirement now that a gpio must be configured first before using gpiolib APIs. To work with this, the set_direction function should only touch the direction bits, not other bits of a gpio's bank1 register, which have been configured before. To protect the read-modify-write operation on gpio_bank1 the spin_lock_irqsave is moved to earlier place. Change-Id: I9339441154eb34878adb49f9dd648a405297dfaa Signed-off-by: Willie Ruan commit da0287efb4b06ea279587511c83f210609f46774 Merge: c4040ce a6a490e Author: Steve Muckle Date: Fri Apr 30 09:02:58 2010 -0700 Merge "msm: clock-8x60: Add 8x60 local clock driver." into android-msm-2.6.32 commit c4040ceb7209dd38532774ab591a77bf3b2e4f8d Merge: 7b63197 2777e1c Author: Trilok Soni Date: Fri Apr 30 03:15:45 2010 -0700 Merge "mfd: pmic8058: fix bug in pm8058_irq_ack" into android-msm-2.6.32 commit ee8e6dc9ef38617435894ac8d78487876f087da4 Author: Steve Muckle Date: Wed Apr 28 11:45:58 2010 -0700 defconfig: msm8660: initial defconfig Change-Id: I403d0b424c92ba75be4fca6ec79da5a3abda3087 Signed-off-by: Steve Muckle commit 3ccdc14b2aa1684923a3daadb5d806bfb0436011 Author: Steve Muckle Date: Thu Apr 29 23:47:16 2010 -0700 msm: 8x60: remove dummy arch_idle There is an arch_idle implementation for msm targets without power management support in no-pm.c. Change-Id: I3ee85a009e5f8fe280565bda7b909c85aec993e2 Signed-off-by: Steve Muckle commit a6a490ef967a5c261524c5c718505156baac5d19 Author: Matt Wagantall Date: Thu Apr 22 21:39:33 2010 -0700 msm: clock-8x60: Add 8x60 local clock driver. Support for control of locally-owned clocks is added. Temporary code is used to turn on required PLLs at boot. Full PLL voting support will be added later. Change-Id: I992096f4babd29cd472989bb26113c4f247bab9d Signed-off-by: Matt Wagantall commit 7b63197e2a63920ee285d34b88f41b7d701f2eaf Author: Jeff Ohlstein Date: Fri Mar 12 01:42:53 2010 -0800 msm: dma: Support ADM3 There are a few changes to the driver needed to support the new version of the datamover. First of all, we need to configure it initially, as it will no longer be configured for us. Second of all, in previous iterations of the ADM, each crci was connected to a single peripheral. A driver could just stick whatever crci numbers it needed into the command structure, and the driver didn't have to know anything about it. However, in the ADM3, each crci is shared by two different peripherals. The dma driver needs to set a mux bit for each crci before a given command is executed. However, with the existing interface, the dma driver had no way of knowing which peripheral the client in question actually wanted to talk to. Moreover, there can be conflicts between two different commands in flight wanting a given crci set in two different ways. This necessitates changing the interface, adding a mask parameter to the exec function, and a field to the struct passed into the enqueue function. This field encodes which crcis a given command is using, and which mux select state they should be in before the command is written to the ADM. A helper function is also provided to ease in constructing the mask. Change-Id: Ia852fa528a060408480d153bf6dc6f22e563aa9d Signed-off-by: Jeff Ohlstein commit 4acacd128323de70c12ad731de1c14c693dda8c5 Merge: 5f414de e9ce70e Author: Steve Muckle Date: Thu Apr 29 21:24:18 2010 -0700 Merge "msm: Add PROC-COMM method for issuing remote NPA requests." into android-msm-2.6.32 commit 5f414de52999280753e077e4e034c78aa0f66c85 Merge: 5d5d774 03af19d Author: Steve Muckle Date: Thu Apr 29 20:15:02 2010 -0700 Merge "msm: video: 720p: Fix for Output Buffer pool count mismatch in Decoder" into android-msm-2.6.32 commit 5d5d774664cd8d69fb4ac82cf1f6a7ee012fbce9 Merge: 9e22559 bb4ff2e Author: Steve Muckle Date: Thu Apr 29 20:14:54 2010 -0700 Merge "regulator: pmic8058-regulator: add support for PMIC8058 regulator" into android-msm-2.6.32 commit e9ce70e041ca58f3610787297d5f9f08eb74e867 Author: Praveen Chidambaram Date: Tue Apr 13 10:52:30 2010 -0600 msm: Add PROC-COMM method for issuing remote NPA requests. Provides a hybrid solution to NPA remoting. Remoting uses ONCRPC to setup NPA resources on the modem and a mirror resource on the application processor. Issuing requests however will be done through PROC-COMM. Change-Id: Id1d7c6e654b66524acfa2bac26135a30e493af46 Signed-off-by: Praveen Chidambaram commit 2777e1cf9f1c854ecd4daadda6cdb0a77f7f3986 Author: Bobby Crabtree Date: Thu Apr 29 18:41:29 2010 -0700 mfd: pmic8058: fix bug in pm8058_irq_ack This patch fixes a bug where the pmic irq ack function was not properly clearing interrupts. The ack function uses the pmic irq number to index into its irq config array. The irq number used to index into the array was the system-wide irq number, not the pmic irq number. This ultimately led to an invalid configuration being written to the irq config registers. Change-Id: I96eb895be92bd116a760e10fe2ea85fd7fed049b Signed-off-by: Bobby Crabtree commit 9e22559690ece25233a639702898aea84db3e236 Author: Matt Wagantall Date: Fri Apr 23 20:48:31 2010 -0700 msm: clock: Use generic clk_ops_remote instead of clk_ops_pcom. Not all devices use proc_comm. Rename clk_ops_pcom to something generic and have it defined appropriately for each SoC. Change-Id: Ia30b39967944b82da0319bb7375d64cc089955e9 Signed-off-by: Matt Wagantall commit 03af19d5cf590fe69a3b2de1a42b70b6fd6eb045 Author: Ravishangar Kalyanam Date: Thu Apr 29 15:26:38 2010 -0700 msm: video: 720p: Fix for Output Buffer pool count mismatch in Decoder Fix for Output Buffer pool count mismatch occurring at the first input frame given to Decoder Change-Id: I1e447c7985befc184ff5f62d3fca5540f35cdd53 Signed-off-by: Ravishangar Kalyanam commit bb4ff2ef7f57ebb85774c0fa7a8c3e27716ab290 Author: Bobby Crabtree Date: Thu Apr 29 11:44:49 2010 -0700 regulator: pmic8058-regulator: add support for PMIC8058 regulator On 8x60 PMIC LDO/SMPS/LVS are controlled from the apps processor. This driver talks directly to the PMIC over SSBI through the PMIC8058 core driver. This driver utilizes the regulator framework to enable, disable, and change regulator voltage levels. Change-Id: I25e24a3d2801d345d9f3943d54e34a563b6cc21a Signed-off-by: Bobby Crabtree commit dc70243de5e9bb6e9cdb1798a835723e07464a1f Merge: 3576500 17fcece Author: Steve Muckle Date: Thu Apr 29 14:58:19 2010 -0700 Merge "msm: compilation fixes for disabling power management" into android-msm-2.6.32 commit 3576500218d097fb01cb01606cab8a692497d947 Merge: a6cf33b 7e5d737 Author: Steve Muckle Date: Thu Apr 29 14:01:53 2010 -0700 Merge "media: camera: To fix kernel hang issue when kernel logs are enabled." into android-msm-2.6.32 commit 17fcecef324334b2ded7c50e134be93ffcb64fe1 Author: Stephen Boyd Date: Tue Jul 7 16:53:52 2009 -0700 msm: compilation fixes for disabling power management Disabling power management (CONFIG_PM) results in compilation errors. Fix them by adding boiler plate code. arch/arm/kernel/process.c:131: undefined reference to `arch_idle' arch/arm/mach-msm/rpc_fsusb.c:52: undefined reference to `msm_pm_set_platform_data' drivers/rtc/rtc-msm.c:620: undefined reference to `msm_pm_set_max_sleep_time' Change-Id: Id36c7b78c44611667292508a8ff9a714159fa727 Signed-off-by: Stephen Boyd commit a6cf33b05ac0acacde0449b6b7727dc3c32dbb8a Merge: e1ce5aa cc2ded1 Author: Steve Muckle Date: Thu Apr 29 10:49:49 2010 -0700 Merge "EHCI: msm: Specify power budget for hcd device" into android-msm-2.6.32 commit 7e5d7370905d48e1c0eb2ad8bff49806116f889c Author: Nagesh Subba Reddy Date: Thu Apr 29 10:10:22 2010 -0700 media: camera: To fix kernel hang issue when kernel logs are enabled. Removed reading the camifpadbase as it is specific only to parallel interface. Change-Id: I8815c25538641f5aa0151b42b8a3ecb6613d3f99 Signed-off-by: Nagesh Subba Reddy CRs-fixed: 234307 commit e1ce5aa3e4178a6c47ee71eff5ba27f29552443c Merge: 53426cd a8e7866 Author: Brent DeGraaf Date: Thu Apr 29 08:24:35 2010 -0700 Merge "msm: Kconfig option for ARCH_MSM_SCORPIONMP" into android-msm-2.6.32 commit 53426cd740de12b146ff5ed2bd66607e1d449d46 Merge: 4891ee7 d02edf4 Author: Brent DeGraaf Date: Thu Apr 29 08:23:55 2010 -0700 Merge "msm: video: 720p: Timer support for 7x30 video driver." into android-msm-2.6.32 commit a8e7866883ca9d65b7a3e9bf7b054d7ed23884ce Author: Steve Muckle Date: Sat Nov 28 09:51:13 2009 -0800 msm: Kconfig option for ARCH_MSM_SCORPIONMP ScorpionMP is an SMP configuration of Scorpion processors. Change-Id: I29c53c52cb1aa3b3e3144952c8ce836996bc8ff8 Signed-off-by: Steve Muckle commit 4891ee7a3d496c0906b46e9affbf9c330a9796bf Author: Steve Muckle Date: Tue Apr 27 14:26:28 2010 -0700 msm: gpio: revert rename of gpio APIs Change-Id: Iea3c4c9efe69647a4e61c45c65f9c5919c8feda8 Signed-off-by: Steve Muckle commit cc2ded196a5c873571b734a9bd4409b5f03dfd49 Author: Manu Gautam Date: Tue Apr 27 14:33:10 2010 +0530 EHCI: msm: Specify power budget for hcd device Avoid usb core from using 500mA as default power budget if the host driver doesnt specify the same. This may result in some overcurrent issues if the host interface on some platform doesnt support 500mA. Change-Id: I078a0ba3bbe21a6e279db60d95a1afe9cf6c0f90 Signed-off-by: Manu Gautam commit 8c56f2eafbbb2dac32da57532164f04b3167d6e2 Merge: 00911a1 18bb136 Author: Pavankumar Kondeti Date: Wed Apr 28 22:54:19 2010 -0700 Merge "msm: 7x27: move video encoder to /dev/pmem_adsp" into android-msm-2.6.32 commit 00911a179049fc60280705aec27fcfb265e21a3e Merge: 10cc261 1faf962 Author: Pavankumar Kondeti Date: Wed Apr 28 22:53:58 2010 -0700 Merge "qsd8k: audio: make dsp_debug work in multi-crash situations" into android-msm-2.6.32 commit 10cc26156866ec408488df94ec6117b2c15c1c4b Merge: 84083c4 203289a Author: Pavankumar Kondeti Date: Wed Apr 28 20:51:02 2010 -0700 Merge "qsd8k: audio: Push calibration data before opening PCM stream" into android-msm-2.6.32 commit 84083c48348c092dbbcd84141a969c8a25f9f788 Merge: 333bbcb 0c258ba Author: Pavankumar Kondeti Date: Wed Apr 28 20:46:19 2010 -0700 Merge "msm_fb: Corrected error checking when width or heigth is 1" into android-msm-2.6.32 commit 1faf962d63170663e5a7fe955473393515557692 Author: Brian Swetland Date: Tue Mar 23 18:19:06 2010 -0700 qsd8k: audio: make dsp_debug work in multi-crash situations If a second thread called q6audio_dsp_not_responding() while the daemon was ram-dumping the dsp, we'd panic the kernel before the ram dump completed. Park any additional threads so that we can ensure we finish the ramdump. Change-Id: Id352ebf3dd03024fc315c4a65b1d2bca62600f32 Signed-off-by: Brian Swetland Signed-off-by: Ashraya Arya commit 671c94ca2e39d253946a1a3d46e2bb965e832760 Author: Brian Steuer Date: Mon Jun 15 17:38:28 2009 -0700 cpufreq: Added hook to enable debug logs The file "cpufreq_debug" in the debugfs file system was created to allow cpufreq debug messages to be enabled dynamically. CRs-Fixed: 184233 Change-Id: I789db77e65d31bf74d02902c357b712bd713dede Signed-off-by: Brian Steuer commit 333bbcbe7b120240c962c6b610a3a3808894c210 Merge: 6ac04fb 5dd9df3 Author: Steve Muckle Date: Wed Apr 28 17:19:06 2010 -0700 Merge "bluetooth: add missing in-band sleep code" into android-msm-2.6.32 commit 6ac04fb020e82238eed178deb475cc87885d37f5 Merge: 31c2ae4 e062b90 Author: Steve Muckle Date: Wed Apr 28 17:19:00 2010 -0700 Merge "msm_q6venc: pass encoder buffer source to dsp" into android-msm-2.6.32 commit 0c258ba6da39d8fe15587736ae0c964381349866 Author: Neeraj Kumar Date: Wed Apr 28 16:22:14 2010 -0700 msm_fb: Corrected error checking when width or heigth is 1 Corrected error condition to check for scaling in width when height of the source is 1 and rotation is 0. Change-Id: Ic5040c1415fc339201c5cdf09e20dc5bbd0a588c Signed-off-by: Neeraj Kumar commit 203289a9b5b885568be6df5c2232181af9f5378d Author: Ashraya Arya Date: Wed Apr 28 16:12:34 2010 -0700 qsd8k: audio: Push calibration data before opening PCM stream Audio calibration data is pushed to Q6 before RX PCM stream is opened. This proper sequence would ensure audio stability for corner cases. Change-Id: Ie0a5fea1affd036570bf6ce2d13df2f4a0b4bcbe Signed-off-by: Ashraya Arya commit 31c2ae4aea12b1f55b256efe56ca0bbfd17a2e49 Merge: 25be802 124b00a Author: Steve Muckle Date: Wed Apr 28 14:16:36 2010 -0700 Merge "msm: 7x27: Use Strongly Ordered memory to flush the AXI bus buffer." into android-msm-2.6.32 commit 25be802725e8504ec27e733a9107a9c9199b440e Merge: 832a059 e2d0e78 Author: Steve Muckle Date: Wed Apr 28 14:16:31 2010 -0700 Merge "msm: timer: Adjust udelay/loop count to guarantee minimum wait time." into android-msm-2.6.32 commit 5dd9df36dc5a207c63102494fa23abf60ea30f90 Author: Matthew Wilson Date: Mon Apr 26 17:09:10 2010 -0500 bluetooth: add missing in-band sleep code Supports line discipline option to save power with QTR8600 Bluetooth device. Adds missing line discipline definitions and calls. Change-Id: I9826d762e154c25d296e1425ae6e0bc7776ff687 Signed-off-by: Matthew Wilson commit 832a059d7dac87473e002044610cbddce7945546 Merge: 154633c 124e53f Author: Steve Muckle Date: Wed Apr 28 12:09:19 2010 -0700 Merge "msm: internal_power_rail: Add MDP power rail" into android-msm-2.6.32 commit 154633c8233d14c423b1597de132bb630ee2443b Merge: e935705 28de462 Author: Steve Muckle Date: Wed Apr 28 12:09:06 2010 -0700 Merge "bluetooth: bluesleep: Remove bluesleep wakelock" into android-msm-2.6.32 commit e062b906f311597f6d7ef405d87058a9e494c6c7 Author: Susan Brownhill Date: Wed Apr 14 16:37:12 2010 -0700 msm_q6venc: pass encoder buffer source to dsp Introduce a field to record buffer source info, and use it to pass output buffer info to dsp. Change-Id: Icd42ec66d947885c304f416ec85ec7cb2ba4c27f Signed-off-by: Susan Brownhill commit e9357054275863c64d224988bd201ebd5ecc2cd3 Author: Steve Muckle Date: Wed Apr 28 10:36:52 2010 -0700 defconfig: automatic update Change-Id: I50a2e56b3dd22aa9fe376378f427f096017be213 Signed-off-by: Steve Muckle commit 124e53feb5be84156bc63b9809cef6ed9745da33 Author: Stephen Boyd Date: Tue Apr 27 10:10:29 2010 -0700 msm: internal_power_rail: Add MDP power rail Change-Id: I704685a004f771904be5a85d90082e1db57741d2 Signed-off-by: Stephen Boyd commit b6b7d5358da4acb85a2da9db98e3214b92343f9e Author: Bobby Crabtree Date: Fri Apr 23 15:51:40 2010 -0700 mfd: pmic8058: enable dynamic irq registration Allow all pmic irqs to be registered dynamically. Drivers may register all irqs by calling request_irq, rather than supplying the irq in the pm_irqs field in the pmic's platform data. Change-Id: I2cf200bb2011ec5f84a6870d85d05ca7a017bb4b Signed-off-by: Bobby Crabtree commit 28de462bcd5504d08a1ba8aa430be520864ca468 Author: Sankalp Bose Date: Thu Apr 22 16:29:55 2010 +0530 bluetooth: bluesleep: Remove bluesleep wakelock bluesleep wakelock prevents platform suspend while an HSUART DMOV command is pending. This wakelock is now moved to msm_serial_hs driver which makes the BT sleep mechanism (bluesleep or IBS) agnostic of HSUART-DMOV dependencies. Change-Id: I691226221777293fdfacd4688d6ebdf52f602e50 Signed-off-by: Sankalp Bose commit dfcf7f8d38a27cd30a1b2993d9f39dff03541d06 Merge: 1bd396b b90430c Author: Pavankumar Kondeti Date: Wed Apr 28 04:50:35 2010 -0700 Merge "msm: msm_nand: Use uncached, unbuffered memory for ONFI buffers." into android-msm-2.6.32 commit 1bd396b26f9bf4c0587c138694d2dbddc8c4019b Merge: 5e972fc 47346fa Author: Pavankumar Kondeti Date: Wed Apr 28 04:50:31 2010 -0700 Merge "spi_qsd: Add disable/enable of pclk to suspend/resume functions" into android-msm-2.6.32 commit 5e972fc8e04f1366351fd8afbbd9a5cab4fa6855 Merge: 6c62103 93ee68c Author: Pavankumar Kondeti Date: Wed Apr 28 04:50:24 2010 -0700 Merge "diag: Add circular buffer to enhance debug capability" into android-msm-2.6.32 commit 6c62103f57e72148d1556affb1c8ad25ea903d65 Merge: 56d9103 150c311 Author: Pavankumar Kondeti Date: Wed Apr 28 04:50:05 2010 -0700 Merge "EHCI: msm: Remove obsolete function framework support" into android-msm-2.6.32 commit 56d91033957b0c896ff4d12b8c1e1f78ce399083 Merge: e573864 df4c8c1 Author: Pavankumar Kondeti Date: Wed Apr 28 03:42:13 2010 -0700 Merge "diag: Add error check when allocating memory" into android-msm-2.6.32 commit e5738642eab6be544ae41cc0924e3e97d8dcaf5b Merge: 932cf98 fc029b8 Author: Pavankumar Kondeti Date: Wed Apr 28 03:42:09 2010 -0700 Merge "msm: msm_serial_hs: Do not allow suspend while BT DMA could be active." into android-msm-2.6.32 commit 932cf98e2b0fc4d5403392da59c005c43aca558b Merge: 7114f9b a8291de Author: Trilok Soni Date: Wed Apr 28 03:15:44 2010 -0700 Merge "msm: fix dependencies on smd in Makefile" into android-msm-2.6.32 commit 7114f9b11ab4fde944ecd632cc0cc2a7db00dcdc Merge: a7c08ab 6577c2d Author: Trilok Soni Date: Wed Apr 28 03:15:28 2010 -0700 Merge "msm: smd: fix Kconfig dependency for MSM_SMD, SMD package" into android-msm-2.6.32 commit a7c08ab9d866b796e34dbf4f16d27b5d978eb793 Merge: be50a19 96ad9b0 Author: Trilok Soni Date: Wed Apr 28 03:15:02 2010 -0700 Merge "msm: create config option for proc-comm" into android-msm-2.6.32 commit be50a19aab9d779306fce7cf952adfa9bc69bf88 Merge: 7053e67 e884603 Author: Trilok Soni Date: Wed Apr 28 03:14:33 2010 -0700 Merge "msm: ehci: Allow platforms to specify a power-budget for host" into android-msm-2.6.32 commit 47346fa611773ef92d12d9145ea33a7f2c79052f Author: Lena Salman Date: Wed Apr 28 11:33:15 2010 +0300 spi_qsd: Add disable/enable of pclk to suspend/resume functions Add disable/enable of pclk to suspend/resume functions to improve power performance. Change-Id: I871e5ac90a998f2942778bb1e8c2c9d583a9ae00 CRs-fixed: 235046 Signed-off-by: Lena Salman commit 7053e6757fe08ecd0d5ce0e606c907a0e976c8b7 Merge: 0bce685 cb77a38 Author: Pavankumar Kondeti Date: Wed Apr 28 01:22:55 2010 -0700 Merge "msm: audio: qdsp5v2: Wait for audpp disable acknowledgement from DSP" into android-msm-2.6.32 commit 93ee68cb1d20ad40a3c1313b39020cfdea48ba43 Author: Shalabh Jain Date: Wed Apr 21 17:42:55 2010 -0700 diag: Add circular buffer to enhance debug capability DIAG routes data to PC or modem processor through USB & SMD channels. Sometime data gets lost during interactions with these 2 modules. In such cases, it is important to know which transfer was left incomplete. Now, each time an operation with these modules is completed, an entry will be made in this new circular buffer. The last entry in the buffer will tell which operation was performed last and will help debugging. Change-Id: I47413dbefe766f45374ab3a53025cce01d905849 CRs-fixed: 236028 Signed-off-by: Shalabh Jain commit e884603bf3f367220eead0e4265dbfa487f03603 Author: Manu Gautam Date: Tue Apr 27 13:01:29 2010 +0530 msm: ehci: Allow platforms to specify a power-budget for host Add functionality to allow platforms to specify maximum power supported over usb host interface. Some usb devices e.g. bus powered hubs can have the power requirement of upto 500mA. Host driver should allow successful configuration of only those usb devices whose power requirement fits in this budget to prevent known failures. Change-Id: I5149ddb7ab484633fcf34316c134774519b06db8 Signed-off-by: Manu Gautam commit 0bce685c20e02354cd7bbc4a4a3a19d70e024c8a Merge: 36d1610 6a9720f Author: Pavankumar Kondeti Date: Tue Apr 27 21:42:56 2010 -0700 Merge "msm: clock: Move 7x30-specific code to 7x30-specific files." into android-msm-2.6.32 commit 6a9720f7a5c42ba00b8a796e70e0b7bb69b3e86c Author: Matt Wagantall Date: Fri Apr 23 21:20:31 2010 -0700 msm: clock: Move 7x30-specific code to 7x30-specific files. Having 7x30 code in clock.c creates a dependency on clock-pcom.c, which may not exist for all SoC. Moving the 7x30 code into 7x30- specific files resolves this. This also improves organization by keeping clock.c generic. Change-Id: I425a3755f620f44d01ff971e23b44ca8fc6d8bce Signed-off-by: Matt Wagantall commit 36d1610756dbc61e7ca5fd04270c9d8889f6c63f Merge: aaf2813 5fd90e3 Author: Steve Muckle Date: Tue Apr 27 18:39:32 2010 -0700 Merge "msm: qdsp6: Allow only one instance of video decoding" into android-msm-2.6.32 commit a8291de0017d0d67cd00b100f2cb783da32d5f6d Author: Steve Muckle Date: Wed Apr 21 18:30:53 2010 -0700 msm: fix dependencies on smd in Makefile Change-Id: Ic3f33d952167e8f5ff8d7e521bcd011a15d9de79 Signed-off-by: Steve Muckle commit 6577c2d7e8a95b1e8f0ebc08fc43d561d78ab802 Author: Steve Muckle Date: Wed Apr 21 16:24:18 2010 -0700 msm: smd: fix Kconfig dependency for MSM_SMD, SMD package Change-Id: Ibb0164a4c8a25595f722e2949bb53855ca8b5b19 Signed-off-by: Steve Muckle commit 96ad9b0bace08f071d99d27b2f3b52ce842bbc5b Author: Steve Muckle Date: Wed Apr 21 16:20:27 2010 -0700 msm: create config option for proc-comm Some builds may not support the proc-comm interface with the baseband processor. Change-Id: I9df4e1f6dac60f6eda7ed6ee4ee97df917788271 Signed-off-by: Steve Muckle commit e2d0e78fbe785e3cb1719da3bb1bf3fc3474355f Author: Maheshkumar Sivasubramanian Date: Mon Apr 26 21:49:23 2010 -0600 msm: timer: Adjust udelay/loop count to guarantee minimum wait time. Different MSM platforms have different accessing speeds to the shared memory region that are used by power collapse and time sync. This leads to large variations in effective timeout values when polling for Modem responses. Add udelay and adjust loop count to guarantee minimum wait time and to shrink the variations. Change-Id: Iacfabeb432366edcd51db5d44fc80e20c3e248b0 Signed-off-by: Maheshkumar Sivasubramanian commit df4c8c1b691516ea795341999bdbc2c11181a621 Author: Shalabh Jain Date: Tue Apr 27 16:26:47 2010 -0700 diag: Add error check when allocating memory DIAG allocates memory from a mempool to package any data before it is sent to USB. It should be ensured that the memory is allocated properly. Adding a check for that. Change-Id: I09a0f0a974b789370354e7343b89d6c5af865afa Signed-off-by: Shalabh Jain commit aaf28137c2900b7c59b2312b42a9a10c740f56b9 Author: Steve Muckle Date: Tue Apr 27 14:34:08 2010 -0700 msm: do not select gpiolib MSM does not yet use gpiolib in all configurations. Change-Id: I948f6f869087b384d5bf6f450e2fcbf149abd89d Signed-off-by: Steve Muckle commit d02edf4b1c188062095dd02e733862f4da03c012 Author: Gopikrishnaiah Anandan Date: Tue Apr 27 14:40:11 2010 -0700 msm: video: 720p: Timer support for 7x30 video driver. Timer will be started when command is submitted to video core and stopped once video core responds. If video core doesn't respond to a command in 1 sec timer will expire and will report hardware error. Change-Id: I2702e0144c19e4f5421b5d95f2ff7f97521c2f16 Signed-off-by: Gopikrishnaiah Anandan commit 105638976f215a21a097e75be4b365314efabe41 Author: Steve Muckle Date: Tue Apr 27 13:58:21 2010 -0700 defconfig: automatic update Change-Id: Ib1c5d0de3120325cf50878d85ff8f2c6026884e8 Signed-off-by: Steve Muckle commit a8f321a0d348d1c3cb666bd3a003b40d22e89dce Merge: d76e080 366675b Author: Steve Muckle Date: Tue Apr 27 13:51:21 2010 -0700 Merge "EHCI: msm: Avoid restoring OTGSC after controller reset" into android-msm-2.6.32 commit d76e0802f024feea8dac4c72c853d5cabdc00ef5 Merge: 16e9492 ec0a9d9 Author: Steve Muckle Date: Tue Apr 27 13:51:17 2010 -0700 Merge "msm_fb: display: Enable proper interrupts for histogram" into android-msm-2.6.32 commit 16e94925cd2ceb060ec31200b5d00b825141b4bf Merge: c4a3ccb 23e8d1a Author: Steve Muckle Date: Tue Apr 27 13:51:13 2010 -0700 Merge "usb: msm_gadget: Send offline event upon receiving reset" into android-msm-2.6.32 commit c4a3ccb4c3fbcfdacd1e282ab9e3d499307c93a6 Merge: d456faa 6767a81 Author: Steve Muckle Date: Tue Apr 27 13:51:08 2010 -0700 Merge "EHCI: msm: Avoid write to a read-only CONFIGFLAG register" into android-msm-2.6.32 commit d456faa3aee5a4c740dc9a1667b1896b74c6403d Merge: 515ac86 9760437 Author: Steve Muckle Date: Tue Apr 27 13:51:03 2010 -0700 Merge "camera: MT9D112 YUV sensor back to back snapshot fix." into android-msm-2.6.32 commit 5fd90e3cc74faca16b3267d6c070ea5d2bb934bf Author: Rajesh Sastrula Date: Tue Apr 27 12:18:00 2010 -0700 msm: qdsp6: Allow only one instance of video decoding Do not allow more than one instance since it needs more pmem and multiple instances is not tested well. Change-Id: If56ff8b368cb7d863786398f5ac68a51cbb59ea8 Signed-off-by: Rajesh Sastrula commit 515ac8670806223df8aa51d06f47320097e1e5c3 Author: Trilok Soni Date: Tue Apr 27 00:55:27 2010 +0530 mfd: tsadc: Make S2 vreg level vote dynamic Vote for S2 vreg on 1.3v level only when calling tsadc startup and vote off when calling tsadc shutdown. Change-Id: I1aeac51363c1f7eea3e0459efb923a3546ba6b48 Signed-off-by: Trilok Soni commit b90430c391dabb10b898ecf326251224f3246310 Author: Murali Palnati Date: Tue Apr 27 17:58:06 2010 +0530 msm: msm_nand: Use uncached, unbuffered memory for ONFI buffers. Buffers needed for reading ONFi identifier and the parameter page need to be present in the coherent memory so that cache handling over head can be avoided. Moreover cacheable memory is not needed for these ONFi buffers as they are used only once. Change-Id: I498baf5a05ba9265d505a5785af23e0f5a98a889 Signed-off-by: Murali Palnati commit bebd298f1b7fbba109d0e9bc90024609b3fe18f3 Merge: 193d2bb d4a8360 Author: Trilok Soni Date: Tue Apr 27 04:24:29 2010 -0700 Merge "msm: Hold wakelock until all rpc calls has been replied." into android-msm-2.6.32 commit 193d2bbaff2896c2e465e2db0de63fce7379d8ff Merge: dc9663d 846b6be Author: Trilok Soni Date: Tue Apr 27 04:24:11 2010 -0700 Merge "msm: 7x30: Advertise the voltage range of 2.7-2.8 Volts for slot 2" into android-msm-2.6.32 commit dc9663d3ebe35624d5c8212448675568830cefe7 Merge: 6a2aee0 ea20c0d Author: Trilok Soni Date: Tue Apr 27 04:23:52 2010 -0700 Merge "mmc: core: Add 8-bit support for SDIO" into android-msm-2.6.32 commit 6a2aee012b5b4b9785e6e0e002670acc77889e4c Merge: a664547 3a1307b Author: Trilok Soni Date: Tue Apr 27 04:23:21 2010 -0700 Merge "msm_fb: Correct compile errors in MDP host window workaround" into android-msm-2.6.32 commit a66454769452df24f94eb518909d6391631edd0e Merge: 76b2143 28f7bf6 Author: Trilok Soni Date: Tue Apr 27 04:23:02 2010 -0700 Merge "msm: clock-7x30: Add missing clocks to ownership map" into android-msm-2.6.32 commit cb77a38c00d68e83cd982ab44d03b92390dbeb2b Author: Suresh Vankadara Date: Tue Apr 27 14:26:05 2010 +0530 msm: audio: qdsp5v2: Wait for audpp disable acknowledgement from DSP Wait until audpp is disabled properly by waiting for disable acknowledgement from DSP. Currently audpp driver doesn't wait for disable acknowledgement from DSP. This might result into issues if another audio session starts immediately Change-Id: Icfad0463cbedc7a382c0c5599dae5108f7a17a2b Signed-off-by: Suresh Vankadara commit 76b2143ca04e61c5ab2059938c7af5c3adf2972b Merge: 962e888 ffc8f85 Author: Trilok Soni Date: Tue Apr 27 04:22:44 2010 -0700 Merge "asm: hardirq: increase HARDIRQ_BITS" into android-msm-2.6.32 commit 962e888dbb1b0a07a035792b92299a02c22eaedd Merge: 3f5d675 55e6876 Author: Trilok Soni Date: Tue Apr 27 04:22:25 2010 -0700 Merge "msm: camera: Add support to ignore spurious interrupts from VFE." into android-msm-2.6.32 commit 55e687677628d4b1649fdb652ab3e23af6ea178b Author: Azam Kapatrala Syed Date: Thu Apr 22 10:58:26 2010 -0700 msm: camera: Add support to ignore spurious interrupts from VFE. This patch implements the change to ignore spurious interrupts that gets kicked off from VFE before resetting the VFE. Interrupts will be serviced once the reset command is triggered. Change-Id: I82dd55dfa23c49842b10c29eada4eee3cabfbf41 CRs-fixed: 235663 Signed-off-by: Azam Kapatrala Syed commit 846b6be9ba5ab8588eb42814bfa709b918bc5fb6 Author: Sahitya Tummala Date: Tue Apr 27 11:09:07 2010 +0530 msm: 7x30: Advertise the voltage range of 2.7-2.8 Volts for slot 2 Some SDIO cards advertise their voltage capability in the range of 2.7-2.8 Volts even though they are capable of operating at 1.65-1.95 Volts. Hence, advertise 2.7-2.8 voltage range for slot 2 to prevent the SDIO card detection issue because of voltage mismatch between the slot and the card. Change-Id: I4313c52c72feedfa70a168b3068f340c1ed27f96 Signed-off-by: Sahitya Tummala commit 150c311ff0a0f2c0c12c0900ca8e90ab75f4f61a Author: Pavankumar Kondeti Date: Mon Apr 19 18:32:06 2010 +0530 EHCI: msm: Remove obsolete function framework support Host controller driver is common for both function and gadget frameworks. Transceiver driver of gadget framework can handle phy initialization, low power mode and clock management. Hence, remove unused code to get rid of #ifdef checks. Change-Id: Iaeadc1459696fc972f9e79e24fd47e793ad1a841 Signed-off-by: Pavankumar Kondeti commit 366675b4e1b69399431d7664cac3da0a41d79d42 Author: Pavankumar Kondeti Date: Mon Apr 26 10:12:47 2010 +0530 EHCI: msm: Avoid restoring OTGSC after controller reset OTGSC register is unaffected across controller reset. Restoring OTGSC register after reset is unnecessary. Change-Id: Id8230d68d900c6943bee20f68fc120b6a52e46a2 Signed-off-by: Pavankumar Kondeti commit 6767a816b93eb922a61c994292c27d21f283ea67 Author: Pavankumar Kondeti Date: Mon Apr 19 22:09:24 2010 +0530 EHCI: msm: Avoid write to a read-only CONFIGFLAG register Companion controllers are not found in MSM hardware. All ports are routed to EHCI controller by default. Change-Id: I4ff606918939a262d8d47e6db6ad1404321ccd86 Signed-off-by: Pavankumar Kondeti commit 3f5d675ae771234425dc5f621eb631e3305b67c2 Merge: 6956d7f 0e57dcd Author: Steve Muckle Date: Mon Apr 26 20:13:13 2010 -0700 Merge "msm: Tidy up order of audio dsp Kconfig options." into android-msm-2.6.32 commit 6956d7fdd6a3331762c9b487ce1a95b352448f8a Merge: 5489964 dcb1c53 Author: Steve Muckle Date: Mon Apr 26 20:13:05 2010 -0700 Merge "msm: board-msm7x30: pm: enable idle standalone power collapse" into android-msm-2.6.32 commit 23e8d1a5baccd25f41c2331efb10fa27f88ede0c Author: Pavankumar Kondeti Date: Mon Apr 26 17:41:48 2010 +0530 usb: msm_gadget: Send offline event upon receiving reset Send offline event when reset interrupt occurs in configured state. Otherwise user space applications may still perform I/O which eventually leads to high CPU usage. This patch also fixes the bug where an incorrect event is sent when no configuration is selected. Change-Id: Id9b0f45858b893d6deaa5da6a17425773ac4e4c1 CRs-fixed: 235041 Signed-off-by: Pavankumar Kondeti commit 3a1307bf0762815df4efcf8c5256d12c86414cc7 Author: Neeraj Kumar Date: Mon Apr 26 17:23:23 2010 -0700 msm_fb: Correct compile errors in MDP host window workaround Corrected the compile time errors. Added missing definiton for mddi_assign_pkt_height(). Change-Id: I55f609ce06ef862ff46cc8d484b3c7b9e70874f3 Signed-off-by: Neeraj Kumar commit 124b00acf83c6d1ba44ee0de16bafff7c987a9be Author: Naveen Ramaraj Date: Mon Apr 26 17:27:18 2010 -0700 msm: 7x27: Use Strongly Ordered memory to flush the AXI bus buffer. On 7x27 targets a write to strongly ordered memory is required to flush the AXI bus buffer. Change the ioremap function to use 'Strongly ordered' memory type instead of using the incorrect 'Non cached' memory type. Change-Id: I217519464d4940d13605ca4301649ad7057bb47f CRs-fixed: 235250 Signed-off-by: Naveen Ramaraj commit 54899646e733395d13349a2d3f8ea54430ef9fb1 Merge: 01305e8 74b8968 Author: Steve Muckle Date: Mon Apr 26 18:01:19 2010 -0700 Merge "msm: don't create useless page tables if there is no debug UART" into android-msm-2.6.32 commit 01305e8f33104fd8999801668fe057ff3be0b799 Merge: 44990b0 36673fd Author: Steve Muckle Date: Mon Apr 26 18:01:14 2010 -0700 Merge "msm: audio: 8x50: Fix gain range for audio devices" into android-msm-2.6.32 commit 44990b0254973cc4d2cb30456c6682088237c8c4 Merge: 43cd1cb 7c480e2 Author: Steve Muckle Date: Mon Apr 26 18:01:09 2010 -0700 Merge "msm: spm: update voltage level and delay time for SPM" into android-msm-2.6.32 commit 43cd1cbc0aec5bf1e5f43d14485e0a977be77faf Merge: e1ce726 dd1da48 Author: Steve Muckle Date: Mon Apr 26 18:01:02 2010 -0700 Merge "msm_fb: display: Increase PMDH clk to 455.5MHZ" into android-msm-2.6.32 commit e1ce726a7ee8b74cee5d9c2e9ffc2484f0ca1be1 Merge: 5b98c5e ba83531 Author: Steve Muckle Date: Mon Apr 26 18:00:57 2010 -0700 Merge "msm: camera: Couple frame queue draining with that of frame thread exit." into android-msm-2.6.32 commit 5b98c5e4cb6af81a36bf716039b4edb57b6d2f8a Merge: 9aa731b 0933462 Author: Steve Muckle Date: Mon Apr 26 18:00:52 2010 -0700 Merge "msm_fb: Added support for external mddi panel interface" into android-msm-2.6.32 commit 28f7bf6480ed4d5b8e447bcb242c91dd6a02859c Author: Stephen Boyd Date: Mon Apr 26 17:55:32 2010 -0700 msm: clock-7x30: Add missing clocks to ownership map The MI2S_M and MI2S_S clocks were recently added but the ownership map for local control wasn't updated to include these clocks. We also missed adding SDAC_M but since it wasn't ever exposed outside the driver we didn't notice. Add it now to make sure we can expose the clock in the future. Change-Id: I27089b2d84127be0d45f77e542c9fa97b66580d9 Signed-off-by: Stephen Boyd commit ec0a9d9c9a12c750da0f9875741b59e55b66187a Author: Rajesh Sastrula Date: Mon Apr 26 17:11:49 2010 -0700 msm_fb: display: Enable proper interrupts for histogram Enable the main histogram interrupt and correct the bits for histogram interrupt status register in local histogram block. Change-Id: I47fe87e57ca88558d8fdadb03366b78d045196fa Signed-off-by: Rajesh Sastrula commit 9aa731b6d12891b06b17727984aba4bff9e94108 Merge: 886b860 547b60f Author: Steve Muckle Date: Mon Apr 26 17:22:24 2010 -0700 Merge "defconfig: Enable support for usb EHSET compliance tests" into android-msm-2.6.32 commit 886b8601fe9868fdea1b4bf7f581bd00e5e0ad3d Merge: 2265f6d 0e6f509 Author: Steve Muckle Date: Mon Apr 26 17:22:20 2010 -0700 Merge "haptic: ISA1200 haptic device support" into android-msm-2.6.32 commit 2265f6dd7b1575069b65abbcbb4ab836be86ca3b Merge: 0e4c257 b0f229b Author: Steve Muckle Date: Mon Apr 26 17:22:15 2010 -0700 Merge "Haptic: add haptic configuration (v2)" into android-msm-2.6.32 commit 0e4c257780bdc9da432ed796df962e1075e867b2 Merge: 784da9f b80ae98 Author: Steve Muckle Date: Mon Apr 26 17:22:11 2010 -0700 Merge "Haptic: Add haptic maintainer" into android-msm-2.6.32 commit 784da9f17e01d49ebf2c1a52b57a9d3d6b71ee9d Merge: c4397ec 2ac2931 Author: Steve Muckle Date: Mon Apr 26 17:22:07 2010 -0700 Merge "Haptic: Documentation for haptic class (v2)" into android-msm-2.6.32 commit c4397ecbcb01a84bcf0e538924c97aabbd53de6d Merge: 51d25c1 7c443ac Author: Steve Muckle Date: Mon Apr 26 17:22:02 2010 -0700 Merge "Haptic: add haptic class" into android-msm-2.6.32 commit 51d25c10732774e6ca77ddf11e5211f265afdd9b Merge: ec65cfd 89754ea Author: Steve Muckle Date: Mon Apr 26 17:21:58 2010 -0700 Merge "mfd: pmic8058: unlock spinlock before dispatching irqs" into android-msm-2.6.32 commit ec65cfde7337712cae8bfd4b7648261f5e6d9ec6 Merge: 818fb2d d731abd Author: Steve Muckle Date: Mon Apr 26 17:21:53 2010 -0700 Merge "diag: Increase buffer size for increase in incoming item size" into android-msm-2.6.32 commit 818fb2da93b1227de98ce35d5882b40615b32b00 Merge: 49eb80b 3187a94 Author: Steve Muckle Date: Mon Apr 26 17:21:47 2010 -0700 Merge "msm_rmnet: allow frames larger than 1514 bytes" into android-msm-2.6.32 commit 0e57dcde67da59ea6a9949aa5047597257295387 Author: Isaac Sutherland Date: Mon Apr 26 16:47:13 2010 -0700 msm: Tidy up order of audio dsp Kconfig options. It's more user-friendly when a dependent config option appears below the option on which it depends. Change-Id: I39be85eca1869db2c035c91796d67836307ecf7f Signed-off-by: Isaac Sutherland commit dcb1c536deea34ee071f7cf2ef98d274c6092ac0 Author: Ai Li Date: Mon Apr 26 15:33:44 2010 -0600 msm: board-msm7x30: pm: enable idle standalone power collapse Change-Id: I55fbdc7f84725d691be9e52116b26538a2bd37f9 Signed-off-by: Ai Li commit 0933462646541ec26ada4b3f5e58f9ed9bf5bc0a Author: Neeraj Kumar Date: Mon Apr 5 15:09:36 2010 -0700 msm_fb: Added support for external mddi panel interface Enalbled external DMA interface in MDP driver, DMA_E in MDP 3.x, to support dispaly on an external MDDI panel connected to it. Change-Id: I63fb481743a25916c0c1c50aa45e24a7844f0b73 Signed-off-by: Neeraj Kumar commit 7c480e204260f5a900b5441f99e0b409d5ac1f2b Author: Ai Li Date: Mon Apr 26 15:31:53 2010 -0600 msm: spm: update voltage level and delay time for SPM Per updated hardware information, increase the voltage level and delay time that are programmed into the SPM. The new values should allow all 7x30 MSM's to boot up from power collapse. Change-Id: I76b56479859add124b40898f23f7ac6a0541a47b Signed-off-by: Ai Li commit 9760437963b6c93246ac0ef8946ab9158a16da64 Author: Abhiruchi Birajdar Date: Wed Apr 14 16:05:44 2010 -0700 camera: MT9D112 YUV sensor back to back snapshot fix. MT9D112 YUV requires more delay for the transition from preview to snapshot. Change-Id: I4831be70b858066e063b7508cd86d93160634e19 CRs-Fixed: 229402 Signed-off-by: Abhiruchi Birajdar commit ffc8f855d6fb584fbba0416e68cb4d78eb7be8cd Author: Bobby Crabtree Date: Mon Apr 26 10:55:58 2010 -0700 asm: hardirq: increase HARDIRQ_BITS The hardirq mask has to be large enough to have space for all IRQ sources. The mask size must be increased from 9 to 10 bits to accommodate all IRQs on msm8x60 platforms. Change-Id: I024c08fcdbc7024ea0a9d46d15531540abdf3f5e Signed-off-by: Bobby Crabtree commit 89754ea55c25d40210787975e9c744772e0996a7 Author: Bobby Crabtree Date: Thu Apr 22 16:12:16 2010 -0700 mfd: pmic8058: unlock spinlock before dispatching irqs need to unlock spinlock before dispatching client irqs. deadlocks result if any locking pmic apis are called from client irq handlers. Change-Id: I9474594142127c71e26ede77538fdf3a96f2d98a Signed-off-by: Bobby Crabtree commit 74b89680ffec082595dce03eb5d80b4ab08ebe4a Author: Larry Bassel Date: Tue Apr 20 14:58:52 2010 -0700 msm: don't create useless page tables if there is no debug UART If CONFIG_DEBUG_LL is set, the kernel attempts to map in the UART so that debugging messages may be output. MSM supports a choice of three UARTs to output on, but setting no such UART is also supported. In that case, the kernel incorrectly assumes that the UART is at 0 and maps in 512M of memory starting at 0 for the non-existant UART. Normally, this only creates extra mappings that are useless. However, if there is memory below 0x20000000 on ARM v7, this causes the page tables for this memory to be incorrectly set. CRs-fixed: 234233 Change-Id: I44729ece0e8e085235fab1f77fdc88f4f25476f3 Signed-off-by: Larry Bassel commit 49eb80ba1298f7351fc0b7265dabf777f0b5b0e9 Author: Jon Ashburn Date: Wed Apr 21 21:15:47 2010 -0600 msm_kgsl: Make 2D graphics core clock run synchronously to AXI bus Workaround a HW issue where 2D core (Z180) cannot run asynchronously to the AXI bus clock. Make sure Z180 runs strictly synchronously. Change-Id: Ie7b653fcd7865c9b6b6e36222369b2224fe89088 Signed-off-by: Jon Ashburn commit 547b60ff7baa021c935f415eed9028008d7e4e4a Author: Manu Gautam Date: Mon Apr 26 18:21:36 2010 +0530 defconfig: Enable support for usb EHSET compliance tests Change-Id: Ida82be86eabeaf2143ccd4dea36912cb8d226cc8 Signed-off-by: Manu Gautam commit 99cc4453912dfc9b967f93ed2c53e676ee9089ee Merge: 9fcbf1c 75e845f Author: Trilok Soni Date: Mon Apr 26 04:23:52 2010 -0700 Merge "usb: ehci: Add support for SINGLE_STEP_SET_FEATURE test of EHSET" into android-msm-2.6.32 commit 9fcbf1c3282b47e7fb21a4249cea8642ac22c0f1 Merge: cd1c8c1 d3ac636 Author: Trilok Soni Date: Mon Apr 26 03:11:33 2010 -0700 Merge "mfd: pmic8058: fix probe race condition" into android-msm-2.6.32 commit fc029b8f0b9f3b2eff0436a72c74ec99dc1071af Author: Sankalp Bose Date: Thu Apr 22 16:29:03 2010 +0530 msm: msm_serial_hs: Do not allow suspend while BT DMA could be active. Change-Id: I22349f939b42eb583b530a6ffed968a6175031fb Signed-off-by: Nick Pelly [sankalpb@qualcomm.com: Fix merge conflicts and change unlocking order] Signed-off-by: Sankalp Bose commit ea20c0d2b5de91eb3dd270659c1bdde69267a22d Author: Sahitya Tummala Date: Mon Apr 26 11:07:26 2010 +0530 mmc: core: Add 8-bit support for SDIO Change-Id: I97939f4310200a50c6a58c49b4a9e4b7fd4b7070 Signed-off-by: Sahitya Tummala commit 0e6f5098188b9a82c2023e2b7818992215723992 Author: Kyungmin Park Date: Thu Oct 29 16:16:47 2009 +0530 haptic: ISA1200 haptic device support I2C based ISA1200 haptic driver support. This chip supports both internal and external. But only external configuration are implemented. Change-Id: Id1739ce4419a22447cac3f0108b45b1f68543b59 Signed-off-by: Kyungmin Park Signed-off-by: Mohan Pallaka commit b0f229bdc9258f7ce854eefc529067ca4603d739 Author: Kyungmin Park Date: Tue Oct 27 15:32:52 2009 +0530 Haptic: add haptic configuration (v2) haptic class support Changelog v1: Fix typo Change-Id: I147a9c3bd8b61607c4d49ddaae0caee11e908d75 Signed-off-by: Kyungmin Park Reviewed-by: Trilok Soni Signed-off-by: Mohan Pallaka commit b80ae98417a5a1132078ce0a925b6c58519e6175 Author: Kyungmin Park Date: Tue Oct 27 15:25:00 2009 +0530 Haptic: Add haptic maintainer Add me to haptic class maintainer Change-Id: Ibbe01aada71923b6258e90357f7c30089d15845c Signed-off-by: Kyungmin Park Signed-off-by: Mohan Pallaka commit 2ac2931f1360e86e149f8b95362a45dfb1ff8cc8 Author: Kyungmin Park Date: Fri Oct 9 09:01:20 2009 +0000 Haptic: Documentation for haptic class (v2) Describe the haptic class and how to use Changelog v1: Apply comments and feedbacks Change-Id: Ic6ba6429b679be5b262611eaeec9903fc025beb3 Signed-off-by: Kyungmin Park Reviewed-by: Trilok Soni Signed-off-by: Mohan Pallaka commit 7c443ac37d07d2d987d1c92fd72c0b5bd55c6068 Author: Kyungmin Park Date: Wed Oct 7 06:17:01 2009 +0000 Haptic: add haptic class New haptic class support. This class handles the haptic devices. Change-Id: I3f0e60bfcf80eddf6569ad793082ab35fefc3fce Signed-off-by: Kyungmin Park Reviewed-by: Trilok Soni Signed-off-by: Mohan Pallaka commit ba8353196ce54c4ecc40dadddf23288d2a331937 Author: dd Date: Wed Apr 14 18:43:02 2010 -0700 msm: camera: Couple frame queue draining with that of frame thread exit. Add change to drian frame queue when ever the frame thread is exited, so that we flush of any enqueued frames of that instance. Change-Id: I561df9fb87e23736f5ffc89a187481af5b6c3704 CRs-fixed: 232144 Signed-off-by: Azam Kapatrala Syed commit cd1c8c1d8a54f150119f87b9f2391683ebb9220d Merge: 458f6b5 d6c5ee1 Author: Willie Ruan Date: Sun Apr 25 15:17:22 2010 -0700 Merge "msm_fb: display: consolidate kickoff of overlay engine" into android-msm-2.6.32 commit 458f6b515c69f1ab79d153d4c8a239fc89c47437 Merge: ce5bf27 95ba716 Author: Steve Muckle Date: Sun Apr 25 10:07:32 2010 -0700 Merge "i2c-msm: Correct DEBUG definition" into android-msm-2.6.32 commit ce5bf27a60555d3a89b0cf6d1a320acc6b50718a Merge: 9f89e2d a96eba9 Author: Steve Muckle Date: Sun Apr 25 10:07:21 2010 -0700 Merge "spi_qsd: Making irq code implicit for the core mode in use" into android-msm-2.6.32 commit 9f89e2d5a20efea2b3581e268107e13f17d0a1f8 Merge: 09c6fdb 6a02d85 Author: Steve Muckle Date: Sun Apr 25 10:06:54 2010 -0700 Merge "spi_qsd: Separate tx/rx/error statistics between contexts" into android-msm-2.6.32 commit 09c6fdbde3efead3220575cc2488fa3ea8f8dd8d Merge: 83a8eb9 5ce7d4e Author: Steve Muckle Date: Sun Apr 25 10:06:38 2010 -0700 Merge "msm: use tasklets to read from SMD in smd_tty driver" into android-msm-2.6.32 commit a96eba98fbbd21ac657f5d551466909352766ead Author: Lena Salman Date: Sun Apr 11 10:40:37 2010 +0300 spi_qsd: Making irq code implicit for the core mode in use Make code clear regarding what mode is in use in the irq. Signed-off-by: Lena Salman commit 6a02d85f8f48cf6f86cddc38c9fce9c1179208b4 Author: Lena Salman Date: Tue Apr 13 21:16:45 2010 +0300 spi_qsd: Separate tx/rx/error statistics between contexts To improve SMP safety, separate the tx/error statistics between contexts. This protects the statistics from accidentally being access from another context at the same time. Change-Id: Ibc52406e7b06a4bb5142f8a09a2f35442cb9df8a Signed-off-by: Lena Salman commit d3ac636161d6bd56e181f124b31d29801d2da95c Author: Bobby Crabtree Date: Thu Apr 22 14:25:45 2010 -0700 mfd: pmic8058: fix probe race condition The pmic IST may be scheduled during or after the call to pm8058_init_ist, so the irq data needs to be set before that time. The request_irq should be made after all data has been initialized. The IRQ_NOAUTOEN flag is removed as that is not a flag for that parameter. Change-Id: I46ae7dcc5feda226f3783263509a01458b68df5f Signed-off-by: Bobby Crabtree commit 83a8eb91586ee014ff0b1e9ffaadb3811475aba5 Author: Bobby Crabtree Date: Wed Apr 21 17:10:27 2010 -0700 mfd: pmic8058: add support for new pmic revision also combine pmic revision functions into a single function. this makes it more maintainable for future pmic revisions. also change revision naming convention from A0, B0, B1 to 1p0, 2p0, 2p1. Change-Id: I91f6aa108eec081e040e6fe387ece91be340f3b1 Signed-off-by: Bobby Crabtree commit 729ea0928eeaf2a3f7658a126a6ba6661ee87edd Author: Bobby Crabtree Date: Fri Apr 9 14:48:28 2010 -0700 mfd: pmic8058: Move pmic8058 gpio and irq base numbers to board file The board file should define starting gpio and irq numbers for pmic8058. This patch also decouples gpio and irq base numbers for' the pmic. Change-Id: Iebc033c0d27190eb2ff27925311496d192e75cde Signed-off-by: Bobby Crabtree commit 2c40a3e9958b93fa45b79deb7706f9c2400c7834 Merge: 4472e3d 8abc358 Author: Trilok Soni Date: Sat Apr 24 02:37:34 2010 -0700 Merge "msm: video: Enable AXI scaling in Decoder driver" into android-msm-2.6.32 commit d731abd3669c2570ded2403de6c933b0c567fe30 Author: Shalabh Jain Date: Wed Apr 21 19:27:19 2010 -0700 diag: Increase buffer size for increase in incoming item size DIAG receives data from SMD which is subsequently written to USB. It receives data in a static buffer of size 8K. With changes in chaining of DSM items on modem side, the incoming packet size can be much higher. So, in case a bigger size item comes in, the current buffer is freed and a new buffer for the required size is created. Change-Id: I57e5d0028ad60e57bf4705efe1439380070d7baa CRs-fixed: 236028 Signed-off-by: Shalabh Jain commit 4472e3d6afcac897288d2ec725c7ef775c66816a Merge: 14e19dd a7ac0b7 Author: Willie Ruan Date: Fri Apr 23 17:59:34 2010 -0700 Merge "msm: board-msm7x30: Remove call to smps2 clock vote for TSADC" into android-msm-2.6.32 commit 14e19ddf9df569dce26bb8d63daa57e73da835cc Merge: 6991b92 a3eb15f Author: Willie Ruan Date: Fri Apr 23 17:59:20 2010 -0700 Merge "msm: Add profiling code to collect performance statistics" into android-msm-2.6.32 commit 6991b9225f2be348e74ff59f75a31e685d434cdb Merge: 4ccdf82 b82c224 Author: Willie Ruan Date: Fri Apr 23 17:59:08 2010 -0700 Merge "media: camera: Updated the way in which VFE driver votes for AXI" into android-msm-2.6.32 commit 95ba716153fe4e02a49ccf17ef0a47c4959dba2f Author: Michael Bohan Date: Fri Apr 23 16:16:10 2010 -0700 i2c-msm: Correct DEBUG definition The driver uses dev_dbg, which requires DEBUG be defined before linux/debug.h is included. Also change #if to #ifdef so the use cases are consistent. Change-Id: I41bc52ff981517b6e17b24c7f0801dfc86f6f87a Signed-off-by: Michael Bohan commit 36673fd2ba17fac7a7f6ca04310562983c6ebeae Author: Ashraya Arya Date: Fri Apr 23 16:08:01 2010 -0700 msm: audio: 8x50: Fix gain range for audio devices Fix hardware gain rage for audio devices to pass the 3GPP standard. Change-Id: I89e943cd17cb38a56706d43c879111ac9e91d1c7 CRs-fixed: 230170 Signed-off-by: Ashraya Arya commit 8abc358fa5b82db96f5d82694cfee54f664c059c Author: Ravishangar Kalyanam Date: Fri Apr 23 15:02:25 2010 -0700 msm: video: Enable AXI scaling in Decoder driver Enable AXI scaling in Decoder driver for VGA/WVGA resolutions. Signed-off-by: Ravishangar Kalyanam Change-Id: I3ba87f50dd6f6406824fbb1cbf5c6eaf2a81ce46 commit 4ccdf82b8bca157bedd1372e868f3125a90bb68b Merge: 1a2a9ee 46cfd3a Author: Shyam Sundar Date: Fri Apr 23 14:30:25 2010 -0700 Merge "msm: video: Add clock gating support in Video Core" into android-msm-2.6.32 commit a7ac0b7e6d664de81479726b43bdf1d93043ec08 Author: Trilok Soni Date: Wed Apr 21 20:20:13 2010 +0530 msm: board-msm7x30: Remove call to smps2 clock vote for TSADC Marimba TSADC is not required to vote for S2 clock. Change-Id: I4fbbb56db45319f2daa566836110895a9152b9f6 Signed-off-by: Trilok Soni commit 1a2a9eec9b59e74556ea31dfbe5759b721cc94bc Merge: f12a268 0290a72 Author: Trilok Soni Date: Fri Apr 23 06:37:03 2010 -0700 Merge "qsd8k: debugging / ramdump driver for QDSP6" into android-msm-2.6.32 commit f12a26832d335d2cf9d01bb4ae677d2bd0c7ffe3 Merge: 7051c65 a02dc75 Author: Trilok Soni Date: Fri Apr 23 06:36:40 2010 -0700 Merge "ASoC: core: On resume also check the soc device state" into android-msm-2.6.32 commit 7051c655bd2e0dcac6feabc5e08308d72e691b9d Merge: cb07f48 20c5cc2 Author: Trilok Soni Date: Fri Apr 23 06:36:15 2010 -0700 Merge "msm_fb: Enabled detection of MDDI type 2 panel" into android-msm-2.6.32 commit 75e845f6421c20b1690daf56c218ca2be48b8d9c Author: Manu Gautam Date: Wed Feb 24 18:42:17 2010 +0530 usb: ehci: Add support for SINGLE_STEP_SET_FEATURE test of EHSET Embedded High-speed Host Electrical Test or EHSET defines following tests for a USB Host port: 1: TEST_SE0 2: TEST_J 3: TEST_K 4: TEST_PACKET 5: HS_HOST_PORT_SUSPEND_RESUME 6: SINGLE_STEP_GET_DEV_DESC 7: SINGLE_STEP_SET_FEATURE Tests 1-4 needs support from EHCI i.e setting test control bits in PORTSC register. Tests 5&6 dont require any additional support from EHCI stack. Where as 7th test requires support in EHCI and is being added in this patch. For SINGLE_STEP_SET_FEATURE test, first the SETUP request of GetDesc is sent which is followed by the IN stage after a delay of 15 secs. SINGLE_STEP_SET_FEATURE test can be initiated like any other 1-4 Test by issuing a SetFeature request to the root hub with Test-Selector value = 0x06. Change-Id: I6ad2bd5fc14c31c80f0291a82fef40c2c5a9045a Signed-off-by: Manu Gautam commit a3eb15f75b78a949d50e0f50dee3fdb1ba890db8 Author: Sahitya Tummala Date: Mon Apr 5 14:08:16 2010 +0530 msm: Add profiling code to collect performance statistics Profiling code is added to measure minimum, maximum and average time of all write RPC requests from modem. This information is made available through a debugfs file rmt_storage_stats. Change-Id: Iccca72216d3ed6e91dde3e85d29307d377b0a797 Signed-off-by: Sahitya Tummala commit cb07f487bed6756eb1b66268fa1bfe50748cb00d Merge: 5843999 6083769 Author: Trilok Soni Date: Thu Apr 22 23:37:43 2010 -0700 Merge "msm: audio: 7k: Wait for audpp disable acknowledgement from DSP" into android-msm-2.6.32 commit 58439995a4de6a74659eb647bcdfe005a2155af0 Merge: 113fb80 4bd7d4d Author: Trilok Soni Date: Thu Apr 22 23:37:13 2010 -0700 Merge "msm: video: 720p: ioctl for querying decoder instances." into android-msm-2.6.32 commit 113fb80fb7dd8221bafb09a5f30d80cc450d1569 Merge: 8549903 84a6668 Author: Trilok Soni Date: Thu Apr 22 23:36:21 2010 -0700 Merge "msm_fb: Changed pack patterns for display color formats" into android-msm-2.6.32 commit 8549903ada40926aa48cc1e3e71a77ad8e5d2e0d Merge: 2ba8b32 8c12af9 Author: Trilok Soni Date: Thu Apr 22 23:35:44 2010 -0700 Merge "msm: Remove unused CONFIG_MSM_CPU_FREQ_SCREEN support." into android-msm-2.6.32 commit 2ba8b32c69ab85cae6ac787a95d841738156c727 Merge: 14f93e7 bf52567 Author: Trilok Soni Date: Thu Apr 22 23:34:30 2010 -0700 Merge "msm: clock-7x30: Reorganize pll_enable()/disable()" into android-msm-2.6.32 commit 14f93e7adfa0f56e48e51f201f9141acba696691 Merge: f781bac 60596a6 Author: Trilok Soni Date: Thu Apr 22 23:33:45 2010 -0700 Merge "msm: clock-7x30: Vote for XO sources as needed" into android-msm-2.6.32 commit f781bac0fe6471d8b8e5f7da3058987839312944 Merge: 029b2db b93f20a Author: Trilok Soni Date: Thu Apr 22 23:32:43 2010 -0700 Merge "msm: qdsp5: Aligning buffer size to 32." into android-msm-2.6.32 commit b82c22483fb992a901d3bfc1c5eab0b358cd040e Author: Nagesh Subba Reddy Date: Thu Apr 22 16:53:58 2010 -0700 media: camera: Updated the way in which VFE driver votes for AXI Add the AXI requirement only once and update different AXI rates later on based on the mode of VFE operation. Change-Id: I35d7ad916321d969dbc30fa5e28ef18d3da43e3c Signed-off-by: Nagesh Subba Reddy commit dd1da4863e9dd3fad795ef7c97a1e89e9c644ff6 Author: Patrick Cain Date: Mon Apr 19 18:03:31 2010 -0700 msm_fb: display: Increase PMDH clk to 455.5MHZ MDDI hardware bug causes MDDI to have very high delays when displaying frames. PMDH clk needs to be increased to maximum frequency to compensate and allow for higher framerates. Change-Id: Icfa0975dde334387ec9d91ee143395f1de06ba99 Signed-off-by: Patrick Cain commit 46cfd3aa69793ae878cb499f90e0667fde8f298f Author: Ravishangar Kalyanam Date: Wed Apr 21 12:18:27 2010 -0700 msm: video: Add clock gating support in Video Core Add clock gating support in Video Core driver. Change-Id: I87040fbb0ff2c5901b30b02fa77ed4c9f744f6c5 CRs-Fixed: 227222 Signed-off-by: Ravishangar Kalyanam commit bf525678c9f654163e56fac002d7878a8033ccba Author: Stephen Boyd Date: Wed Apr 21 10:19:50 2010 -0700 msm: clock-7x30: Reorganize pll_enable()/disable() It looks better to not interleave pll_enable() and pll_disable() with src_enable() and src_disable(). Change-Id: Ia17f13fcc832e4083e29c0f963f820a6266d4360 Signed-off-by: Stephen Boyd commit 60596a6211bc41fa3e4f1dd8a06bf9e40abb292a Author: Stephen Boyd Date: Mon Mar 8 16:48:58 2010 -0800 msm: clock-7x30: Vote for XO sources as needed PLLs 0, 1, 2, 5, and 6 have TCXO as their source. When these PLLs are enabled, maintain a vote for the TCXO source to be on. When all the PLLs are disabled remove the vote. This is necessary to prevent the modem from turning the TCXO source off during power collpase when some clocks are still using it. Likewise, PLLs 3 and 4 use the LPXO as their source. When these PLLs are enabled, maintain a vote for the LPXO source to be on. This is necessary to prevent the modem from turning the LPXO source off during power collapse when clocks are still using it. AXI users or clocks which use no XO source (particularly global clocks) are mapped to LPXO since its probably a better choice to keep the lower powered source on as opposed to the tcxo source which uses more power. Change-Id: I4ed5f731aec2bcc7658011a4402866ec15c8e82f Signed-off-by: Stephen Boyd commit 4bd7d4d384991849246c7ce128347e8bb034a14f Author: Gopikrishnaiah Anandan Date: Wed Apr 21 13:36:51 2010 -0700 msm: video: 720p: ioctl for querying decoder instances. Client can query driver to get the number of decoder instances that are currently opened. Change-Id: Id600117a3420011b84f3455854168935e6d42f9a Signed-off-by: Gopikrishnaiah Anandan commit d6c5ee12838f247dba7f7d17282956bd7954f806 Author: Kuogee Hsieh Date: Thu Apr 22 08:47:48 2010 -0700 msm_fb: display: consolidate kickoff of overlay engine Base layer does not need to kick off overlay engine as long as VG pipe is playing to avoid base layer's contents be double played which cause flickering efferct. Change-Id: If9b885c8e7df2ba3bf9c5382d8939ca790203d9d CRs-fixed: 235595 Signed-off-by: Kuogee Hsieh commit 029b2db855855e1d653f98fb61e5e8dab9e85cad Merge: 62d1f34 2e62732 Author: Trilok Soni Date: Thu Apr 22 06:07:05 2010 -0700 Merge "defconfig: Enable usb OTG-host support for 7x27 and 7x30" into android-msm-2.6.32 commit 62d1f345072856b40d00ef105dde089c630c5bb2 Merge: 2843c15 52ebea9 Author: Trilok Soni Date: Thu Apr 22 06:06:40 2010 -0700 Merge "msm: audio: 8x50: Change all the debug messages to use dynamic printk" into android-msm-2.6.32 commit 2843c15d9d6c9712dddca31eb440ff999db7033a Merge: d472540 31f301c Author: Trilok Soni Date: Thu Apr 22 06:05:28 2010 -0700 Merge "spi_qsd: Add better handling for pending transfers during suspend" into android-msm-2.6.32 commit d472540287a09ebeb47bc0ebe15a73ac48d27c04 Merge: 9187125 8fbf6e4 Author: Trilok Soni Date: Thu Apr 22 06:04:09 2010 -0700 Merge "spi_qsd: Add mutex to get exclusive access to controller registers" into android-msm-2.6.32 commit 91871256d93d3943309c50b191f770795b7d185b Merge: 5f5999d 00964e3 Author: Trilok Soni Date: Thu Apr 22 06:03:47 2010 -0700 Merge "msm: clock-7x30: Add mi2s clock support" into android-msm-2.6.32 commit 5f5999d6559645cee464348fe4424348ba7d337d Merge: 6633abe 959ea6f Author: Trilok Soni Date: Thu Apr 22 06:03:22 2010 -0700 Merge "msm: clock-7x30: fix get_rate() for clocks with no rate" into android-msm-2.6.32 commit 608376962f88b202a0ac9cb58fc20bd36100f011 Author: Sriranjan Srikantam Date: Thu Apr 22 16:20:04 2010 +0530 msm: audio: 7k: Wait for audpp disable acknowledgement from DSP Wait until audpp is disabled properly by waiting for disable acknowledgement from DSP. Currently audpp driver doesn't wait for disable acknowledgement from DSP. This might result into issues if another audio session starts immediately Change-Id: I1da8c2b342484424041981f17f2713aace7c8586 Signed-off-by: Sriranjan Srikantam commit 31f301c171aab8e42f8b6abe9b7866412cb546a8 Author: Lena Salman Date: Tue Mar 23 14:51:00 2010 +0200 spi_qsd: Add better handling for pending transfers during suspend To improve SMP safety, add better handling in suspend function to wait for graceful closure of pending transfers. This graceful closure waits for all the pending transfers to finish or timeout, while not allowing new ones to queue up. This allows correct handling of all the resources involved in a transfer before suspend. Signed-off-by: Lena Salman commit 8fbf6e4c5371520b5f9de2001e2ebd15773e918b Author: Lena Salman Date: Thu Mar 25 10:44:10 2010 +0200 spi_qsd: Add mutex to get exclusive access to controller registers To improve SMP safety, add mutex to get exclusive access to controller registers. Signed-off-by: Lena Salman commit 52ebea969391c139aa0cebf7025bee92f54b96dc Author: Sriranjan Srikantam Date: Fri Apr 16 15:16:30 2010 +0530 msm: audio: 8x50: Change all the debug messages to use dynamic printk Remove the debug macros in audio and adsp drivers and use standard pr_err, pr_info and pr_debug messages so that dynamic printk feature can be used to enable and disable the debug messages at runtime Change-Id: Ib63384513cf207d7dbfa5410106c582c60cdcc91 Signed-off-by: Sriranjan Srikantam commit 6633abe426c6141c92c4b2e3b675468b1f6d34df Merge: 3759a14 6a5400f Author: Bryan Huntsman Date: Wed Apr 21 19:51:14 2010 -0700 Merge "docs: Add NPA documentation" into android-msm-2.6.32 commit 3759a144debfd574c89fd0699dd1f940a273003a Merge: df064e3 cd2cf1f Author: Bryan Huntsman Date: Wed Apr 21 19:51:05 2010 -0700 Merge "msm: rtc: Replace all printk with pr_* macros" into android-msm-2.6.32 commit df064e320af2c989c065c3683dbfe682dd2e11ea Merge: 3a68715 ab7302a Author: Bryan Huntsman Date: Wed Apr 21 19:50:56 2010 -0700 Merge "msm_kgsl: Invalidate base address" into android-msm-2.6.32 commit 00964e39474139c06b70a58002cc0ffac612fde4 Author: Stephen Boyd Date: Wed Apr 21 18:56:34 2010 -0700 msm: clock-7x30: Add mi2s clock support MI2S_M and MI2S_S clocks represent the master and slave clocks respectively. We rename proc_comm names for these clocks to maintain compatibility with 7x30 local clock control code. Change-Id: Ie961991eebc4cc00bcfca059070273f6dc12cd9f Signed-off-by: Stephen Boyd commit 18bb136637a02a106e401acf7d2309c76e9f1094 Author: Dinesh Garg Date: Mon Apr 19 15:48:10 2010 -0700 msm: 7x27: move video encoder to /dev/pmem_adsp Make /dev/pmem_adsp a cached pmem device and use O_SYNC flag to make it uncached for camera and video decoder. Use /dev/pmem_adsp for Video encoder for bth rlc and reference buffers. Change-Id: Ic32bb35c1db8b2b388f54bb1198ba44a621171c5 Signed-off-by: Dinesh Garg commit 5ce7d4e69716e5d747ab8162e3685f34da724edb Author: Vishwanathapura, Niranjana Date: Wed Apr 21 14:32:11 2010 -0600 msm: use tasklets to read from SMD in smd_tty driver Use tasklet to read from SMD instead of work function in smd_tty driver which will improve throughput. Change-Id: I2365d17a981052a431aaaa392805a427953fe61b Signed-off-by: Niranjana Vishwanathapura commit 3a687151ce7eed7f83c1d23a40386ad3c1e20042 Merge: 13bf1b9 057ec7f Author: Trilok Soni Date: Wed Apr 21 14:58:58 2010 -0700 Merge "msm: usb: Enable PHY comparators for host mode support on 7x30" into android-msm-2.6.32 commit 13bf1b9e16000a7c73664b391d552be06daac872 Merge: 23a4f5c efb4187 Author: Trilok Soni Date: Wed Apr 21 14:58:36 2010 -0700 Merge "mtd: msm_nand: Convert all NAND_ defines to MSM_NAND_" into android-msm-2.6.32 commit 84a6668842db99f146869a71c6a11bb70b98e598 Author: Neeraj Kumar Date: Wed Apr 21 10:57:41 2010 -0700 msm_fb: Changed pack patterns for display color formats Changed dispaly color pack pattern to match it across MDP 3.x and MDP 4 drivers. Change-Id: Ic960404af283a61dd0100fabf4c9d70f66da0268 CRs-fixed: 230088,230665 Signed-off-by: Neeraj Kumar commit 0290a72bd7fcab585ba0c8c63d3b75938ff307cc Author: Brian Swetland Date: Wed Feb 24 16:13:20 2010 -0800 qsd8k: debugging / ramdump driver for QDSP6 Provide a mechanism for userspace to get notification of DSP crashes, and to extract the DSP's RAM image before allowing the crash to "complete". Change-Id: Id091c187307510999a8b3ea614c17c3268c2036c Signed-off-by: Brian Swetland Signed-off-by: Ashraya Arya commit 8c12af9591ac477aeacee24afb0352126ef158b8 Author: Matt Wagantall Date: Wed Apr 21 11:10:05 2010 -0700 msm: Remove unused CONFIG_MSM_CPU_FREQ_SCREEN support. This feature is obsolete and no longer used. Remove it. Change-Id: I5163583625a75200e308e19faee0ae11278c69dd Signed-off-by: Matt Wagantall commit 6a5400f549340dcce71f4ac082139b7fe92d5d7e Author: Praveen Chidambaram Date: Wed Apr 21 13:21:52 2010 -0600 docs: Add NPA documentation NPA documentation now includes NPA Remoting bits as well. Change-Id: Iecef5a2831d39f017c0453e4cf5b925b715bce6c Signed-off-by: Praveen Chidambaram commit cd2cf1f7552d3262c1561080a8a6e6498feb1ec0 Author: Derek Kulinski Date: Wed Apr 21 12:07:06 2010 -0700 msm: rtc: Replace all printk with pr_* macros Change-Id: I92fbbcd4f5cdc6d5fd820da9a5cddf7f0df66205 Signed-off-by: Derek Kulinski commit 23a4f5c89c8085f4f4707de095e1081cdc15b500 Merge: 633399a eb8239d Author: Bryan Huntsman Date: Wed Apr 21 12:01:09 2010 -0700 Merge "msm_fb: display: non-blocking frame push for MDDI" into android-msm-2.6.32 commit 959ea6f28db7ecab62cbc5a9efe73e017889de7f Author: Stephen Boyd Date: Wed Apr 21 11:59:16 2010 -0700 msm: clock-7x30: fix get_rate() for clocks with no rate clk_get_rate() always needs to return an unsigned long value. This means we can't return an error code to signal that this clock has no valid rate. For clocks with no rate, return 0 instead of an error value. Change-Id: I12339f681d4cb1fc1755c39ad6e0a22c96a6a924 Signed-off-by: Stephen Boyd commit eb8239d1cbf9ee14877fddce0110a86dd0c6582d Author: Kuogee Hsieh Date: Tue Apr 20 10:01:42 2010 -0700 msm_fb: display: non-blocking frame push for MDDI Add non-blocking frame push for MDDI display to improve FPS. Change-Id: I9e3322015784a6ad37688d9b9452aa349b08c9d2 Signed-off-by: Kuogee Hsieh commit 633399aac338617ce7ae4bfb6b7a62c843115f20 Author: Gregory Bean Date: Tue Feb 23 21:22:06 2010 -0800 msm: board-msm8x60: added support for ethernet. Added proper configuration and setup code for ethernet controllers on 8660 simulator and rumi3 platforms. Change-Id: Ia3ec654bb26fea8c56583fdbcf64089a5def15cc Signed-off-by: Gregory Bean commit 01e0be43d0d4fc35fa3b15f789bab39a326f6362 Author: Gregory Bean Date: Tue Feb 23 21:14:41 2010 -0800 msm: gpio: added MSM TLMM/GPIO v2 support Added TLMM/GPIO v2 support for the 8660, including: - Proper support for gpiolib. - Support for MSM GPIO summary interrupts via generic irq_chip. Change-Id: I2426515822e30e77bfec36a87f60d14ab2332aab Signed-off-by: Gregory Bean commit f8634efcfac03ba2d0fbbc4fd99258631c468e20 Author: Gregory Bean Date: Fri Jan 29 10:57:04 2010 -0800 msm: gpio: refactor gpio headers for incoming v2 gpio support Upcoming gpio implementation will have a different interface than existing legacy gpio support, so existing headers are being split to make room to insert the new APIs with as little disruption as possible. Change-Id: Id2947c5971ea1a6be5e88473ea14fd7b19e563c9 Signed-off-by: Gregory Bean commit ebc643d9875747d6537152034a40790630f1b421 Author: Jeff Ohlstein Date: Tue Feb 16 17:27:46 2010 -0800 msm: timer: Maintain timer state as per-cpu Previously the fields in the msm_clock structure were per-timer type. This works fine for uniprocessor, but for smp we have different timers on each core. We need to keep track of the state of the timers on a per-cpu basis. Change-Id: I63fe3d9c13211515352d95b348c84d28851d69bf Signed-off-by: Jeff Ohlstein commit 652f9f7b9ea868d5394fdee4066250fa51a58908 Author: Jeff Ohlstein Date: Tue Feb 16 16:36:47 2010 -0800 msm: timer: Support 8x60 debug timer Respect the existing Kconfig setting for use debug timer as opposed to the general purpose timer. Change-Id: I8342ae62e4e2f6d3ccf63a0f526fb20c74daf52d Signed-off-by: Jeff Ohlstein commit ed333bb15f146fc03f39d67f99dcf24691740ce7 Author: Steve Muckle Date: Fri Feb 12 10:50:27 2010 -0800 msm: gpio: add TLMM/GPIO iomap for 8x60 Added memory mapping for TLMM/GPIO registers on 8x60. Change-Id: I0726df6330f956afa0153f71e82c2fadfa044703 Signed-off-by: Steve Muckle commit 95be8e4695510e10256c1441a9562c1cab603023 Author: Jeff Ohlstein Date: Wed Feb 10 18:46:42 2010 -0800 msm: timer: support 8x60 timers Change-Id: Ib2c7782b31a0e8d8e305ee9a2dc0c9d38a046016 Signed-off-by: Jeff Ohlstein commit 49657e6d6e98db9f51f002e6e41d6858d5a3430c Author: Abhijeet Dharmapurikar Date: Thu Jan 21 18:10:29 2010 -0800 msm: irqs-8x60: interrupt map Define the interrupt map in irq-8x60.h Change-Id: I4a739627bdb0066e16980af4aa64773c41d4af3f Signed-off-by: Abhijeet Dharmapurikar commit 0a172ad6303c26e794279fd3af7e6c5f7264cad2 Author: Jeff Ohlstein Date: Fri Feb 26 13:14:59 2010 -0800 msm: dma: Separate per-adm state from global state Moves the fields that are per-adm into their own struct. This will allow us to support targets that have multiple adms more easily. Change-Id: If149ab159925544cfa0ba8e504a07faebf40234f Signed-off-by: Jeff Ohlstein commit dde2539c8adc660b4f9a0a449fcb6d2fdb005d6b Author: Steve Muckle Date: Thu Feb 11 11:50:40 2010 -0800 msm: 8x60: gic initialization fixup for RUMI On RUMI platform STIs are not enabled by default, contrary to the GIC spec. The bits for STIs in the enable/enable clear registers are also RW instead of RO. STIs need to be enabled at initialization time. Change-Id: I2ee9495370af2c0e44ac11018a97853d2c9270f7 Signed-off-by: Steve Muckle commit 63f08010b6a1be32cf6d6ed3d1ad5b2bbce246e8 Author: Abhijeet Dharmapurikar Date: Mon Feb 1 12:30:28 2010 -0800 msm: 8x60: setup correct handlers for private interrupts Private Peripheral interrupts could be edge triggered or level triggered depending on the platform. Initialize handlers for these in board file. Change-Id: I56a761ecb681b4db290a64eb3f5fc41440d22397 Signed-off-by: Abhijeet Dharmapurikar commit 779f00f0ba108ee6da064acf552f9804a9718ccc Merge: 145259c daa363b Author: Steve Muckle Date: Wed Apr 21 09:03:56 2010 -0700 Merge "msm: enable gic for msm8x60" into android-msm-2.6.32 commit 145259cbcb1251dd71a952eca33be06df2ab46d7 Merge: 6df1997 56ccb91 Author: Steve Muckle Date: Wed Apr 21 09:03:49 2010 -0700 Merge "msm: MSM8X60 simulator board support" into android-msm-2.6.32 commit 6df199745221a51a0fbc6e3bb7983d2a83c25b86 Merge: 289b7c4 22d8008 Author: Steve Muckle Date: Wed Apr 21 09:03:44 2010 -0700 Merge "msm: MSM8X60 RUMI3 board support" into android-msm-2.6.32 commit 289b7c4daf583fa049dc1596a606b473c707b1a3 Merge: c7a6d31 ab94eab Author: Steve Muckle Date: Wed Apr 21 09:03:37 2010 -0700 Merge "msm: use local timers in ScorpionMP" into android-msm-2.6.32 commit c7a6d3156bd7d5e36d472079fcd960e5b93089c8 Merge: 11479a5 7214dcd Author: Steve Muckle Date: Wed Apr 21 09:03:31 2010 -0700 Merge "msm: timer: featurize smd dependencies" into android-msm-2.6.32 commit 11479a51b1b42ad5e706e22545c129645a120812 Merge: 7c995ca 76618e9 Author: Steve Muckle Date: Wed Apr 21 09:03:20 2010 -0700 Merge "msm: initial MSM8X60 early kernel boot support" into android-msm-2.6.32 commit 2e6273267c04b9d25f17e0776b75bd46a643db26 Author: Manu Gautam Date: Wed Apr 21 18:27:41 2010 +0530 defconfig: Enable usb OTG-host support for 7x27 and 7x30 Change-Id: I11728cfe2a3538779be6f3ecfc24feade1b630da Signed-off-by: Manu Gautam commit 057ec7f0b4b0941a90551148214369a6fbb78058 Author: Manu Gautam Date: Wed Apr 21 15:22:20 2010 +0530 msm: usb: Enable PHY comparators for host mode support on 7x30 To support Host and Peripheral modes, usb driver should depend on ID interrupt while cable is not connected. For this PHY3.3V power rail must need to be on and PHY comparators need to ON while cable is not connected. Change-Id: Ia00a662c04dbfbbce1ef3150f29013f6f82f4386 Signed-off-by: Manu Gautam commit 7c995ca80df8c9823ed9d693f005eaf0b6c94e41 Merge: 0007abf 7922fe6 Author: Trilok Soni Date: Wed Apr 21 04:17:02 2010 -0700 Merge "Bluetooth: Fix kernel panic on sniff request" into android-msm-2.6.32 commit 0007abf18740fa4b56975d60393680c6e20f02c0 Merge: fa832d5 bfad2bb Author: Trilok Soni Date: Wed Apr 21 04:15:40 2010 -0700 Merge "EHCI: msm: use clear_tt_buffer interface" into android-msm-2.6.32 commit fa832d59567e5e310cc91665f18ea975b51ce784 Merge: 0d5b9be ce6315a Author: Trilok Soni Date: Wed Apr 21 01:50:11 2010 -0700 Merge "mm: Reserve the first page at PHYS_OFFSET on scorpion architectures." into android-msm-2.6.32 commit 0d5b9be622e10a93ed8112cfbd46b18ced5739a8 Merge: 87c0524 bdc09b1 Author: Trilok Soni Date: Wed Apr 21 01:49:47 2010 -0700 Merge "board: msm7x30: Fix compilation errors" into android-msm-2.6.32 commit 87c0524e5986fd7361f47084559098c102866979 Merge: 63ab132 d6d3156 Author: Trilok Soni Date: Wed Apr 21 01:49:25 2010 -0700 Merge "msm: board-qsd8x50: Fix compilation errors" into android-msm-2.6.32 commit 63ab13266dceb67a70ecf510ed5707c65da52367 Merge: 259ff6c 8240420 Author: Trilok Soni Date: Wed Apr 21 01:48:28 2010 -0700 Merge "msm: audio: 7x27: Restrict number of MP3 hardware decoder" into android-msm-2.6.32 commit 259ff6cb1d120cb68c60ecdfabd31d933335b124 Merge: 57c9ddb e90f0e8 Author: Bryan Huntsman Date: Wed Apr 21 00:02:29 2010 -0700 Merge "mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned" into android-msm-2.6.32 commit 8240420b01c9423a8865697ff196f4204d246ae5 Author: Patrick Lai Date: Tue Apr 13 16:37:58 2010 -0700 msm: audio: 7x27: Restrict number of MP3 hardware decoder There is no use case requiring multiple MP3 decoder instances on 7x27 android release. Limit number of MP3 decoders down to 1 instance to spare more physical memory. Change-Id: Ibd31135c0ddfbfc33a840f81b9e0f5c7072b6ea4 Signed-off-by: Patrick Lai commit 57c9ddb732e65457ec3ebd232ca3abf0fd2b1cfb Author: Sriranjan Srikantam Date: Mon Apr 12 15:25:17 2010 +0530 msm: board-msm7x27: Decrease the pmem size as per current usage The audio pmem size allocation in board file is higher than the current usage. The pmem size should be equivalent to size required for single audio session. The MSM_PMEM_AUDIO is used by OMX component which 372736 bytes for single audio session. The PMEM_KERNEL_EBI1 is used by audio drivers and requires 112Kbytes for single audio session. Update these pmem sizes in the board file to reflect the size required for single session. Change-Id: I2682f1294b7a859a3db9218e204eacbaa54dd181 Signed-off-by: Sriranjan Srikantam commit e90f0e86e6bd9a79c45c9a078ffce0e44a49ee40 Author: Sahitya Tummala Date: Tue Apr 20 15:48:07 2010 +0530 mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned The current code for PIO doesn't transfer whole data when data size is not in multiple of 4 bytes. The last few bytes are not written to the card resulting in no DATAEND interrupt from SDCC. This patch allows data transfer for non-aligned data size in PIO mode. Change-Id: I60674efed0592c2f3e9c6b5b1340027cf905a541 Signed-off-by: Sahitya Tummala commit ce6315a2a7b4478fe603e960fcbbec368cf64428 Author: Anoop Krishnan Jayasankaran Date: Tue Apr 20 16:52:26 2010 -0700 mm: Reserve the first page at PHYS_OFFSET on scorpion architectures. On scorpion architectures the first page at PHYS_OFFSET is used for suspend/resume operations. We don't want anyone else to use this memory. Change-Id: Ie1823145c59c3138c2777ada1e4f996137e46d64 Signed-off-by: Anoop Krishnan Jayasankaran commit b93f20a31d0e3ade59e15c1e2dc0017366b69c29 Author: Vinay Kalia Date: Mon Apr 19 18:52:03 2010 -0700 msm: qdsp5: Aligning buffer size to 32. Size of the buffer that needs to be cache cleaned should be 32 byte aligned and an extra 32 byte need to be added. Without this change decoder output has artifacts for few frames. Change-Id: I65919f0ef52876bc751aa97f6127bf237787776e Signed-off-by: Vinay Kalia commit 6a2cd94740687fc49637b76a41ccaf6e4387c934 Merge: 6ec7d97 8b2481e Author: Bryan Huntsman Date: Tue Apr 20 15:55:13 2010 -0700 Merge "msm_fb: Modified MDP3.1 workaround for artifacts" into android-msm-2.6.32 commit 6ec7d97d8f1ecb62e74af860490e7626f1271a3f Merge: db92159 500fcbe Author: Bryan Huntsman Date: Tue Apr 20 15:54:59 2010 -0700 Merge "msm: video: Axi flow id upgrade for video core." into android-msm-2.6.32 commit db921596964b8a40e947670c3f9d8f3c0c9be342 Merge: 2fab902 12c397d Author: Bryan Huntsman Date: Tue Apr 20 15:54:51 2010 -0700 Merge "msm: video: Fix to release driver transaction entries" into android-msm-2.6.32 commit 2fab902f2f21b4ca2ea18b8a7d688d68de57fd16 Merge: 91a8613 2d7f083 Author: Bryan Huntsman Date: Tue Apr 20 15:54:42 2010 -0700 Merge "defconfig: Enable secure rtc support, disable 7X00 RTC driver" into android-msm-2.6.32 commit 91a86136a5c3807df7770625a9c670781a2e0e16 Merge: 66e545e c0dc88c Author: Bryan Huntsman Date: Tue Apr 20 15:54:34 2010 -0700 Merge "defconfig: Enable secure rtc support, disable 7X00 RTC driver" into android-msm-2.6.32 commit 66e545ec5c46d7f0ac2f09963af30a68ba5b0ff3 Merge: cf41494 4f2e687 Author: Bryan Huntsman Date: Tue Apr 20 15:54:27 2010 -0700 Merge "msm: audio: qdsp5v2: Interpret DTX config option properly" into android-msm-2.6.32 commit cf4149487377d8dac0e81793aeb8ec1a58acdbe7 Merge: fbadd8b 6aa1c32 Author: Bryan Huntsman Date: Tue Apr 20 15:54:17 2010 -0700 Merge "msm: audio: qdsp5v2: Call wake_lock before disabling AFE" into android-msm-2.6.32 commit ab7302aee4feffe334d1d24c0e018ce95a4fb38e Author: Shubhraprakash Das Date: Mon Apr 12 17:41:14 2010 -0600 msm_kgsl: Invalidate base address Context switch base addresses need to be invalidated when tlb is flushed or page table is changed, otherwise the GPU may use old base addresses which are incorrect. Change-Id: I146b9e133ba30eec1a4df7fef2c79693fbc5925e Signed-off-by: Shubhraprakash Das commit 7922fe62d51c920c14312cfa49742419b1a14341 Author: Ron Shaffer Date: Tue Apr 20 16:24:25 2010 -0400 Bluetooth: Fix kernel panic on sniff request Change to synchronize SCO/eSCO connection requests to ACL state introduced a kernel panic. Order of logic updated to prevent NULL pointer dereference. Change-Id: Ibb731cc9d9fc7541ab311a05db2a6dc6f5100a35 CRs-fixed: 235447 Signed-off-by: Ron Shaffer commit 8b2481e2310d3401e0e87a5870d1cddfeb2071f0 Author: Neeraj Kumar Date: Tue Apr 13 14:17:53 2010 -0700 msm_fb: Modified MDP3.1 workaround for artifacts Source and Destination region matching is changed to reduce artifacts in case rotation is 90, 180 and 270. Older ROI were not placed correctly on framebuffer and were producing artifacts. In case dst_width mod 32 is 14, 22 and 30, equations to split the destination ROI is changed to get even width/ height. This removes artifacts for YCbCrH2V1 color format. as if the width is odd MDP makes it even in HW. Added another case to break source and destination regions when destination ROI width/height mod 32 is 2 MDP_CGC_EN register is set before PPP kick of and reset after PPP complete. This sets the gating of PPP block and avoid premature PPP interrupt for very thin ROI blits. Change-Id: I9f2577b6e49f5f4038888cae6d9814a947b5c3c6 Signed-off-by: Neeraj Kumar commit fbadd8b993fdf0f3fe69ea67401555ffb589de1d Merge: 547feaf b3eb74c Author: Bryan Huntsman Date: Tue Apr 20 12:59:33 2010 -0700 Merge "GIC: Dont disable INT in ack callback" into android-msm-2.6.32 commit 547feafa7031622270681acb9a4551b57415727f Merge: c89f976 457c7ab Author: Bryan Huntsman Date: Tue Apr 20 12:59:20 2010 -0700 Merge "GIC: Add callback for mask_ack" into android-msm-2.6.32 commit c89f976c06d4bb5598557ef28b83da60aebbe7f6 Merge: fed7676 008416e Author: Bryan Huntsman Date: Tue Apr 20 12:59:10 2010 -0700 Merge "GIC: Prevent gic from crossing NR_IRQS" into android-msm-2.6.32 commit fed7676e3382ca1857e9630119c34c9a7978de18 Merge: 930f6bd 7d81e04 Author: Bryan Huntsman Date: Tue Apr 20 12:58:48 2010 -0700 Merge "smp: parallel smp boot option" into android-msm-2.6.32 commit 930f6bdff883fe743262f86c8e298dce2bb97165 Merge: d4d5e24 b36553d Author: Bryan Huntsman Date: Tue Apr 20 12:58:38 2010 -0700 Merge "msm: initial irq definitions for MSM8X60" into android-msm-2.6.32 commit d4d5e241a564173b9bc8d663d054698dbf987bf8 Merge: a715613 d8a9289 Author: Bryan Huntsman Date: Tue Apr 20 12:58:31 2010 -0700 Merge "msm: io: MSM8X60 io support" into android-msm-2.6.32 commit a715613d9adffada1f9e644fa215bca10722a7b1 Merge: 47ee0f6 a1bb65a Author: Bryan Huntsman Date: Tue Apr 20 12:58:21 2010 -0700 Merge "GIC: Disable unused interrupts" into android-msm-2.6.32 commit 47ee0f69a85ece6a897cec51252cffb8ad79e550 Merge: d816b89 16215d5 Author: Bryan Huntsman Date: Tue Apr 20 12:56:39 2010 -0700 Merge "mm: do not set missing flags on ScorpionMP" into android-msm-2.6.32 commit d816b8979b1748055dc866da12bd2357f3736ef3 Merge: 1fe48df b0106f5 Author: Bryan Huntsman Date: Tue Apr 20 12:56:11 2010 -0700 Merge "macros for wfe, sev instructions" into android-msm-2.6.32 commit 1fe48df56a22812c2eb253d4fadcfb0ac7c81dd1 Merge: 5d96a34 3016081 Author: Bryan Huntsman Date: Tue Apr 20 12:56:02 2010 -0700 Merge "msm: add MSM8X60 architecture" into android-msm-2.6.32 commit 5d96a346d3020b64fa91d099c677cfa65104d782 Merge: 34c14e1 a515293 Author: Bryan Huntsman Date: Tue Apr 20 12:55:41 2010 -0700 Merge "mmc: core: Add bustest to test if host and card supports wider buswidths" into android-msm-2.6.32 commit 34c14e1a56965a618e138a1ea16b85e2c13261b7 Merge: 56270f7 d8829fb Author: Bryan Huntsman Date: Tue Apr 20 12:55:30 2010 -0700 Merge "diag: Print the buffer after completion call back" into android-msm-2.6.32 commit 56270f7ba56e8feb31b462196e32359aba1c1a9b Merge: 480ea27 ca4bb9a Author: Bryan Huntsman Date: Tue Apr 20 12:55:21 2010 -0700 Merge "msm: Add SMD buffer size information to 'ch' debug interface" into android-msm-2.6.32 commit 2d7f08328d04dde5f9603ba53f7ae62e6d4146bc Author: Anirudh Ghayal Date: Fri Apr 16 19:39:01 2010 -0700 defconfig: Enable secure rtc support, disable 7X00 RTC driver The 7x27 and 8x50 targets suppport secure time. These targets use the rtc-msm driver and not the rtc-msm7x00a driver. Change-Id: I823f5e44f48dd2e89d387fc09f42fb3ee550633c Signed-off-by: Anirudh Ghayal commit c0dc88c3b280c1097a3a90367022ebc7bf1adced Author: Anirudh Ghayal Date: Fri Apr 16 11:10:00 2010 -0700 defconfig: Enable secure rtc support, disable 7X00 RTC driver 7x30 uses the RTC_DRV_MSM (rtc-msm) driver and not the 7X00 RTC (rtc-msm7x00a) driver. Change-Id: I45bb57e0f96b5edb6a0021c73c71213c0dcd785c Signed-off-by: Anirudh Ghayal commit daa363bf20d05e2c2bcc8f257b5a818fac98d484 Author: Steve Muckle Date: Thu Jan 7 14:24:58 2010 -0800 msm: enable gic for msm8x60 The Qualcomm generic interrupt controller is an implementation of the ARM generic interrupt controller, and is used in the ScorpionMP architecture. Change-Id: I3584992e6498902702d16179f068f7f2bcf360bc Signed-off-by: Steve Muckle commit 56ccb9170b0c2b9bee570a7ae79555f51087c0bf Author: Steve Muckle Date: Thu Jan 7 12:51:10 2010 -0800 msm: MSM8X60 simulator board support Board configuration for MSM8X60 simulation. Change-Id: I04d8dfb57a462a1dba15398159bddd162075a2d9 Signed-off-by: Steve Muckle commit 22d80083f44c6c2a9e097e03f6fe2f0130d9368e Author: Steve Muckle Date: Thu Jan 7 12:43:24 2010 -0800 msm: MSM8X60 RUMI3 board support Board configuration for MSM8X60 emulation on RUMI3. Change-Id: I256ee41cfea052635537d32ceb3dd73719eef708 Signed-off-by: Steve Muckle commit d4a83609e088d915bbc8fd015629177ae60fd9ff Author: Vishwanathapura, Niranjana Date: Wed Apr 14 11:27:14 2010 -0600 msm: Hold wakelock until all rpc calls has been replied. It is possible for the userspace to go to suspend after reading a RPC callback request and before replying. This causes the remote processor to timeout waiting for reply. Hold the wakelock until all outstanding rpc calls have been replied. Change-Id: I652df1e367701fd4c87dd07a9d39c0250a1f609a CRs-Fixed: 233231, 233350 Signed-off-by: Niranjana Vishwanathapura commit ab94eab2893ea9c6f40b8f33244421e4d33c10b0 Author: Jeff Ohlstein Date: Tue Feb 2 13:47:19 2010 -0800 msm: use local timers in ScorpionMP Change-Id: Ibdd9f533f81458f4c24a8ec287f5c6e0d7e9bafe Signed-off-by: Jeff Ohlstein commit 7214dcdb1cd3b562e6b009c353da373cd8931ace Author: Jeff Ohlstein Date: Tue Feb 2 12:37:29 2010 -0800 msm: timer: featurize smd dependencies Change-Id: I5a1a000a6de8ac9f662d36b694908ed74e9142af Signed-off-by: Jeff Ohlstein commit 76618e91b42b08589895f7cb133cbf69a809c9ce Author: Steve Muckle Date: Thu Jan 7 12:09:06 2010 -0800 msm: initial MSM8X60 early kernel boot support Current MSM8X60 platforms boot all available cores into the kernel entrypoint in parallel. Change-Id: I46d5481901577d88ec8ca59ca4b7717ae31f661b Signed-off-by: Steve Muckle commit bfad2bbda1c1c7125154eabc8093268b0ad16e39 Author: Pavankumar Kondeti Date: Fri Nov 20 13:56:14 2009 +0530 EHCI: msm: use clear_tt_buffer interface As part of low/full speed endpoint halt processing TT buffer is cleared. Register clear_tt_buffer callback to get a notification from hub when TT buffer is cleared. Otherwise ehci_endpoint_disable called as part of device disconnection will be blocked indefinitely. Signed-off-by: Pavankumar Kondeti commit a51529379a9b111c3508e5162d6ce6fb807e1410 Author: Aparna Mallavarapu Date: Wed Apr 7 20:31:09 2010 +0530 mmc: core: Add bustest to test if host and card supports wider buswidths The MMC v4 specification defines two commands to test the data bus by sending fixed test pattern to the card and reading back from the card. Before switching to wider bus widths, perform the bus test, using these commands, to confirm that the host and card can support wider bus widths. Change-Id: Ifcad40deaebe6f0c82e8b89cf23b11269c29f8d3 Signed-off-by: Aparna Mallavarapu commit bdc09b1709ce7a5c9fd5b20a19bd6d693743ffd8 Author: Adarsh Srivastava Date: Tue Apr 20 17:10:18 2010 +0530 board: msm7x30: Fix compilation errors Change-Id: Ia6b26a7fe0461a4087bc881b4b10ed6989a6a548 Signed-off-by: Adarsh Srivastava commit d6d31563adb4bf365e9e8b683428662f586d4cf8 Author: Adarsh Srivastava Date: Tue Apr 20 13:41:00 2010 +0530 msm: board-qsd8x50: Fix compilation errors Fix the compilation errors when SDCC slots are disabled Change-Id: Ic635ca9d78f225fe53282a634a63aa6aa6e3cf6e Signed-off-by: Adarsh Srivastava commit a02dc754904ab1307f394092ee741219d12910ff Author: Peter Ujfalusi Date: Mon Feb 22 13:27:13 2010 +0200 ASoC: core: On resume also check the soc device state Check the card->codec on soc_resume to detect if the soc device is properly initialized. If the card->codec is NULL, than do not continue the resume operation, since the device is not initialized properly. Change-Id: I698f69dafa3c4e28af1b12eebbf4e687d6ff03cb Signed-off-by: Peter Ujfalusi Acked-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Sriranjan Srikantam commit b3eb74cd9f3d28f47c2b4679cd3d2914cd354a48 Author: Abhijeet Dharmapurikar Date: Fri Jan 22 16:21:07 2010 -0800 GIC: Dont disable INT in ack callback Unless gic_ack_irq is called from __do_IRQ, interrupt should not be disabled in the ack function. Disabling the interrupt causes handle_edge_irq to never enable it again. Change-Id: I66625db225cb74c488e0249150335135d95bdb11 Signed-off-by: Abhijeet Dharmapurikar commit 457c7ab603df2c4091d3b4e6e8cb2e2e2ad1f183 Author: Abhijeet Dharmapurikar Date: Fri Jan 22 16:17:12 2010 -0800 GIC: Add callback for mask_ack Add gic_mask_ack for faster processing of interrupts. Change-Id: I1bc93b4ab1559a9fe5a42d45864d87d1ceb11d8e Signed-off-by: Abhijeet Dharmapurikar commit 008416e080c1c9e1d737c45dd4f1c1e8e9fc1d7d Author: Abhijeet Dharmapurikar Date: Thu Jan 28 21:47:19 2010 -0800 GIC: Prevent gic from crossing NR_IRQS Prevent gic code from initializing interrupts beyond NR_IRQS. Change-Id: I1476e560c7023309162a7efa2114f6d156c746f0 Signed-off-by: Abhijeet Dharmapurikar commit 7d81e0451fd436ee7f60ce4e35bba3c252829b4b Author: Steve Muckle Date: Sat Nov 28 13:05:29 2009 -0800 smp: parallel smp boot option Some SMP configurations start all available cores in parallel through the kernel entrypoint, rather than secondary CPUs waiting to be brought out of reset into machine specific startup code. Change-Id: Idbc5b6f9099a916e43a0b00782db7e861457e6a8 Signed-off-by: Steve Muckle commit b36553deada6de5a23e070e5691721fc1ef1bca1 Author: Steve Muckle Date: Sat Nov 28 13:00:13 2009 -0800 msm: initial irq definitions for MSM8X60 IRQ assignments are different for MSM8X60 than other existing MSMs. Change-Id: I8c20dcd0de065447ae75e86d6ad8f9c543dbfe2a Signed-off-by: Steve Muckle commit d8a928966df22f9393016fbb8c386c87b91f1d4f Author: Steve Muckle Date: Wed Jan 6 14:55:24 2010 -0800 msm: io: MSM8X60 io support MSM8X60 has different IO mappings than previous MSMs. Change-Id: I28113f01658a71c48ef36e88946e08092bdc43ac Signed-off-by: Steve Muckle commit a1bb65af1763fd4ef429e5fc22a0e63eb26c554f Author: Abhijeet Dharmapurikar Date: Thu Jan 14 15:32:01 2010 -0800 GIC: Disable unused interrupts Disable all interrupts of a gic in distributor initialization function. This way interrupts beyond NR_IRQS stay disabled. Change-Id: I3430ddae1b60f06f341ac7082b7c556231043032 Signed-off-by: Abhijeet Dharmapurikar commit 16215d53719a90a38ca3e73792a16040165d7712 Author: Steve Muckle Date: Wed Jan 6 14:16:42 2010 -0800 mm: do not set missing flags on ScorpionMP ScorpionMP does not have the SMP/nAMP mode and TLB ops broadcasting bits in the ACTLR. Change-Id: I997067c6cc1ab2bcceda9fb8cc291c5af0a4badd Signed-off-by: Steve Muckle commit b0106f5ae4149d02d81d1b4f65e17747b61f1f4d Author: Steve Muckle Date: Tue Jan 5 15:07:26 2010 -0800 macros for wfe, sev instructions The wait for event and send event instructions may be called from C code such as boot or power management routines. Change-Id: Ib07ccf244d1b37c38f5279cf5d9227bcd4858b27 Signed-off-by: Steve Muckle commit 3016081973e34ee7171cf6c2e6bf8f8ded51e590 Author: Steve Muckle Date: Tue Jan 5 15:01:38 2010 -0800 msm: add MSM8X60 architecture The MSM8X60 architecture is based on ScorpionMP, an ARMv7 SMP implementation. Change-Id: I90720872e49694f5492a286b44711e5b58e90ac7 Signed-off-by: Steve Muckle commit 500fcbec53b33971728e13c3f524cde4433f9cb4 Author: Gopikrishnaiah Anandan Date: Mon Apr 19 20:10:12 2010 -0700 msm: video: Axi flow id upgrade for video core. Change-Id: Ie324bd8d6bf475bbdc84bdd61d7e34ae6af7be95 Signed-off-by: Gopikrishnaiah Anandan commit 12c397d6dc1aae15217c707c47711c682354b481 Author: Ravishangar Kalyanam Date: Mon Apr 19 17:30:41 2010 -0700 msm: video: Fix to release driver transaction entries Fix to release Core driver transaction entries during the closure of each client context. Change-Id: I0b11c65d06430d5699cee85a3b52b79987831fbc CRs-Fixed: 235024 Signed-off-by: Ravishangar Kalyanam commit 480ea275b012094c98e981fb8e5b22051df1f59d Merge: 2f5f9c4 b359756 Author: Trilok Soni Date: Mon Apr 19 14:30:44 2010 -0700 Merge "rtc: Kconfig: Enable secure time, disable 7X00 RTC config" into android-msm-2.6.32 commit 2f5f9c4536dad09490772bd8aca75ae34cf67de8 Merge: 1b56a4c 0ef391a Author: Bryan Huntsman Date: Mon Apr 19 13:42:01 2010 -0700 Merge "msm: video: Enable MFC clock scaling in Decoder" into android-msm-2.6.32 commit 1b56a4cf5d3e1f8460d26f877bd6333540ec8a44 Merge: 7adc8a8 5c55874 Author: Bryan Huntsman Date: Mon Apr 19 13:41:47 2010 -0700 Merge "msm: audio: 7x30: Update concurrency table with low-power mode" into android-msm-2.6.32 commit 7adc8a8032d38d9cf81bff397835b4176865ff91 Merge: 6d70544 2a55d3c Author: Bryan Huntsman Date: Mon Apr 19 13:41:30 2010 -0700 Merge "msm_fb: Remove obsolete/unused suspend_late and resume_early pointers." into android-msm-2.6.32 commit 6d705449faaf4b74cd399de48fd1c8e7b41dba42 Merge: efd5829 b561cb2 Author: Bryan Huntsman Date: Mon Apr 19 13:41:13 2010 -0700 Merge "msm_fb: display: move declaration of mdp4_stat to mdp4_util.c" into android-msm-2.6.32 commit efd582943602ad0db7996bd39ca56f1de073f962 Merge: 3b34ee4 ca87db1 Author: Bryan Huntsman Date: Mon Apr 19 13:40:59 2010 -0700 Merge "defconfig: enable Bluetooth drivers" into android-msm-2.6.32 commit b3597569066a2514b320598de63a802afb2b22f0 Author: Anirudh Ghayal Date: Fri Apr 16 10:48:08 2010 -0700 rtc: Kconfig: Enable secure time, disable 7X00 RTC config Enables the secure time support for all the Qualcomm chipsets. Disables RTC_DRV_MSM7X00A config, as Qualcomm chipsets use RTC_DRV_MSM (rtc-msm) driver. Change-Id: I7c81038938aa7500a6ac9e47e3321ef309686dae Signed-off-by: Anirudh Ghayal commit d8829fbd3149fb8e91825566024a52d241da048f Author: Shalabh Jain Date: Mon Apr 19 10:38:30 2010 -0700 diag: Print the buffer after completion call back DIAG receives data from USB and for debugging purposes, we print the buffer received. This printing has to be done once the read process is completed. Moving the print after completion callback. Signed-off-by: Shalabh Jain commit 5c55874d8594ba97aeb0be83f11bb0e885a83317 Author: Swaminathan Sathappan Date: Tue Apr 13 20:02:21 2010 -0700 msm: audio: 7x30: Update concurrency table with low-power mode Update concurrency table with low-power audio mode; Update mode identifiers for low power audio Change-Id: If5039942cd420abf15f2025e63aab0d3021bd6e4 Signed-off-by: Swaminathan Sathappan commit 6aa1c32017db1adbed0ffc0bf13eee82d16963df Author: Helen Zeng Date: Wed Apr 14 16:13:12 2010 -0700 msm: audio: qdsp5v2: Call wake_lock before disabling AFE To speed up device switch, add wake_lock to prevent power collapse when disabling and enabling devices. In function snddev_icodec_close_tx, wake_lock is put in the wrong sequence. Now correct it and call wake_lock before running afe_disable. Change-Id: Icbaa17cc9adca157d0b0b338a64b197dc5f059ee Signed-off-by: Helen Zeng commit 2a55d3cd03a7f7b4903e50715cce1d47aba164d4 Author: Matt Wagantall Date: Wed Apr 14 14:21:58 2010 -0700 msm_fb: Remove obsolete/unused suspend_late and resume_early pointers. These platform_driver fields are not supported in the current kernel. Since they were unused, they are safe to remove. This fixes a dtv driver compilation failure. Change-Id: I4de385373ac0eca680322fd0fb9799ea29719dce Signed-off-by: Matt Wagantall commit 3b34ee4c758742e078b571f2bd5019d0b481aa5f Merge: ddd3ec3 69f5868 Author: Trilok Soni Date: Mon Apr 19 06:06:13 2010 -0700 Merge "led: Bring in PMIC LED driver" into android-msm-2.6.32 commit ca87db1edc9811c67f4334cffb90402f146e4771 Author: Sankalp Bose Date: Fri Apr 16 12:36:15 2010 +0530 defconfig: enable Bluetooth drivers Enables Bluetooth drivers for QSD and MSM boards. Change-Id: I4499d9fec041a087d0b6f2945faf14aa6dc7c3f7 Signed-off-by: Matthew Wilson Signed-off-by: Sankalp Bose commit efb41872d62cbc77407a2824f373feba965281bf Author: Dima Zavin Date: Wed Feb 10 15:42:03 2010 -0800 mtd: msm_nand: Convert all NAND_ defines to MSM_NAND_ Needed to prevent collisions with defines in Change-Id: I2c82b6517947b65a5750752fe173c43d888a42e9 Signed-off-by: Dima Zavin [mnalajal@qualcomm.com: Modified OneNAND defines too] Signed-off-by: Murali Nalajala commit ddd3ec361f7f0557dbc7e1af0a70a407fe9085eb Merge: a97a47e 7eeac32 Author: Trilok Soni Date: Mon Apr 19 04:38:34 2010 -0700 Merge "msm: msm_sdcc: Do not check for DATA_BLK_END bit to exit the SDCC ISR." into android-msm-2.6.32 commit a97a47ea19eb00eaa2b599887d12a20bec09d009 Merge: 56bb381 9ab9a10 Author: Trilok Soni Date: Mon Apr 19 03:41:14 2010 -0700 Merge "bluetooth: export interfaces for sleep" into android-msm-2.6.32 commit 56bb381359872defc29f78db141c67676fb65b76 Merge: 03110a7 23cf2d9 Author: Trilok Soni Date: Mon Apr 19 03:40:38 2010 -0700 Merge "mfd: Bring in tps65023 PMIC driver" into android-msm-2.6.32 commit 7eeac328c0e7234cab04b22f4b5c7a9dcc67adfb Author: Aparna Mallavarapu Date: Mon Apr 19 15:25:33 2010 +0530 msm: msm_sdcc: Do not check for DATA_BLK_END bit to exit the SDCC ISR. In the SDCC ISR, when checking for the bits set in MCI_STATUS register look for only those bits that correspond to interrupts enabled through MCI_INT_MASK0 register. Interrupts on DATA_BLK_END are not enabled and this bit should not prevent the control to exit from the SDCC ISR. If this is not ensured, the control gets stuck in the ISR for longer time till the DATA_END event occurs, until when, the DATA_BLK_END bit keeps getting set for every data block that is transmitted. Change-Id: Ic02e3b23af951cb8e5ace0231b26e2692f3d3274 Signed-off-by: Murali Palnati Signed-off-by: Aparna Mallavarapu commit 03110a73dccb808c4c974e39f8be6211ca79912b Merge: e80fa94 810cd56 Author: Trilok Soni Date: Mon Apr 19 02:52:12 2010 -0700 Merge "msm_fb: Changed mddi driver prism clock rate" into android-msm-2.6.32 commit 4f2e68767d1f43544e5b2a586c5150880e42ca62 Author: Santosh Mardi Date: Fri Apr 16 18:23:12 2010 +0530 msm: audio: qdsp5v2: Interpret DTX config option properly DTX config option were not in sync between kernel space and user space, Interpret value 1 from user space as DTX enable and 0 as disable Change-Id: Ia3ea5e960d0400bbe5540167560af2ba64504170 Signed-off-by: Santosh Mardi commit e80fa943d6aba79406c5793c84c5afa076a84e0c Author: Murali Nalajala Date: Fri Apr 16 20:56:24 2010 +0530 msm-nand: Enable interleave mode based on modem build ID. Add build id detection to enable the interleave mode feature in the driver. In the interleave mode image ( boot, userdata etc ) codewords are written to the NAND devices in a interleave fashion. Hence modem and apps should operate in the same mode to read/write the images properly. Change-Id: Ie9182eadd5750662dde07abfe793b4d231cf0ae1 Signed-off-by: Murali Nalajala commit 1934a6740e2ca2c630e1fae1ab8098b6f88cbb15 Author: Patrick Lai Date: Fri Apr 9 15:13:42 2010 -0700 msm: audio: qdsp5v2: Update sample rate of all icodec Tx devices Voice driver already polls to have icodec Tx devices clocked at 48Khz during voice call. Once DSP supports resampler on the recording path, it is advisable to default all icodec Tx devices to 48KHz. So, no run-time sample rate reconfiguration of audio hardware can happen when transition from off-call recording state to in-call recording state. This change makes sure no glitch in the recording due to run-time sample rate reconfiguration Change-Id: I4c59410f174e9d8751cbabd586f87c8bcc133a92 Signed-off-by: Patrick Lai commit aca4f20f98ec22114dcf96a49467549bd510d0b8 Merge: d790e28 9a208fc Author: Bryan Huntsman Date: Sun Apr 18 01:24:51 2010 -0700 Merge "msm: usb: Rate limit debug messages" into android-msm-2.6.32 commit d790e28aafc178a1653b290ef41b58b5852d6b07 Merge: 461b647 e03bf07 Author: Bryan Huntsman Date: Sat Apr 17 15:04:50 2010 -0700 Merge "msm_fb: Use 'MDP_DTV_720P_2BPP' System Bus Flow ID for tvenc." into android-msm-2.6.32 commit 461b6471277bf2e488dd39c56c30d247a16a15b7 Merge: 5ce3b4f 37f71f3 Author: Bryan Huntsman Date: Sat Apr 17 15:04:38 2010 -0700 Merge "defconfig: 7x30: Use NPA to manage System Bus (AXI) performance requests." into android-msm-2.6.32 commit 5ce3b4f5bbd35f087dd46530a68293081cd11ef8 Merge: 1c73b16 d93d221 Author: Bryan Huntsman Date: Sat Apr 17 15:04:16 2010 -0700 Merge "msm: audio: 7x30: implement device volume for FM." into android-msm-2.6.32 commit 1c73b16b9c6db30ba84029fefe34e0060a860c7c Merge: 6e3ed40 feb9c4f Author: Bryan Huntsman Date: Sat Apr 17 15:03:00 2010 -0700 Merge "msm: board-msm7x30: Decrease the audio pmem size as per current usage" into android-msm-2.6.32 commit 6e3ed40945bc1e19e1c55965c4c108a9ba8a38b3 Merge: 1f8d8a4 32293b4 Author: Shyam Sundar Date: Sat Apr 17 13:38:38 2010 -0700 Merge "defconfig: Enable FB early suspend" into android-msm-2.6.32 commit 1f8d8a4c04803047b5467db5e49228f31f161f58 Merge: 47a7a0a 4b69f68 Author: Shyam Sundar Date: Sat Apr 17 13:18:55 2010 -0700 Merge "usb: gadget: Increase Tx/Rx buffers in serial driver" into android-msm-2.6.32 commit 47a7a0a841a907e1afd845a2104b4f0e687e8cc6 Merge: c93e7a3 5aefea2 Author: Shyam Sundar Date: Sat Apr 17 13:18:45 2010 -0700 Merge "usb: msm_gadget: add workaround for endpoint prime failure" into android-msm-2.6.32 commit c93e7a35fb57bec3f3130536df4848046ad6d91a Merge: 7ce1e1d d0cdba6 Author: Shyam Sundar Date: Sat Apr 17 13:18:32 2010 -0700 Merge "usb: msm_gadget: prevent accessing dTDs while endpoint prime" into android-msm-2.6.32 commit feb9c4fdc9fe674efe23c316b79a47818e906051 Author: Sriranjan Srikantam Date: Mon Apr 12 14:37:45 2010 +0530 msm: board-msm7x30: Decrease the audio pmem size as per current usage The audio pmem size allocation in board file is higher than the current usage. The pmem size should be equivalent to size required for four mp3 session as we are supporting four concurrent audio sessions at a time. one MP3 session requires 372736 bytes. Update audio pmem size in board file to reflect the size required for four concurrent sessions Change-Id: I68c896a8c7bda32a22530b33664b0818036179d0 Signed-off-by: Sriranjan Srikantam commit 37f71f38ded27e45ec497744bd28bc5e7bc755a0 Author: Matt Wagantall Date: Thu Apr 15 11:21:48 2010 -0700 defconfig: 7x30: Use NPA to manage System Bus (AXI) performance requests. Change-Id: I72af54f21064a7b5d6fab92a72be0226db03e533 Signed-off-by: Matt Wagantall commit 7ce1e1dd439a41953629f1ea2ad864ee54677850 Merge: daefc06 73fc181 Author: David Brown Date: Fri Apr 16 15:24:11 2010 -0700 Merge "pmem: Replaced all printk with pr_* macros" into android-msm-2.6.32 commit daefc06f9119b7b92d6770874dde7e12630dfc89 Merge: fb1a1f5 9279212 Author: David Brown Date: Fri Apr 16 15:23:58 2010 -0700 Merge "msm: 7x30: Enable Marimba PTA lines for BT/WLAN Coexistence" into android-msm-2.6.32 commit fb1a1f57a3ac1981c426924faedf5558e29946a8 Merge: c7ee3d6 46c0a8b Author: David Brown Date: Fri Apr 16 15:23:49 2010 -0700 Merge "bluetooth: Add outgoing write notifications to HCI layer" into android-msm-2.6.32 commit c7ee3d60f579022da60f36acd7c10caf7e506a17 Merge: a07389e 4a53c99 Author: David Brown Date: Fri Apr 16 15:23:42 2010 -0700 Merge "msm: video: Add STOP_READ_MSG ioctl support in Encoder" into android-msm-2.6.32 commit a07389e548d002dc56b85054738753e76a21dd33 Merge: 9161122 53e07c6 Author: David Brown Date: Fri Apr 16 15:23:29 2010 -0700 Merge "msm: Add new proc comm commands." into android-msm-2.6.32 commit 91611225f0bdfafa6da359c08fe6345209d5876c Merge: c106966 b58b923 Author: David Brown Date: Fri Apr 16 15:23:21 2010 -0700 Merge "misc: pmic8058-pwm: reorganize code to support lookup table (LUT)" into android-msm-2.6.32 commit 32293b48b8f9362082df2ae2e5f63aca0758fe38 Author: Omprakash Dhyade c_odhyad@quicinc.com Date: Fri Apr 16 14:43:41 2010 -0700 defconfig: Enable FB early suspend For 7x30 suspend resume causes LCD updates to be slow Enable FB early suspend for the same. We also disable console early suspend. Change-Id: I1993776256da455f3784d7d7ed6d2cf1e4576344 CRs-fixed: 233013,233512 Signed-off-by: Omprakash Dhyade commit c106966cbfdf303892e61875e63e9d650db191ac Merge: cb24592 520bd0e Author: David Brown Date: Fri Apr 16 14:20:45 2010 -0700 Merge "msm: audio: Kernel configuration option for debug messages" into android-msm-2.6.32 commit cb2459290850c8e742023e14911eca91f04bbf9d Merge: d06295f 8b1b458 Author: David Brown Date: Fri Apr 16 13:43:20 2010 -0700 Merge "defconfig: Update MMC config options" into android-msm-2.6.32 commit d93d221bbfc0e65533b7d7577cb6629ae2b5b508 Author: Kiran Kandi Date: Fri Feb 26 02:28:52 2010 -0800 msm: audio: 7x30: implement device volume for FM. For low power audio FM stream does not come to 7x30 chip set. It directly goes from FM chip to marimba codec. So implement volume control in marimba codec. Change-Id: Id793e231a01aaf8e19f0c612f3bcf811597ba3ea Signed-off-by: Kiran Kandi commit 0ef391ade2bd899d3b543500b96c5addedd26399 Author: Ravishangar Kalyanam Date: Fri Apr 16 13:01:23 2010 -0700 msm: video: Enable MFC clock scaling in Decoder Enable MFC clock scaling in Core Decoder based on frame resolution and frame rate Change-Id: Id09924979fd6ce951ab98ab13e4c7ab251411cff Signed-off-by: Ravishangar Kalyanam commit 4b69f68c0ca876561c67f622d9a92b6cd52e149f Author: Anji Jonnala Date: Fri Apr 16 19:46:53 2010 +0530 usb: gadget: Increase Tx/Rx buffers in serial driver Increases Tx/Rx buffers to 8x4k inorder to pump more data to userspace. Change-Id: I8d7bf16ab7a0058f001b58b140afd33481bec618 Signed-off-by: Anji Jonnala commit 5aefea27499a0576c7459ce5a97a41c7ae464235 Author: Anji Jonnala Date: Fri Apr 16 19:46:11 2010 +0530 usb: msm_gadget: add workaround for endpoint prime failure Endpoint bit in ENDPTPRIME is cleared and corresponding bit in ENDPTSTAT is set upon successful priming operation. Check for priming status in a definitive loop and try priming the endpoint again for 5 times to workaround hardware issues. Change-Id: I05c9e118dec7dd9b3609ad599979c7ef331d3c97 Signed-off-by: Anji Jonnala commit d0cdba65b78ce04c03af00dad0abe9f5dcbf77fe Author: Anji Jonnala Date: Fri Apr 16 19:45:33 2010 +0530 usb: msm_gadget: prevent accessing dTDs while endpoint prime HW access retired dTD one more time after the completion interrupt. Hence prepare dTDs for all queued requests after endpoint is unprimed rather than modifying retired dTD for next transfer right after completion interrupt. Save one dmb() call by checking request live status before checking dTD info to exit from IOC handling. Change-Id: Ib7312b92cb7190d6164d93121a78e338b151c1d7 Signed-off-by: Anji Jonnala commit 810cd56027af814af8b9d57f53f6c3a26cb2c5c0 Author: Neeraj Kumar Date: Wed Apr 7 14:07:37 2010 -0700 msm_fb: Changed mddi driver prism clock rate Changed the clock frequency to 288 MHz to avoid tearing on camcorder preview with MDP 3.1. Change-Id: Iacc8c6c2dfa3b14d36f51020c12dccf513cc6405 CRs-fixed: 226466 Signed-off-by: Neeraj Kumar commit e03bf07732a49c905d70fc084f1cc9a08149592c Author: Matt Wagantall Date: Fri Apr 16 10:21:24 2010 -0700 msm_fb: Use 'MDP_DTV_720P_2BPP' System Bus Flow ID for tvenc. Current modems images do not support the TVENC NPA Flow ID. Until they do, use the functionally equivalent DTV Flow ID. Change-Id: I112c152aebdf2dc6ed159e1fdf07f4f202df9663 Signed-off-by: Matt Wagantall commit 92792124b9dfe302a411aae83a6a2cb1032d4129 Author: Tim Monahan-Mitchell Date: Wed Apr 14 15:24:33 2010 -0500 msm: 7x30: Enable Marimba PTA lines for BT/WLAN Coexistence BT/WLAN coexistence operation needs PTA timing signals to work. This turns on the required Marimba PTA outputs for the WCN1312. Change-Id: I28d137c3e64a79377a62fa12116e2d2eb2fc7440 CRs-fixed: 232775 Signed-off-by: Tim Monahan-Mitchell commit b561cb23ed5d2c7c697e9df1b34c834035ccfb68 Author: Kuogee Hsieh Date: Fri Apr 16 09:46:32 2010 -0700 msm_fb: display: move declaration of mdp4_stat to mdp4_util.c Move declaration of mdp4_stat to mdp4_util.c to fix compile error when CONFIG_FB_MSM_OVERLAY undefined. Change-Id: Ib99b2c593f0714554794d51bce289982f5bf7ca4 Signed-off-by: Kuogee Hsieh commit 73fc181a232ace4dea4d4f58fd38cca102597c0a Author: Derek Kulinski Date: Fri Apr 9 13:02:38 2010 -0700 pmem: Replaced all printk with pr_* macros Made use of pr_* macros, and reclassified level for successful memory allocation message. Change-Id: I446c03d995cf716f0ef05d71d1d3403ce38529b2 Signed-off-by: Derek Kulinski commit d06295fe2fd49491fd2b9a5b7f76602dffe36957 Merge: 7411aa0 94ba610 Author: Trilok Soni Date: Fri Apr 16 09:09:00 2010 -0700 Merge "msm: Update license in mkrpcsym.pl." into android-msm-2.6.32 commit 7411aa0c174c46796987f12e103f4fd759246249 Merge: 8357009 f38dc60 Author: Trilok Soni Date: Fri Apr 16 09:08:40 2010 -0700 Merge "msm: video: Fix in Core scheduler for managing current O tokens" into android-msm-2.6.32 commit 8357009f9f1dd8ef853049b516181b8c85119864 Merge: 9245f2a 9405add Author: Trilok Soni Date: Fri Apr 16 09:08:24 2010 -0700 Merge "spi_qsd: Move global input_fifo_size to device context." into android-msm-2.6.32 commit 9245f2a740d32a8a4efeece4b8a7900f5abef09c Merge: 2b4503a 5bffb44 Author: Trilok Soni Date: Fri Apr 16 09:08:11 2010 -0700 Merge "msm: timers: Use "shift" variable from msm clock" into android-msm-2.6.32 commit 2b4503aa985d66b96e362ef5517e6f82a415e4a4 Merge: d4d6ccba bc2efbc Author: Trilok Soni Date: Fri Apr 16 09:07:11 2010 -0700 Merge "msm: acpuclock-7x30: Correct PMIC data used for voltage scaling." into android-msm-2.6.32 commit d4d6ccbaf04318475f93027cb11e370248d5c0bd Merge: 8d326f0 9320011 Author: Trilok Soni Date: Fri Apr 16 09:06:47 2010 -0700 Merge "msm_fb: Add NPA Flow ID for System Bus (AXI) performance voting." into android-msm-2.6.32 commit 8d326f052881810b13a9d8202ca1207cd10a8b09 Merge: f1f29a8 d6650a9 Author: Trilok Soni Date: Fri Apr 16 09:06:33 2010 -0700 Merge "msm_reqs: Add 'MSM_AXI_FLOW_MDP_TVENC_720P_2BPP' NPA Flow ID." into android-msm-2.6.32 commit f1f29a8da205602527f799539fe37fb31178ed83 Merge: 8fa9d95 c302616 Author: Trilok Soni Date: Fri Apr 16 09:05:21 2010 -0700 Merge "msm: msm72k_udc: Rate limit debug messages" into android-msm-2.6.32 commit 8fa9d951ce71e85593cd104d34efa8355f3803c3 Merge: ff795a0 0c310aa Author: Trilok Soni Date: Fri Apr 16 09:04:45 2010 -0700 Merge "msm_fb: Changed IOCTL blit at width or height of 1" into android-msm-2.6.32 commit 8b1b4584d627952f06117845e25a44d926e79ff3 Author: Sahitya Tummala Date: Fri Apr 16 14:46:33 2010 +0530 defconfig: Update MMC config options 1. MMC_PARANOID_SD_INIT helps workaround detection issues with buggy SD cards or hardware issues. If it is defined, then the card detection process for SD cards will be tried for few more times for any error during card initialization/resume. 2. MMC_BLOCK_BOUNCE should be defined only if the host can't use scatter- gather buffers for DMA data transfer. If it is defined, then the MMC core will use a single bounce buffer only if host's max number of h/w segments is 1. Qualcomm SDCC supports h/w segments upto 32 and is capable of using scatter-gather buffers. Hence, disable this feature. Change-Id: I77e9274ab14132cad83c923de00b3b50a1f41004 Signed-off-by: Sahitya Tummala commit ff795a0979f9d81ae2240de52383b097d61f9af2 Merge: 0338d19 916ba3e Author: Asish Bhattacharya Date: Fri Apr 16 02:14:34 2010 -0700 Merge "input: msm_ts: Add suspend resume callbacks" into android-msm-2.6.32 commit 9ab9a105881e2ab3352149b607d42a41edc31f1a Author: Sankalp Bose Date: Fri Apr 16 12:03:26 2010 +0530 bluetooth: export interfaces for sleep Bluetooth sleep driver needs these interfaces to determine idle state. Change-Id: Ic52472e799f9d841a909386c137be08ea590e659 Signed-off-by: Sankalp Bose commit 46c0a8ba5d3eb1d96da4883ef33751ec9f6fbaff Author: Sankalp Bose Date: Fri Apr 16 11:58:33 2010 +0530 bluetooth: Add outgoing write notifications to HCI layer Change-Id: I5bec494daa14ffbd61414d7f7df15bc7e0aa0cc5 Signed-off-by: Sankalp Bose commit 0338d193512eff0daeb914e1601166da740de1fa Author: Chandan Uddaraju Date: Fri Apr 9 19:14:25 2010 -0700 msm: board-msm7x30: Update Shared memory base address. With the new memory map changes, shared memory base address is moved from 0x03700000 to 0x00100000. Change-Id: Ibfa089fe758b2a0c7d56a157ff1c28111042c974 Signed-off-by: Chandan Uddaraju commit e9c19678861ceee3be0c9e4466a2c6a16641f2e2 Merge: c83b2a0 7628fd0 Author: Asish Bhattacharya Date: Thu Apr 15 22:18:41 2010 -0700 Merge "msm: audio: 7x30: only turn on s4 regulator." into android-msm-2.6.32 commit c83b2a0eba5e46a277b25303678b8b81eddb78a4 Merge: ee233c1 347cfce Author: Asish Bhattacharya Date: Thu Apr 15 22:18:23 2010 -0700 Merge "msm: audio: qdsp5v2: Update speaker tx and rx codec gains" into android-msm-2.6.32 commit 7628fd0986a72ff669a73df36a40560a04d3724a Author: Kiran Kandi Date: Tue Mar 16 21:41:44 2010 -0700 msm: audio: 7x30: only turn on s4 regulator. For marimba codec to work regulators gp16, s2 and s4 needs to be turned on. gp16 and s2 are enabled during machine initialization. So only control s4 regulator. CRs-Fixed: 231019 Change-Id: I64aad3f1852a67579e58052812828f90bb344500 Signed-off-by: Kiran Kandi commit f38dc60440c6755b72523ce6c5d3b109b9f2799b Author: Ravishangar Kalyanam Date: Thu Apr 15 17:22:46 2010 -0700 msm: video: Fix in Core scheduler for managing current O tokens Fix added in Core driver's scheduler for managing current O tokens. Scheduler now handles the O tokens without resulting in hang. CRs-Fixed: 234716 Change-Id: I0b506678abe43754c3297a47544d0569484555e7 Signed-off-by: Ravishangar Kalyanam commit c30261679f574b2c43459fe0cc8ece655f1a169e Author: Derek Kulinski Date: Thu Apr 8 13:55:52 2010 -0700 msm: msm72k_udc: Rate limit debug messages Reclassified some info messages to debug level, made use of dev_* macros. Change-Id: Id145936cbb8e55e6d21334a13ffc051f630a6387 Signed-off-by: Derek Kulinski commit ee233c14487a0ab2ad4cbbbb39cb21fe696d2892 Merge: 8a96166 c3a1d33 Author: Bryan Huntsman Date: Thu Apr 15 15:46:00 2010 -0700 Merge "msm_kgsl: Add NPA Flow IDs for System Bus (AXI) performance voting." into android-msm-2.6.32 commit 8a96166d043eea6bb9727996517700b2be70b733 Merge: a3a4158 7d6326e Author: Bryan Huntsman Date: Thu Apr 15 15:45:47 2010 -0700 Merge "defconfig: automatic update" into android-msm-2.6.32 commit 9405adda67d8c6a856243e599f09d806b4bc6de5 Author: Kenneth Heitke Date: Thu Apr 15 16:33:16 2010 -0600 spi_qsd: Move global input_fifo_size to device context. Fix reference to device data input_fifo_size which is missing from the previous patch. Change-Id: Ia469896edd0fd90d7ded2b8ec44f9075474b3ec8 Signed-off-by: Kenneth Heitke commit 347cfcee71472dc9e5a8f55a058bced3cec0d1c4 Author: Helen Zeng Date: Mon Apr 12 17:12:51 2010 -0700 msm: audio: qdsp5v2: Update speaker tx and rx codec gains Based on the calibration requirement, set all speaker rx left and right channel gains to 3DB and set speaker tx left channel gain to 8DB Change-Id: I5d2743267f1869a12fc7cbff1b9234e232403bac Signed-off-by: Helen Zeng commit 916ba3ea422038afa7179c10915430e59cd6c42d Author: Trilok Soni Date: Thu Apr 15 18:32:29 2010 +0530 input: msm_ts: Add suspend resume callbacks Add suspend resume callbacks for PM functionality and disable/enable the sample and pen_up irq while going into suspend/resume sequence. Change-Id: Ie31895070445125af3dbaf1848b7b24e0835aef4 Signed-off-by: Trilok Soni commit 53e07c63b5cd041d67e96cd9820b5169a78cea12 Author: Vishwanathapura, Niranjana Date: Thu Apr 15 12:46:19 2010 -0600 msm: Add new proc comm commands. Add following proc comm commands. PCOM_CLKCTL_RPC_SRC_REQUEST PCOM_NPA_INIT PCOM_NPA_ISSUE_REQUIRED_REQUEST Change-Id: Ibe4690c9e91b5866169a79e9e2a1cd9530fbb421 Signed-off-by: Niranjana Vishwanathapura commit 4a53c997b442f7c404982c5f283d761fe3f6466a Author: Ravishangar Kalyanam Date: Wed Apr 14 19:18:54 2010 -0700 msm: video: Add STOP_READ_MSG ioctl support in Encoder Add STOP_READ_MSG ioctl support in Encoder to release the synchronous READ_NEXT_MSG ioctl call during exit. Change-Id: I8038493c0384b6b7849363e1163bf2a313ad2830 Signed-off-by: Ravishangar Kalyanam commit bc2efbc660e1bc069231aa9f17c26fc6eab58758 Author: Matt Wagantall Date: Wed Apr 14 10:43:02 2010 -0700 msm: acpuclock-7x30: Correct PMIC data used for voltage scaling. The buck regulator "enable" and "pulldown enable" bits of the PMIC data should not be considered part of the "VREF_SEL" field. Fix this and update the PMIC data mask accordingly. Also, update the voltage formula to support both 0.625V and 0.3125V references. This fixes detecting successful voltage changes as failures, which prevented ACPU frequency increases. Change-Id: Ic7aa8247f7c223dd9f955b54853f7b1ed05e7383 Signed-off-by: Matt Wagantall commit c3a1d335e4d1c2d30764054a9262580237a9edc8 Author: Matt Wagantall Date: Mon Apr 12 10:34:40 2010 -0700 msm_kgsl: Add NPA Flow IDs for System Bus (AXI) performance voting. pm_qos system_bus requests expect NPA Flow ID values instead of KHz values when MSM_NPA_REMOTE_SYSTEM_BUS Kconfig is enabled. Use the 'MSM_AXI_FLOW_3D_GPU_HIGH' flow for 3D core requests and 'MSM_AXI_FLOW_2D_GPU_HIGH' for 2D core requests when MSM_NPA_REMOTE_SYSTEM_BUS is enabled. Change-Id: I48a48d528c407382b6d35f70b9799b6b92cf98e3 Signed-off-by: Matt Wagantall commit 5bffb449e7f512b67aa5fea489312118584150e9 Author: Maheshkumar Sivasubramanian Date: Wed Apr 14 13:21:06 2010 -0600 msm: timers: Use "shift" variable from msm clock The interface to convert a clock to nano seconds was made more generic, in that process the variable "shift" in the clocksource structure used instead of the "shift" variable in parent clock structure. This caused a zero timeout value for power cycles and prevented the systm from entering a power saver mode. Change-Id: I6eaa26e723d0316a731d5287513a93c586bf5e61 Signed-off-by: Maheshkumar Sivasubramanian commit a3a4158bfc77526f6effa3a251b4697685bd56d1 Author: Vishwanathapura, Niranjana Date: Tue Apr 6 21:25:32 2010 -0600 msm: Add ping_apps server driver Ping APPS server is a test RPC server in linux kernel. This test server helps in testing RPC server infrastructure module in kernel. Change-Id: Ie69fff558cef27a4b499e73778eeb9914e3a9dbe Signed-off-by: Niranjana Vishwanathapura commit 94ba610af6a4ed7abbc227f64bf45b253619b41d Author: David Brown Date: Wed Apr 14 15:55:00 2010 -0700 msm: Update license in mkrpcsym.pl. Use simpler license on symbol generation script. The output of this script contains no copyrightable work, so remove the license on the generated file. Change-Id: I5e5fc4e5cd314822c5ad7c11eee23f9c Signed-off-by: David Brown commit 7d6326e8fe3409fad1e97be5ed305f3613d9dfb5 Author: David Brown Date: Thu Apr 15 09:16:35 2010 -0700 defconfig: automatic update Signed-off-by: David Brown commit 9a208fc6844c28e6be147ddfc352b839c732d6fb Author: Derek Kulinski Date: Thu Apr 8 13:49:15 2010 -0700 msm: usb: Rate limit debug messages Reclassified some info messages to debug level and changed printk to pr_* macros. Change-Id: Ia99f98f883cac766b046345a5ab3110ec29834de Signed-off-by: Derek Kulinski commit 0c3c913bff1ab3a6cf2144de9546f250d04df4ad Merge: d293c85 c285cd3 Author: Asish Bhattacharya Date: Thu Apr 15 07:09:31 2010 -0700 Merge "[ARM] msm: kgsl: bug if we detect a gpu hang" into android-msm-2.6.32 commit d293c85a8232a2d5cd4cc165642e14b2f6158e0c Merge: 79efea9 0f4d212 Author: Asish Bhattacharya Date: Thu Apr 15 07:06:14 2010 -0700 Merge "msm: audio: 8x50: Add Fluence device support" into android-msm-2.6.32 commit 79efea98522583feb9300344309cec2594eeb4b6 Merge: fb7f254 f1a9ced Author: Asish Bhattacharya Date: Thu Apr 15 07:05:33 2010 -0700 Merge "msm: audio: 8x50: Support user configurable buffer size" into android-msm-2.6.32 commit fb7f254f1f709455282f48d947f1a1c5559ced2b Merge: c5226d3 7f46e2c Author: Asish Bhattacharya Date: Thu Apr 15 07:05:15 2010 -0700 Merge "Bluetooth: Synchronize SCO/eSCO connection requests to ACL state" into android-msm-2.6.32 commit c5226d3523b3c693957ee316664366db9ac8c826 Merge: 40c2194 798f563 Author: Asish Bhattacharya Date: Thu Apr 15 07:04:38 2010 -0700 Merge "msm: audio: qdsp5v2: Prevent buzzing sound in Bluetooth device at call end." into android-msm-2.6.32 commit 40c21942b52351d8e9eadb2615c19f597a6d2bc6 Merge: 28e2133 f4c4118 Author: Asish Bhattacharya Date: Thu Apr 15 07:04:18 2010 -0700 Merge "usb: gadget: Rate limit debug messages" into android-msm-2.6.32 commit 28e2133a4bb43a795ea467e1f1923fbde44bc63f Merge: 1af3652 ac7bc96 Author: Asish Bhattacharya Date: Thu Apr 15 07:03:52 2010 -0700 Merge "msm: audio: 7x30: Propagate device release pending event to audio decoder client" into android-msm-2.6.32 commit 1af36522795eb91dbc222de49646f0e2769b1ecf Merge: 86b88e9 6807ada Author: Asish Bhattacharya Date: Thu Apr 15 07:03:20 2010 -0700 Merge "msm: msm_pm_qos: Rename 'npa_pm_qos' to 'msm_pm_qos'." into android-msm-2.6.32 commit 86b88e981fad1cdcf1ac61c33a64bad5c805ac36 Merge: bd676a9 ce02e2a Author: Asish Bhattacharya Date: Thu Apr 15 07:02:32 2010 -0700 Merge "radio: tavarua: Regional Settings (FM bands)" into android-msm-2.6.32 commit bd676a905fa64048dd4bd43bef5845b2a7e7a9f2 Merge: 66e4ea7 18371b3 Author: Bryan Huntsman Date: Thu Apr 15 01:08:13 2010 -0700 Merge "gemini: Add NPA Flow ID for System Bus (AXI) performance voting." into android-msm-2.6.32 commit 66e4ea7b666d4f47054092eb1bfeb322a1ef031d Merge: 5f98728 37d8923 Author: Bryan Huntsman Date: Thu Apr 15 01:07:46 2010 -0700 Merge "msm: video: Fix for Encoder Buffer size mismatch error" into android-msm-2.6.32 commit 5f987286c5754a989239d67dcc73d64baa3613a5 Merge: 1ef13aa d5ee18c Author: Bryan Huntsman Date: Thu Apr 15 01:07:35 2010 -0700 Merge "defconfig: msm7630: Disable serial console" into android-msm-2.6.32 commit 1ef13aa07cebd47a55cea71d39bbfbd71b70f1b2 Merge: ac60352 f8b4d31 Author: Bryan Huntsman Date: Thu Apr 15 01:07:24 2010 -0700 Merge "pmem: Enable PMEM tests" into android-msm-2.6.32 commit ac603529213cb24b423aba712d83ae59c84234e2 Merge: 75f1f8b 8730794 Author: Trilok Soni Date: Wed Apr 14 23:03:53 2010 -0700 Merge "mfd: marimba-tsadc: Add TSADC shutdown sequence during suspend" into android-msm-2.6.32 commit 75f1f8bcc9c4aff317ea76abb727bbd018423a90 Merge: b508d30 74d922f Author: Trilok Soni Date: Wed Apr 14 23:03:37 2010 -0700 Merge "mfd: marimba_tsadc: Add vreg vote level" into android-msm-2.6.32 commit b58b92321903af0f8c41bc171618a2b3f10aa7d2 Author: Willie Ruan Date: Sun Apr 11 16:13:41 2010 -0700 misc: pmic8058-pwm: reorganize code to support lookup table (LUT) LUT can support multiple PWM patterns (duty cycles) at configurable time step with pauses at high and low index. This can provide advanced effect on LED, backlight and others. CRs-fixed: 229892 Change-Id: Ie3d89b9a4ba39e45dd1700b6386c62299aac0c09 Signed-off-by: Willie Ruan commit 93200111cc72d87792631b3b70290dfe74181c44 Author: Matt Wagantall Date: Mon Apr 12 13:24:35 2010 -0700 msm_fb: Add NPA Flow ID for System Bus (AXI) performance voting. pm_qos SYSTEM_BUS requests expect NPA 'Flow ID' values instead of KHz values when MSM_NPA_REMOTE_SYSTEM_BUS Kconfig is enabled. Use the 'MSM_AXI_FLOW_MDP_*' flows for requests when MSM_NPA_REMOTE_SYSTEM_BUS is enabled. Change-Id: I4c24d9cba9090afb3ecbc6ed9e0d0ac20a07f646 Signed-off-by: Matt Wagantall commit d6650a9e35f8ddcd85e97b81af638a9f12d57603 Author: Matt Wagantall Date: Wed Apr 14 18:01:33 2010 -0700 msm_reqs: Add 'MSM_AXI_FLOW_MDP_TVENC_720P_2BPP' NPA Flow ID. Change-Id: I780d0f41bffdfcfea19bb628323277bfb8e7e88d Signed-off-by: Matt Wagantall commit 3187a940939eaad63849ff47acda80e4cf9109ad Author: Abhijeet Dharmapurikar Date: Mon Apr 12 10:03:55 2010 -0700 msm_rmnet: allow frames larger than 1514 bytes Enable maximum transmit unit(mtu) value of larger than 1514 on rmnet device. Currently the default (and maximum) mtu value supported is set to 2000 bytes in order to support an imminent customer scenario where they need to send/receive ethernet frames of about 1700 bytes Also override the ethernet change_mtu function in order to allow changing this value to something larger than 1500 by using socket ioctl. CRs-Fixed: 225938 Change-id: I50819c60c1968346e2259f013f82f2d6bd1dda7e Acked-by: Jimi Shah Signed-off-by: Abhijeet Dharmapurikar commit 798f563f1358c1bd0dfedc4c759eb8a0c50dc689 Author: Helen Zeng Date: Mon Apr 12 17:44:39 2010 -0700 msm: audio: qdsp5v2: Prevent buzzing sound in Bluetooth device at call end. Feed silence frames to the Bluetooth device before close to prevent buzzing sound. This fix is applicable only to Marimba Bluetooth. Change-Id: I4935c40412a4bbf02969f8bddf453df599c8d7bd CRs-Fixed: 224761 Signed-off-by: Helen Zeng commit ce02e2a26eda084ac9b411951dfe4db993a1ae9f Author: Mangesh Pardeshi Date: Wed Apr 14 16:53:51 2010 -0700 radio: tavarua: Regional Settings (FM bands) This patch is to fix a problem seen with the Regional Settings configuration for FM bands. Change-Id: Ibf3a9142a2563a07f01eb84afd70bd0511580588 CRs-Fixed: 227442 Signed-off-by: Mangesh Pardeshi commit 520bd0ef0eed12dde467f48e1ececf4bbf1d6b85 Author: Derek Kulinski Date: Wed Apr 14 16:51:13 2010 -0700 msm: audio: Kernel configuration option for debug messages Added kernel configuration option to control debug messages for audio and adsp code. Change-Id: I6734e766460a4cf8979196de5537ed8dd77d7814 Signed-off-by: Derek Kulinski commit 18371b3f06ec6db8d2cacaced048461921b6c0fa Author: Matt Wagantall Date: Mon Apr 12 11:26:28 2010 -0700 gemini: Add NPA Flow ID for System Bus (AXI) performance voting. pm_qos system_bus requests expect NPA Flow ID values instead of KHz values when MSM_NPA_REMOTE_SYSTEM_BUS Kconfig is enabled. Use the 'MSM_AXI_FLOW_JPEG_12MP' flow for requests when MSM_NPA_REMOTE_SYSTEM_BUS is enabled. Change-Id: I137b704674aa4a8a8015bbf69e2e6dc816cba94e Signed-off-by: Matt Wagantall commit 6807ada914ef13d9152a31dd222e6189771b9e3d Author: Matt Wagantall Date: Mon Apr 12 13:51:37 2010 -0700 msm: msm_pm_qos: Rename 'npa_pm_qos' to 'msm_pm_qos'. Change-Id: I136058341f459ab6f468fb7a5330f0c4c89e2af6 Signed-off-by: Matt Wagantall commit 0f4d21204db35e44b19fb8dcc09396750638c418 Author: Ashraya Arya Date: Fri Feb 26 11:22:00 2010 -0800 msm: audio: 8x50: Add Fluence device support Endfire and Broadside TX device support for Handset and Speakerphone. Change-Id: I9d2ecb93743806301e253d74d6fffbd3d8cc6b0c Signed-off-by: Ashraya Arya commit b508d3088193c79457b2d773329ce80c8bef59d8 Merge: 5fb9c68 f810c82 Author: Bryan Huntsman Date: Wed Apr 14 14:13:40 2010 -0700 Merge "msm: audio: qdsp5v2: Reduce the wait delay in marimba profile" into android-msm-2.6.32 commit c285cd3f7c26adb56fa40439f5b3463e98fb4f65 Author: Dima Zavin Date: Wed Apr 7 00:35:04 2010 -0700 [ARM] msm: kgsl: bug if we detect a gpu hang Change-Id: I01c5b9fdabab33cd0a4354e391c5e360e362ee29 Signed-off-by: Dima Zavin Signed-off-by: Michael Bohan commit 37d89238cff95b9b2def3f6b220d2bf4fa308d7c Author: Ravishangar Kalyanam Date: Tue Apr 13 17:20:18 2010 -0700 msm: video: Fix for Encoder Buffer size mismatch error Fix is added for Encoder Buffer size mismatch occurring due to stride calculation support. Change-Id: I574708bd22ddc16f6df1bbaea03eeaefd817a422 Signed-off-by: Ravishangar Kalyanam commit d5ee18cfc20db554a0da265518045c6523feb255 Author: Sankalp Bose Date: Tue Mar 30 16:43:38 2010 +0530 defconfig: msm7630: Disable serial console UART Rx GPIO conflicts with sensors subsystem. Do not configure UART GPIOs by default. Change-Id: I526c6b926f3e5352765cf3315dcc7ab82940c224 Signed-off-by: Sankalp Bose commit 5fb9c68d489eda72c482fcaca92b7ac8892584b5 Merge: 4e255f0 6031094 Author: Bryan Huntsman Date: Wed Apr 14 11:30:44 2010 -0700 Merge "spi_qsd: Move global input_fifo_size to device context." into android-msm-2.6.32 commit 4e255f0a572b5459ed50958fb8bb94b1c049737c Merge: 080a4cf cae0b0c Author: Bryan Huntsman Date: Wed Apr 14 11:29:37 2010 -0700 Merge "spidev: Squashed changes to spidev driver" into android-msm-2.6.32 commit 080a4cf4b6ec9745c7f1cdd9285649c13cc9cbc2 Merge: f595994 97f5850 Author: Bryan Huntsman Date: Wed Apr 14 11:28:31 2010 -0700 Merge "spi_qsd: Initial contribution of the MSM SPI driver" into android-msm-2.6.32 commit f810c823debeaa4a4baa38cbdcc39e6119080efd Author: Helen Zeng Date: Wed Mar 31 21:53:14 2010 -0700 msm: audio: qdsp5v2: Reduce the wait delay in marimba profile Decrease the wait for capacitor charge from 250ms or 200ms to 100ms. Change-Id: Ie5fcbadfec4334e315465b07e50873902d54bf80 Signed-off-by: Helen Zeng commit 7f46e2c77cbf6c11caa84e840ba5ba246a32023f Author: Ron Shaffer Date: Fri Mar 19 13:34:13 2010 -0700 Bluetooth: Synchronize SCO/eSCO connection requests to ACL state Certain headsets such as the Motorola H350 will reject SCO and eSCO connection requests while the ACL is transitioning from sniff mode to active mode. Add synchronization so that SCO and eSCO connection requests will wait until the ACL has fully transitioned to active mode. Change-Id: I7111b15719881fe2e4ee4bce810e9531ac39a43b CRs-fixed: 229945 Signed-off-by: Ron Shaffer commit 6031094ca6a940a47437bc6a092e813b4bc41d2a Author: Lena Salman Date: Sun Apr 11 10:34:48 2010 +0300 spi_qsd: Move global input_fifo_size to device context. To improve SMP safety move global variable input_fifo_size to device context. Signed-off-by: Lena Salman commit cae0b0cd82876088c10b94e366fc4ff0456658b0 Author: Lena Salman Date: Wed Apr 14 10:12:24 2010 +0300 spidev: Squashed changes to spidev driver Those changes contain support for dynamically adding spidev to the SPI bus. This is important for testing, since we don't want to add the device statically to the boards file. In addition the changes contain a fix to the rx buffer. This assures rx buffer is correct also in cases when nothing is actually written to it during transaction (during errors). This is a squashed version of all the spidev driver changes on the QuIC MSM 2.6.29 kernel which can be found at www.codeaurora.org. Change-Id: I3d40a68b703617edcc0819570a37a575e1b8b8e5 Signed-off-by: Lena Salman commit 97f585033413b1f8ae210bbffd617a4af3462982 Author: Lena Salman Date: Wed Apr 14 18:35:54 2010 +0300 spi_qsd: Initial contribution of the MSM SPI driver This adds MSM SPI controller driver. The driver is SPI master, and allows slave connections. Current version of the driver supports FIFO and DM modes chosen upon the message size. The driver also supports loopback mode which can be used for testing purposes. This is a squashed version of all the MSM SPI driver changes on the QuIC MSM 2.6.29 kernel which can be found at www.codeaurora.org. It also contains all relevant adaptations to SPI core changes in 2.6.32 kernel. https://www.codeaurora.org/gitweb/quic/la/?p=kernel/msm.git;a=blob;f=drivers/spi/spi_qsd.c;h=1c8e3ec727b29040648ef9a4949396f7109528ae;hb=refs/heads/android-msm-2.6.29b Change-Id: Ibc1e71deb662af87deed77f10dcc8a3a46a8f012 Signed-off-by: Lena Salman commit 87307949cf36680b2ca201a9cba851224efcb499 Author: Trilok Soni Date: Wed Apr 14 13:05:15 2010 +0530 mfd: marimba-tsadc: Add TSADC shutdown sequence during suspend Call TSADC shutdown sequence during the suspend, otherwise Marimba I/O could draw more current during the deep sleep. Change-Id: I4a09d9e827117b13fcfc843fd0019f0a3db2be75 CRs-Fixed: 223740 Signed-off-by: Trilok Soni commit 74d922f9cb8b79dc50191b9df7fb4dc5448e7506 Author: Trilok Soni Date: Thu Apr 8 17:13:00 2010 +0530 mfd: marimba_tsadc: Add vreg vote level Use new smps clock vote and vreg vote level APIs to keep the voltage at one range during the operation. Change-Id: I89a0f7dfc2207ada2a729234081a9bb1f4687a00 Signed-off-by: Trilok Soni commit f595994d9861be7f6dd4258d37a6573d0eeb3640 Merge: 4f91899 b85eb32 Author: Asish Bhattacharya Date: Wed Apr 14 05:18:15 2010 -0700 Merge "power: msm_battery: report voltage change" into android-msm-2.6.32 commit 4f918992290bea5bae1dcff69fa2e3d5b972fd05 Merge: 3fbfb73 3de2c7e Author: Asish Bhattacharya Date: Wed Apr 14 05:16:42 2010 -0700 Merge "msm_fb: display: add run time statistic for debugging purpose" into android-msm-2.6.32 commit 3fbfb73bb325f68004a7ed7f967f86c5db8661d1 Merge: afa992d 37459bc Author: Asish Bhattacharya Date: Wed Apr 14 04:58:51 2010 -0700 Merge "msm: audio: 7x30: Set 48KHz Tx sample rate during encoder session" into android-msm-2.6.32 commit afa992d346410298105e8688798aaf85af197dac Merge: 9ec5da1 f668113 Author: Asish Bhattacharya Date: Wed Apr 14 04:54:40 2010 -0700 Merge "defconfig: 7x30: Enable MMC_UNSAFE_RESUME config option" into android-msm-2.6.32 commit 9ec5da1d043ec397087f5ecf770908f9b8c7a31a Merge: 4751d45 dda9cf6 Author: Asish Bhattacharya Date: Wed Apr 14 04:42:01 2010 -0700 Merge "radio: tavarua: Audio path selection" into android-msm-2.6.32 commit 4751d4537a1f2fc643ceef99b49f0c1dc477eefa Merge: b8d0db9 9e765de Author: Asish Bhattacharya Date: Wed Apr 14 04:41:35 2010 -0700 Merge "bluetooth: add Bluetooth drivers for MSM" into android-msm-2.6.32 commit b8d0db90315430fd60989b43033edf02cb1bd236 Merge: d93eba1 d0e1751 Author: Asish Bhattacharya Date: Wed Apr 14 04:41:18 2010 -0700 Merge "msm_fb: Reverted use of last session id in rotator" into android-msm-2.6.32 commit d93eba1a4f55688013731174624d0a6d0cf24af5 Merge: a3cde85 524b35d Author: Bryan Huntsman Date: Wed Apr 14 01:44:04 2010 -0700 Merge "input: pmic8058_keypad: Move pmic8058-keypad.h to include/linux/input" into android-msm-2.6.32 commit a3cde8549e69ed25ab3e32d260622ceabb9f7698 Merge: 9199228 b04ca18 Author: Bryan Huntsman Date: Wed Apr 14 01:43:51 2010 -0700 Merge "input: pmic8058_keypad: Fix row hold time calculation" into android-msm-2.6.32 commit ac7bc96e49a7220ccbb4c4c7982b3b484c45c375 Author: Swaminathan Sathappan Date: Mon Apr 12 22:00:26 2010 -0700 msm: audio: 7x30: Propagate device release pending event to audio decoder client Device release pending event sent from client will be propagated to decoder driver's listener callback, irrespective of the client. Handle the device switch cases with the release pending event added to event queue. Change-Id: Ic7a0a14ce7900b3e4d7aa6b5db6b28a99716c5dd Signed-off-by: Swaminathan Sathappan commit f6681138f19daa160bc46475733c3a2c9f1f0af3 Author: Sahitya Tummala Date: Wed Apr 14 12:41:01 2010 +0530 defconfig: 7x30: Enable MMC_UNSAFE_RESUME config option If MMC_UNSAFE_RESUME is not defined, we enable the mmc bus suspend and resume functions where we deselect the cards on suspend and re-detect them on resume. With this config option enabled card re-initializations can be prevented on every suspend resume cycle. However, it is assumed that the card will not be physically removed and replaced with another card while the system is in suspend state. Change-Id: I308feb596fd7589f25c6cf4b1992be6be322276b Signed-off-by: Sahitya Tummala commit 91992288077618112d6e3e01394e6558281bbce2 Merge: 38c7fe8 67a938e Author: Bryan Huntsman Date: Wed Apr 14 00:11:36 2010 -0700 Merge "msm_reqs: Add NPA System Bus Flow IDs and MSM_NPA_SYSTEM_BUS Kconfig." into android-msm-2.6.32 commit 38c7fe8ca4eebfb6acfb48a0508c9ee653814024 Merge: a698ed8 bf70dda Author: Bryan Huntsman Date: Wed Apr 14 00:11:12 2010 -0700 Merge "msm: msm_reqs: Introduce msm_reqs wrapper API for NPA requests." into android-msm-2.6.32 commit 524b35d1e9da21b475f7ddab48c58efcb34238f4 Author: Trilok Soni Date: Wed Apr 7 19:42:34 2010 +0530 input: pmic8058_keypad: Move pmic8058-keypad.h to include/linux/input Move the pmic8058-keypad.h from arch/arm/mach-msm/include/mach directory to include/linux/input as this is a generic driver. Change-Id: I712d5dd6e03a4e74fed1731eb30af79d5a7d5411 Signed-off-by: Trilok Soni commit b04ca18c7c59bd3e639136a2c8bfe9e58a054daa Author: Trilok Soni Date: Wed Apr 7 19:20:01 2010 +0530 input: pmic8058_keypad: Fix row hold time calculation Fix the row hold time calculation so that we can get exact no. to program the related bits in keypad scan register. Earlier equation was calculating one value less than the value needs to be programmed in the register. It also adds minimum and maximum values checks for row hold time during probe. Change-Id: I7d78757c73236ecb1abf642f7014a5e2b0f14904 Signed-off-by: Trilok Soni commit a698ed808c88afb19b5b17463f247cef9fe72945 Merge: f4cf744 fa58c0b Author: Asish Bhattacharya Date: Tue Apr 13 23:39:01 2010 -0700 Merge "cpufreq: Fixed input event handler code" into android-msm-2.6.32 commit f4cf7443cbffa991dfdecfc0cd80076c92db8fb3 Merge: 6065a6a ba5f885 Author: Asish Bhattacharya Date: Tue Apr 13 23:37:34 2010 -0700 Merge "msm: audio: qdsp5v2: Optimize driver code to reduce device switch time" into android-msm-2.6.32 commit 6065a6aea3b266df105056083a43f179a5236d7f Merge: 5032a0d 76700a8 Author: Asish Bhattacharya Date: Tue Apr 13 23:36:25 2010 -0700 Merge "Cpufreq: Added input event hook to ramp up cpu frequency" into android-msm-2.6.32 commit ba5f88598032d2c2097c85b898c58b08cb880fca Author: Helen Zeng Date: Wed Mar 24 21:36:36 2010 -0700 msm: audio: qdsp5v2: Optimize driver code to reduce device switch time Make the following changes to speed up enabling and disabling devices. . replace msleep with udelay in lpa.c . If delay is less than 2ms, use mdelay, otherwise use msleep in marimba-codec.c . Add one more state in marimba codec driver to advoid reimage when disabling devices . Caches values written to marimba, so there is no need to read the values from marimba when writing new values. . Add wakelock to prevent sleep during enabling and disabling devices. . Remove delay after FLASH_IMAGE in marimba profile. Change-Id: I1485c7863a69cbfdf3544f57ce91280fdf8b7c91 CRs-Fixed: 232320 Signed-off-by: Helen Zeng commit 5032a0d72168ffe83a74547b0b56f7907d2d1047 Merge: f0b39ac 9336eff Author: Bryan Huntsman Date: Tue Apr 13 17:16:28 2010 -0700 Merge "msm: audio: qdsp5v2: Update Voice Rx Volume based on Network Type" into android-msm-2.6.32 commit 9336effb31bef89080c30135d7d19c08e8779b3e Author: Helen Zeng Date: Fri Apr 2 11:20:08 2010 -0700 msm: audio: qdsp5v2: Update Voice Rx Volume based on Network Type Narrow band rx volume range is different from the wide band's range in some devices according to the calibration requrirement. Update the audio driver code to keep the wb and nb ranges and the volume values separately. Send the correct volume to MCAD based on the network type. Change-Id: Ibdcd443ee99dd2f504f276461a6e3d1f01ecadd4 Signed-off-by: Helen Zeng commit 9e765de9a70290c955c7a08499d6f3ebefb2a7c7 Author: Matthew Wilson Date: Mon Apr 12 10:50:49 2010 -0500 bluetooth: add Bluetooth drivers for MSM Add Bluetooth power switch driver. Add Bluetooth UART low power mode drivers. Change-Id: I509b39af7c32292a8f9c84f20aa633d0654ad358 Signed-off-by: Matthew Wilson commit f0b39acdf2229d429f29daf738f1304bf67d5d11 Author: Patrick Lai Date: Wed Apr 7 12:44:16 2010 -0700 msm: audio: qdsp5v2: Update headset tx calibration 1. All headset tx gains to 13DB 2. All headset tx sidetone gains to -25DB Change-Id: I9d89aef0c01051a4b2fb7ba9196bc400b7e87fd3 Signed-off-by: Patrick Lai commit f4c411882d8af7df8548fb77f2227e2edc302e43 Author: Derek Kulinski Date: Mon Apr 12 10:51:54 2010 -0700 usb: gadget: Rate limit debug messages Change-Id: Idb7dfdbb0faba464ee8c3d32b4cca1e4cf6afa4d Signed-off-by: Derek Kulinski commit 3de2c7ef2c3a3f861597f36c8b792f9d45b43598 Author: Kuogee Hsieh Date: Mon Apr 5 14:02:55 2010 -0700 msm_fb: display: add run time statistic for debugging purpose Add run time statistic to help debugging. Also consolidate MDP4 debugfs implementation to mdp4_debugfs.c. Change-Id: Ic454bfbd29c811f70abd310a270bc217b4cccf71 Signed-off-by: Kuogee Hsieh commit 37459bce8ed60b3d8da1587f84719a03971794a4 Author: Asish Bhattacharya Date: Wed Apr 7 19:32:42 2010 +0530 msm: audio: 7x30: Set 48KHz Tx sample rate during encoder session As firmware going to support resampler in AUDPREPROC path, configure Tx sample rate to maximum 48KHz to avoid reconfiguration of device due to other concurrency clients requesting for different sampling rate. Change-Id: Iba566275d8f62a5c41b24b71f550e880e2e5ebab Signed-off-by: Rajesha Kini Signed-off-by: Asish Bhattacharya commit f2a8099c4155594c87efe5bb35bd3af332e51914 Merge: c5e9869 b9ed28e Author: Bryan Huntsman Date: Tue Apr 13 11:57:12 2010 -0700 Merge "usb: android: Warning fix." into android-msm-2.6.32 commit dda9cf613aac59fe7fc22a8f36a167092a6d2f82 Author: Mangesh Pardeshi Date: Tue Apr 13 13:57:09 2010 -0500 radio: tavarua: Audio path selection FM core has analog and digital (I2S) audio paths. This patch provides a function to select the audio path. Change-Id: I805fcabe9ace25bf8703b0166d7d5c6f7ca9f43e Signed-off-by: Mangesh Pardeshi commit c5e98691f96f5ee557cc233698f1c0610e4029b3 Merge: 128041e 451bf8c Author: Bryan Huntsman Date: Tue Apr 13 11:56:56 2010 -0700 Merge "msm_fb: display: Remove qseed table init at overlay set" into android-msm-2.6.32 commit 128041e245b57418b1795a372e36e234e8ff4d46 Merge: 3808ca7 8f6f694 Author: Bryan Huntsman Date: Tue Apr 13 11:56:39 2010 -0700 Merge "msm: 7x30: Set the max clock frequency for 2D graphics core to 192 MHZ" into android-msm-2.6.32 commit 3808ca7f634cef3d20e49a2f77ddf235f357a971 Merge: d530022 fef1c28 Author: Brent DeGraaf Date: Tue Apr 13 11:43:19 2010 -0700 Merge "msm_kgsl: Fix idle check for GPU" into android-msm-2.6.32 commit f1a9ced97588f100f51c23be154560c874a2be33 Author: Ashraya Arya Date: Mon Apr 12 14:37:46 2010 -0700 msm: audio: 8x50: Support user configurable buffer size Allow Userspace to configure buffer size for PCM drivers. User config data is also checked for sanity. Code is copied from android.git.kernel.org nexusonec branch. Change-Id: I422f42b8999d47ab991af78cc3dbf6a890674050 Signed-off-by: Ashraya Arya commit ca4bb9a2dbcde4038da0b1f34c8592aa09172abb Author: Vishwanathapura, Niranjana Date: Tue Apr 13 12:24:50 2010 -0600 msm: Add SMD buffer size information to 'ch' debug interface SMD Buffer size can vary from port to port. Add this size information to 'ch' debug interface. Change-Id: I7907b8a40f36c9ad8604456b4422e83d11640d69 Signed-off-by: Niranjana Vishwanathapura commit d530022e6a8413107e1fde00947cf7d70e9a1f34 Merge: c74b2d8 342f97f Author: Bryan Huntsman Date: Tue Apr 13 11:09:23 2010 -0700 Merge changes I6f4b915c,I49bfdc60 into android-msm-2.6.32 * changes: pmem: Add new IOCTL to return free memory information pmem: Fix pmem driver to return appropriate error numbers commit d0e175168e92a1708bc8ab701723ab938eabc129 Author: Neeraj Kumar Date: Mon Apr 12 10:47:47 2010 -0700 msm_fb: Reverted use of last session id in rotator Rotaor registers are not programmed again if application makes call with same session id which refers to same settings. This leads to a problem as rotator resets its programmed register values when clock is disabled for it. This feature is disabled now. Change-Id: If6de7f796900eb6c9fe89c3cac401e260364145f CRs-fixed: 233665, 233514 Signed-off-by: Neeraj Kumar commit b85eb324e826bd3cb5d66c75ae8b8a7de8f28ed6 Author: Willie Ruan Date: Thu Apr 8 12:19:52 2010 -0700 power: msm_battery: report voltage change Voltage only change was not reported if there is no ac/usb change. Add a variable to remember power supply type and use it to report the voltage change, and make sure all variables are updated before the report. Capacity report is corrected for any voltage range. CRs-fixed: 233603 Change-Id: I7c252f24a54fbecf626183e634689b227c9e113c Signed-off-by: Willie Ruan commit 451bf8c3ad8d4f5bf7b7cd4e63253b584aa0a7df Author: Kuogee Hsieh Date: Mon Apr 12 14:57:42 2010 -0700 msm_fb: display: Remove qseed table init at overlay set Bit 18 (MDP_CORE_FS_ON) of register VFE_MDP_FS (0xab800398) was not set at LPDDR2 platform which cause MDP4 register lose contents after mdp core clock disabled which cause display garbled with rainbow color or grid shape picture. MDP_CORE_FS_ON problem had been fixed so that there has no need to re-program qseed table to prevent display from distortion. Change-Id: Ib122ffa362422f79f255ff0b22dbb2aa99c46f25 Signed-off-by: Kuogee Hsieh commit b9ed28e518d927d94f361caea78a3b5894c8db6c Author: David Brown Date: Tue Apr 13 08:26:56 2010 -0700 usb: android: Warning fix. Type mismatch in debugging message. Change-Id: I794183177adaeac83ac1fbee227c73ed Signed-off-by: David Brown commit c74b2d832acbaf6f0adcbbc6e00b4583d6213798 Merge: 3376aee 19ab788 Author: David Brown Date: Tue Apr 13 08:21:17 2010 -0700 Merge "android: Warning fix in usb gadget android driver." into android-msm-2.6.32 commit 8f6f694eb84ea9ab8243d841e2354ebf6939b423 Author: Jon Ashburn Date: Mon Apr 12 15:13:38 2010 -0600 msm: 7x30: Set the max clock frequency for 2D graphics core to 192 MHZ Running the Z180 2D graphics core at 245 MHZ can cause system hang problems on some boards. Revert to running the Z180 at 192 MHZ until the hardware issues are understood and resolved. Change-Id: I6279c9404004f2f7409aad288173550245282f62 CRs-fixed: 232836 Signed-off-by: Jon Ashburn commit 3376aee7411233f888b889b8b4f5084201f49a43 Merge: ec7eaef 0ecbfb4 Author: Asish Bhattacharya Date: Tue Apr 13 05:36:11 2010 -0700 Merge "msm: video: Driver for firmware version 16." into android-msm-2.6.32 commit ec7eaefb2e8f2baf87f10b2456b0830a96ac3bfd Merge: ba9efae e6a2f09 Author: Asish Bhattacharya Date: Tue Apr 13 05:33:37 2010 -0700 Merge "msm_fb: display: remove un-necessary clock gating" into android-msm-2.6.32 commit ba9efae5102359bbf7f2c1cb49bc18bfc915986f Merge: 6e03299 b424d32 Author: Asish Bhattacharya Date: Tue Apr 13 05:31:27 2010 -0700 Merge "radio: tavarua: Fixed RDS stall problem" into android-msm-2.6.32 commit 20c5cc27e9dd9b19f848a974450909da67f39033 Author: Neeraj Kumar Date: Tue Mar 30 18:08:26 2010 -0700 msm_fb: Enabled detection of MDDI type 2 panel Added revision information for every MDDI panel to check which one supports Type 2 mode. MDDI host is initialized in type 2 mode based on this information. Changed turn around 1 and turn around 2 register values in mddi to avoid MDDI client register read failure in type 2 operation. Change-Id: I866913cb34182e56f4cd2152c80d85ab372ded87 Signed-off-by: Neeraj Kumar commit 67a938e67e3c8336dac15542e03e8b0c962e3d7d Author: Matt Wagantall Date: Mon Apr 12 10:30:15 2010 -0700 msm_reqs: Add NPA System Bus Flow IDs and MSM_NPA_SYSTEM_BUS Kconfig. Adding the new Kconfig allows NPA System Bus rate voting to be enabled separately from MSM_NPA_REMOTE. Change-Id: I3f139aa4197acdba94ad85e26914b0d6ef3d04b3 Signed-off-by: Matt Wagantall commit bf70dda7528e54ef5d80466304d81dc7366489bc Author: Matt Wagantall Date: Tue Mar 23 21:32:25 2010 -0700 msm: msm_reqs: Introduce msm_reqs wrapper API for NPA requests. Some drivers may wish to interact with NPA through a simplified API that allows for adding, updating and removing of resource requests. Introduce this API, and refactor the npa_pm_qos implementation to take advantage of the common code. Change-Id: I18fbf53dae44d95d3a8286b01bf9cfb4f0975216 Signed-off-by: Matt Wagantall commit 6e03299361ab97ede78e0dde104934a77857c709 Merge: 1771540 53c3d66 Author: Bryan Huntsman Date: Mon Apr 12 20:21:31 2010 -0700 Merge "msm_fb: display: add support of MDDI 24 bit interface" into android-msm-2.6.32 commit 1771540baba5548e9fa1c74fa7846c48f9989d7d Merge: 2b817bd 46f578a Author: Bryan Huntsman Date: Mon Apr 12 19:18:39 2010 -0700 Merge "radio: tavarua: vote for vreg level" into android-msm-2.6.32 commit 2b817bd36acf4f51825dedab92132f187df15f75 Merge: d0432f3 fe294b6 Author: Bryan Huntsman Date: Mon Apr 12 19:18:24 2010 -0700 Merge "power: msm_battery: Rate limit debug messages" into android-msm-2.6.32 commit fa58c0bc8e09df3c85d65d0b356eaee6cf86091a Author: Brian Steuer Date: Fri Sep 4 17:19:54 2009 -0700 cpufreq: Fixed input event handler code The input event handler now grabs a semaphore before accessing internal ondemand governor data. This prevents conflicts with normal timer based ondemand functions. Error handling during input handler registration fixed. Change-Id: I4c1f1ae1d6a4dfcde0cb593f1cd58d22627ad2d2 Signed-off-by: Brian Steuer commit 76700a8c385b35118ca8a54867fd6dd7d0e36049 Author: Tero Kristo Date: Tue Aug 18 17:40:29 2009 -0700 Cpufreq: Added input event hook to ramp up cpu frequency This will cause switch to maximum opp immediately when user interaction occurs, i.e. touchscreen input or keypad activity. Change-Id: I59c3d893429f6d9813e4a28a71a46943c49c015a Signed-off-by: Tero Kristo Signed-off-by: Jouni Hogander [bsteuer@quicinc.com: fixed cpu_dbs_info naming] Signed-off-by: Brian Steuer commit 19ab7884faff688d767270c27551a35d97a4d344 Author: David Brown Date: Mon Apr 12 16:47:51 2010 -0700 android: Warning fix in usb gadget android driver. static is declared by not used when CONFIG_USB_ANDROID_RNDIS is not defined. Change-Id: I3c96eb2fa7b6d70753214058ddda6c3a Signed-off-by: David Brown commit fef1c28bd6557e072608cb8e0ac222c50a3e62c0 Author: Shubhraprakash Das Date: Wed Apr 7 12:35:31 2010 -0600 msm_kgsl: Fix idle check for GPU GPU is really idle when rbbm_status register value is 0x110 Change-Id: I37fcb5da80b50d66c989a32e231a3d87d57a08ad Signed-off-by: Shubhraprakash Das commit 46f578a6df7926f3d2ede9acfe09cdf467f57ed0 Author: Mangesh Pardeshi Date: Fri Apr 9 16:54:32 2010 -0500 radio: tavarua: vote for vreg level Vote for nominal voltage level for FM RF circuit when switching on and zero when switching off. This keeps voltage at a known level while FM is operating. Change-Id: Ibd8ffee451e10be12c316720771b4c4db16e5c2f Signed-off-by: Mangesh Pardeshi commit 0ecbfb4de5c1a7fbea5d7c7e1bf120ffe5ba5185 Author: Gopikrishnaiah Anandan Date: Fri Apr 9 18:55:18 2010 -0700 msm: video: Driver for firmware version 16. Video core firmware updates the cropping information as part of sequence header parsing for H264. Added driver support to consume cropping information and pass to upperlayers. Change-Id: I252e5b015eb9af479b6b1384c643e10fd8719edb CRs-Fixed: 231551 Signed-off-by: Gopikrishnaiah Anandan commit d0432f3206dd0e4256ea7c0948891a84bb3ae4d4 Merge: 99a22cb 24726e5 Author: Bryan Huntsman Date: Mon Apr 12 15:00:29 2010 -0700 Merge "video_core: 720p: Enable 720p" into android-msm-2.6.32 commit 99a22cbacd70e574681d8eecfccf8b8c4e47215d Merge: 6666763 7158b9c Author: Bryan Huntsman Date: Mon Apr 12 15:00:10 2010 -0700 Merge "video_core: Remove duplicate functions" into android-msm-2.6.32 commit 6666763fea3f41c925fa50463ef5445d462037fe Merge: 1429550 e31aa3a Author: Bryan Huntsman Date: Mon Apr 12 14:59:48 2010 -0700 Merge "tsif: Enable TSIF" into android-msm-2.6.32 commit 142955099408ef71e2807fbc6997e0d6ca7a6720 Merge: b024fbc 3333a51 Author: Bryan Huntsman Date: Mon Apr 12 14:59:27 2010 -0700 Merge "msm: usb: Add OTG-Host support for 7x30" into android-msm-2.6.32 commit b424d328da033dec35ac69f4c7854ccb590baac4 Author: Mangesh Pardeshi Date: Fri Apr 9 15:58:10 2010 -0500 radio: tavarua: Fixed RDS stall problem After tuning to a station with RDS, the code stops receiving Radio Text data due to a bug in Program Services data processing. Change-Id: I43c562462728b9a3a4d4b94bd0e620a207cd98de CRs-Fixed: 227450 Signed-off-by: Mangesh Pardeshi commit b024fbc9de7515d865ee85d7d72e7575f3886de4 Merge: 2292693 8078835 Author: David Brown Date: Mon Apr 12 13:55:43 2010 -0700 Merge "msm: audio: 7x30: Remove duplicate profile definition." into android-msm-2.6.32 commit e6a2f092cbc9ca6617753620fc4834bb339e419d Author: Kuogee Hsieh Date: Mon Apr 12 10:47:40 2010 -0700 msm_fb: display: remove un-necessary clock gating MDP core clock are gated within every function. Beside that it is also enabled at overlay set and disabled at overlay unset. Since overlay unset was not called at the end of video playback which leave mdp core clock enabled and cause power leakage. Remove overlay set/unset un-necessary mdp core clock gating to prevent power from leaking. CRs-fixed: 233033 Change-Id: I86d722d76dfa85029fb2441e0af1aaa2a0ab335d Signed-off-by: Kuogee Hsieh commit fe294b6b2ad79c54da7fe3ff78ee5f90788cfe05 Author: Derek Kulinski Date: Thu Apr 8 13:53:52 2010 -0700 power: msm_battery: Rate limit debug messages Reclassified some info messages to debug level. Change-Id: I92ed3e0308aae270d518c1710eca63aedf2bf69d Signed-off-by: Derek Kulinski commit f8b4d31a50f9a5d820a7bfe66b00ece964636dd6 Author: Zach Pfeffer Date: Fri Apr 9 09:38:23 2010 -0700 pmem: Enable PMEM tests Change-Id: I193ed8ae923e31c7a04932a8368f241e9b135d13 Signed-off-by: Zach Pfeffer commit 24726e5d34a092f2ad2ec1f4dfd870d6c5844554 Author: Zach Pfeffer Date: Fri Apr 9 09:55:56 2010 -0700 video_core: 720p: Enable 720p Change-Id: I9b385d819b3f66e69f8928ea3d6b8bd6c0424629 Signed-off-by: Zach Pfeffer commit 7158b9c1e8f12397391bf7f26ae255eb0c2be314 Author: Zach Pfeffer Date: Fri Apr 9 09:55:05 2010 -0700 video_core: Remove duplicate functions Change-Id: Ia61acbb9c17d68e54f9308a890a8a251fff70e1e Signed-off-by: Zach Pfeffer commit e31aa3ae872a03cecd54c02e2c49de559fe9b649 Author: Zach Pfeffer Date: Fri Apr 9 09:53:16 2010 -0700 tsif: Enable TSIF Change-Id: I243f6b002682c6c70c0b42b24669ba7abd1e8cbc Signed-off-by: Zach Pfeffer commit 3333a5189dcf96cecec675a85e198f93ff3fc054 Author: Manu Gautam Date: Wed Apr 7 12:22:55 2010 +0530 msm: usb: Add OTG-Host support for 7x30 Change-Id: Id4fa3289d5a61a53a4110ed66393c8b9a9741446 Signed-off-by: Manu Gautam commit 22926934162b8fb597770f2270ed9f40f5da6d7a Author: Matthew Wilson Date: Mon Apr 5 15:37:47 2010 -0500 msm: 7x30: bluetooth: vote for vreg level Vote for nominal voltage level for Bluetooth RF circuit when switching on and zero when switching off. This keeps voltage at a known level while Bluetooth is operating. Change-Id: I4ef825ed035214a89c1c86fb58e58a9bf61691db Signed-off-by: Matthew Wilson commit 53c3d6649b90bb0dae5a4152b2075f5fb34bde3d Author: Kuogee Hsieh Date: Fri Apr 9 13:19:16 2010 -0700 msm_fb: display: add support of MDDI 24 bit interface Change-Id: Ia48c535db38a94bbed6f4e82433193126e6e491f Signed-off-by: Kuogee Hsieh commit 03ad6b4db9590c16f4509126ea4d9c5931bfb910 Author: Willie Ruan Date: Tue Apr 6 14:21:43 2010 -0700 msm: pmapp: add smps_clock_vote and vreg_level_vote APIs These two APIs are needed for peripherals like WLAN, BT, etc. to share voltage regulators. Change-Id: I5fb77afdb70cbc3daaf944a90d1d9efe8d19ae96 Signed-off-by: Willie Ruan commit 24bfc4caf1b09e321aee85545ee9565c4f56bbfd Merge: 8f21c53 8a150af Author: David Brown Date: Mon Apr 12 01:04:48 2010 -0700 Merge "msm: adsp: qdsp5v2: Increase retry duration to 2msecs." into android-msm-2.6.32 commit 8f21c530f8191bace26159695894c25f1500eebf Merge: 4df4391 fbbc6ff Author: David Brown Date: Mon Apr 12 01:04:40 2010 -0700 Merge "msm: adsp: qdsp5v2: retry msm_adsp_write() when a queue is full." into android-msm-2.6.32 commit 4df439156291ccabc429f3f47e19aeb3383bc06e Merge: 0bc4c78 ac97ef2 Author: Asish Bhattacharya Date: Sun Apr 11 23:49:01 2010 -0700 Merge "alsa: 8k: Limit period size for sample rates greater than 8KHz" into android-msm-2.6.32 commit 0bc4c789d1ecc12b6efa1afe276247185d6b3d8d Merge: 819ca81 afcb227 Author: Asish Bhattacharya Date: Sun Apr 11 23:48:02 2010 -0700 Merge "alsa: 8k: Optimize add_timer expiry value" into android-msm-2.6.32 commit 8078835d528fd589457d1cf7c63d9ccbe44f8a27 Author: David Brown Date: Sun Apr 11 15:15:11 2010 -0700 msm: audio: 7x30: Remove duplicate profile definition. Remove duplicate #define, fixing a warning. Change-Id: I6930d6eb746498b68b37d168f6785ed470448189 Signed-off-by: David Brown commit 819ca818c6cb9c72b5c28b19e19f225c337fe0a2 Merge: bf46bdf f5d41a9 Author: David Brown Date: Sat Apr 10 14:29:15 2010 -0700 Merge "msm: clocks: Add debugfs files for local ownership" into android-msm-2.6.32 commit bf46bdf12342561e1625c5c132abc3a1abbdaa05 Merge: 22e7036 cad6f30 Author: David Brown Date: Sat Apr 10 14:29:07 2010 -0700 Merge "msm: clock-7x30: Use cpu_relax() appropriately" into android-msm-2.6.32 commit 22e703644ea7901716dce52c8f751750189ab911 Merge: 62dcfdc 17814c2 Author: David Brown Date: Sat Apr 10 14:28:37 2010 -0700 Merge "input: pmic8058_keypad: Fix debounce time for RevB0" into android-msm-2.6.32 commit 62dcfdc62f6fb41ae6c230dd6591ba901844851b Merge: b30423f 092a709 Author: David Brown Date: Sat Apr 10 12:56:23 2010 -0700 Merge "msm_kgsl: Distinguish between 2D and 3D core AXI rate votes." into android-msm-2.6.32 commit b30423f50720ffdc4a11f0554983a4e23c0ff184 Merge: 126cc50 bb76722 Author: David Brown Date: Sat Apr 10 10:51:57 2010 -0700 Merge "msm: acpuclock-7x30: Decrease ACPU voltages as per updated frequency plan." into android-msm-2.6.32 commit 126cc507ed8a879a20bb3483ba0207cea04e5ddb Merge: 849c0ff 0f39d28 Author: David Brown Date: Sat Apr 10 10:51:49 2010 -0700 Merge "msm_fb: Don't expose clock rate through debugfs" into android-msm-2.6.32 commit 849c0ff41208c74399538d0665253634575ef58d Merge: 23c750b 402fb49 Author: David Brown Date: Sat Apr 10 10:51:39 2010 -0700 Merge "msm_fb: Fix clk_set_rate() usage" into android-msm-2.6.32 commit 23c750b93c1addce016cf3e9b6803358914122c4 Merge: 541ed20 416de17 Author: David Brown Date: Sat Apr 10 10:51:32 2010 -0700 Merge "defconfig: automatic update" into android-msm-2.6.32 commit 541ed20a4ff79191d3fa28394365910f69d3299f Merge: 9343086 6bcef8e Author: David Brown Date: Sat Apr 10 10:51:23 2010 -0700 Merge "input: pmic8058_keypad: Optimize synchronous read operations" into android-msm-2.6.32 commit 9343086bae43ffd4b40cebf49d37f327ed58c539 Merge: 22c6411 98e4d4d Author: David Brown Date: Sat Apr 10 09:51:02 2010 -0700 Merge "msm_fb: display: Do not piggyback kickoff of VG pipe" into android-msm-2.6.32 commit 092a709debbef8cd788c41234c127b332d0a1366 Author: Matt Wagantall Date: Thu Mar 11 14:49:02 2010 -0800 msm_kgsl: Distinguish between 2D and 3D core AXI rate votes. Change-Id: Icd992a7179b2d6015c03c2dcc2db92e05b9788c4 Signed-off-by: Matt Wagantall commit 22c6411c07a3eafed44b4f0050d28e2ef222d4ba Merge: e7d8304 2c6ce0c Author: David Brown Date: Sat Apr 10 09:16:12 2010 -0700 Merge "msm: pm: disable standalone power collapse" into android-msm-2.6.32 commit e7d830462b15bb99de3e9cae5853c1dc26c5faec Merge: b6202c9 8b734fb Author: David Brown Date: Sat Apr 10 09:15:56 2010 -0700 Merge "msm: Split devices.c into SoC-specific device files." into android-msm-2.6.32 commit 98e4d4dae33a6682a0f5a1616940c1e107d0bdcb Author: Kuogee Hsieh Date: Wed Apr 7 14:20:40 2010 -0700 msm_fb: display: Do not piggyback kickoff of VG pipe Do not piggyback kickoff of VG pipe. Otherwise camcorder settings menu will not show up since camcorder does not constantly play VG pipe. CRs-fixed: 233664 Change-Id: Ie3d6f4b3c4b335e163e496aa51cd3d2f0ed7a2b8 Signed-off-by: Kuogee Hsieh commit 8a150afca74b8ce86b1852d6baf9b1769d98a1e6 Author: Suresh Vankadara Date: Fri Apr 9 16:49:55 2010 +0530 msm: adsp: qdsp5v2: Increase retry duration to 2msecs. When DSP is not ready to accept a command, ADSP driver retries for 100 times with 10 usecs delay each time which amounts to 1 msec in total. But when DSP is busy processing commands it may take more than 1 msec to respond to requests from application processor. Hence updating the number of trials to 40 with 50 usecs delay each time thus increasing the maximum delay to 2 msecs. Change-Id: Ifc41d5151f2ed3907985732a4fb2b88e34cddb66 CRs-fixed: 232048 Signed-off-by: Suresh Vankadara commit fbbc6ffd9852cf7ad542d04eb809ca39f60cd088 Author: Iliyan Malchev Date: Fri Jun 5 15:29:54 2009 -0700 msm: adsp: qdsp5v2: retry msm_adsp_write() when a queue is full. Commit fee2df57284bcca209ad9cf9ab5f7cf895592b3f replaced an mdelay(1) with a udelay(1) in two places, which sped up msm_adsp_write() considerably in those cases where we did not have to wait for the DSP to get ready for a command. This had the side effect that back-to-back DSP commands can be rejected by the DSP for a given DSP module and queue number when the DSP is still busy processing the last command for that queue. This patch retries sending the command 100 times (for up to ~1ms) in such situations. Change-Id: I2ac3e6dfaf4a13a1d6c0a3ba3125e0fa4cfc8a5f Signed-off-by: Iliyan Malchev Signed-off-by: Suresh Vankadara commit 342f97f90bd3165db93067e782057a1e276b51c4 Author: Naveen Ramaraj Date: Wed Apr 7 17:40:40 2010 -0700 pmem: Add new IOCTL to return free memory information Add a new IOCTL that enables user space programs to query the pmem driver at run time for available free memory. The IOCTL will return the total amount memory that is free and also the size of the largest contiguous chunk. The largest chunk will be smaller than the total size if the memory is fragmented. Change-Id: I6f4b915ca66da3d606783f50bda5e0233ec652d4 Signed-off-by: Naveen Ramaraj commit ac97ef246a754b9a2b4236ca08c6ade389dc206f Author: Pradeep Jilagam Date: Wed Apr 7 17:38:20 2010 +0530 alsa: 8k: Limit period size for sample rates greater than 8KHz The DSP interrupts are non-periodic. ALSA expects periodic acknowledgement for the buffers sent. Hence, the alsa driver uses timer as alternate interrupt source. The min resolution is 10ms which results in distorted audio for some sample rates. Hence restricting the minimum period size for sample rates greater than 8KHz to 512 frames. Change-Id: Ic8c4180fbee7242fa3139230ddcf6a9f98e4c7ab CRs-fixed: 231784 Signed-off-by: Pradeep Jilagam commit 0c310aae90777b479f3500805b3cf0fd54935572 Author: Neeraj Kumar Date: Wed Apr 7 14:36:30 2010 -0700 msm_fb: Changed IOCTL blit at width or height of 1 Scaling to width or height of 1 can lead to hang in the MDP3.x. Modifies blit IOCTL to allow blitting of images on framebuffer at destination width or height of 1 only when no scaling of image is requested by the user. Change-Id: I0137431b4053b3b937c86caaf9ff4ad038c29c68 CRs-fixed: 233445 Signed-off-by: Neeraj Kumar commit b6202c9ae681ee659771810cbb522dd1efd7fcfb Author: Neeraj Kumar Date: Tue Apr 6 17:32:44 2010 -0700 msm_fb: Added functionality in rotator to disable rotate An enable flag is added in the rotator configuration info to keep the rotate ioctl disabled. Rotation will not work for a session started by the user till enable flag is set using start ioctl. CRs-fixed: 233662, 233665 Change-Id: Ic57dcc817ab4bb5940166fe03cff05baebb8de6d Signed-off-by: Kuogee Hsieh commit 69f58689e287e013422fbe2fe8247e24d22df2a3 Author: Stepan Moskovchenko Date: Wed Apr 7 14:25:30 2010 -0700 led: Bring in PMIC LED driver Signed-off-by: Stepan Moskovchenko commit 23cf2d948466c6ae4d9ed1706dd3db807916e68c Author: Stepan Moskovchenko Date: Wed Apr 7 12:49:57 2010 -0700 mfd: Bring in tps65023 PMIC driver Signed-off-by: Stepan Moskovchenko Change-Id: I7eab5f8789a13b8911518b20ba3e31c5e7b2d8cd commit a411c81a13bb1c4e4451e26ac1b672241b57d48b Author: Naveen Ramaraj Date: Wed Mar 24 14:21:18 2010 -0700 pmem: Fix pmem driver to return appropriate error numbers Change the generic error numbers being returned by the pmem driver to specific error numbers as appropriate. Change-Id: I49bfdc60cf7fe29b8995484a40ba19e764ace0aa Signed-off-by: Naveen Ramaraj commit f5d41a9516394fe097f309434034d0d3972761b9 Author: Stephen Boyd Date: Mon Apr 5 16:20:02 2010 -0700 msm: clocks: Add debugfs files for local ownership Add a new directory to debugfs 'clk_local' which contains a file for every clock on the system. If the clock is locally owned the file contains a 1, otherwise the file contains a 0. Change-Id: I35fe2872e329a9b69f68e284e2c24cc9f7ef2465 Signed-off-by: Stephen Boyd commit cad6f303529339aecf74913c5c179bedbf04ed17 Author: Stephen Boyd Date: Wed Apr 7 10:06:41 2010 -0700 msm: clock-7x30: Use cpu_relax() appropriately According to Documentation/volatile-considered-harmful.txt the right way to perform a busy wait is to cpu_relax() for each iteration of a busy wait loop. Change-Id: Idcb12bc46c76a327fc30122c07ce8b2e55ad4d64 Signed-off-by: Stephen Boyd commit 2c6ce0c60eb1fe31a6f7fd7372dda41ca5fec9d4 Author: Ai Li Date: Wed Apr 7 11:32:42 2010 -0600 msm: pm: disable standalone power collapse Change-Id: I8061d2108971eeab5c0119b206814e71c4f3d8e3 Signed-off-by: Ai Li commit afcb227484765c872ce3f958d9458aa1585efad5 Author: Asish Bhattacharya Date: Wed Apr 7 14:47:31 2010 +0530 alsa: 8k: Optimize add_timer expiry value Problem The driver registers for a timer callback with high frequency of timer callback request. Impact CPU load goes high upto 20% for ksoftirqd Solution Optimize the timer callback request to have lesser cpu load by reducing the frequency of callback requests. Change-Id: I1f7ca58168b1c194b9978d8ccc98e5c03418b5bd CRs-fixed: 232073,231784 Signed-off-by: Asish Bhattacharya commit bb76722a22106a0a3446ed482d4477303cc9131b Author: Matt Wagantall Date: Tue Apr 6 20:02:56 2010 -0700 msm: acpuclock-7x30: Decrease ACPU voltages as per updated frequency plan. Change-Id: I1a6a5592f299fc18c7473d17c93f649f2ecbad4e Signed-off-by: Matt Wagantall commit 403116c6ae351d252da87aed11af03e6d649dac1 Author: Zach Pfeffer Date: Tue Apr 6 17:40:10 2010 -0700 cpufreq: Add option to turn cpufreq on. Signed-off-by: Zach Pfeffer commit 8b734fbe50a529d259f94cac9ca9736104974361 Author: Matt Wagantall Date: Tue Apr 6 12:53:17 2010 -0700 msm: Split devices.c into SoC-specific device files. Change-Id: Ic2651a9dc0f45f59e6d60b6d4f0e573a5b17ffe4 Signed-off-by: Matt Wagantall commit 0f39d2813b5e5c7b51d22c6cd42e8e26d9829736 Author: Stephen Boyd Date: Tue Mar 23 14:27:53 2010 -0700 msm_fb: Don't expose clock rate through debugfs The rates for mdp_lcdc_pclk_clk and mdp_lcdc_pad_pclk_clk are already exposed through debugfs via the clk_rate directory. Don't duplicate that functionality here. Change-Id: Ifc33658d347d691ad3afc2c4f55ba2b36b729d9e Signed-off-by: Stephen Boyd commit 402fb49fa4f46749515f3672432f0fb51985b9d5 Author: Stephen Boyd Date: Tue Mar 23 14:22:02 2010 -0700 msm_fb: Fix clk_set_rate() usage Calling clk_set_rate() on mdp_lcdc_pad_pclk_clk will always return an error. Calling clk_set_rate() on mdp_lcdc_pclk_clk will also set the rate of mdp_lcdc_pad_pclk_clk so just use that. While we're here, error out if the call to clk_set_rate() fails. Change-Id: I948315a1ffae7ec7f20056c2244306a168f25973 Signed-off-by: Stephen Boyd commit 416de172626365452ee389b7051d39e83309ac10 Author: David Brown Date: Tue Apr 6 10:07:28 2010 -0700 defconfig: automatic update Signed-off-by: David Brown commit 17814c2160184fe49def73744a78aa1869991943 Author: Trilok Soni Date: Tue Apr 6 19:59:50 2010 +0530 input: pmic8058_keypad: Fix debounce time for RevB0 Fix debounce time calculation for RevB0 as it programs one range up the value of supplied time. Change-Id: Ibd78c7de8ae1a211bd87c4529fa73aaded1f4993 Signed-off-by: Trilok Soni commit 6bcef8ec0e5ebca8acd8843ca24906db126a01c9 Author: Trilok Soni Date: Tue Apr 6 18:46:25 2010 +0530 input: pmic8058_keypad: Optimize synchronous read operations Setting the ReadState bit to '1' is only required once, the current approach would set it twice if there are more than one events, in which case kp_read_data gets invoked twice. Move ReadState bit set operations out of kp_read_data routine so that it gets set only once. Change-Id: I8c6ceb9ccee3cb076872adfddeea50a4fc8bd29e Signed-off-by: Trilok Soni commit 112595d2baa0a127f3f4fef3995d8f20ad49a952 Author: Pfeffer, Zach Date: Mon Mar 22 10:55:00 2010 -0700 upgrade: Replace Google's MSM files from 2.6.32 with QuIC's from 2.6.29b This is a giant squashed version of all changes on the QuIC MSM 2.6.29 kernel applied to Google's 2.6.32 kernel. This brings in the changes as of commit ID: ce4430c9a2a61e335c6b0771119f82c1a9e7baf0 This squashed tree is intended to allow development to continue without interruption on the kernel, while a proper history for these changes will be on another branch. In addition to Qualcomm/QuIC authored changes, the following patches have also been brought into this tree: commit 0bb6bdefe8fb1cad141fa16f83d70f9ea7f35582 Author: Adrian Hunter Date: Fri Jan 8 14:43:00 2010 -0800 mmc_block: fix queue cleanup The main bug was that 'blk_cleanup_queue()' was called while the block device could still be in use, for example, because the card was removed while files were still open. In addition, to be sure that 'mmc_request()' will get called for all new requests (so it can error them out), the queue is emptied during cleanup. This is done after the worker thread is stopped to avoid racing with it. Finally, it is not a device error for this to be happening, so quiet the (sometimes very many) error messages. Change-Id: I4472d3c5888186754f549e9307c489ea33613c4a Signed-off-by: Adrian Hunter Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat CRs-fixed: 229571 [stummala@qualcomm.com: Back port original patch to 2.6.29 kernel] Signed-off-by: Sahitya Tummala commit f5b5bfb4e8d791e8d3b993f65bbe3bd506bdb150 Author: Jarkko Lavinen Date: Fri Jan 8 14:42:59 2010 -0800 mmc_block: fix probe error cleanup bug If mmc_blk_set_blksize() fails mmc_blk_probe() the request queue and its thread have been set up and they need to be shut down properly before putting the disk. Change-Id: I5cc90037a4c10d6c8e213bf765907eef57537254 Signed-off-by: Jarkko Lavinen Signed-off-by: Adrian Hunter Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat Signed-off-by: Sahitya Tummala commit 3fef574ddd3bf6501f6bc6b6a30e79fd17c257ab Author: Anna Lemehova Date: Fri Jan 8 14:42:58 2010 -0800 mmc_block: add dev_t initialization check When a card is removed before mmc_blk_probe() has called add_disk(), then the minor field is uninitialized and has value 0. This caused mmc_blk_put() to always release devidx 0 even if 0 was still in use. Then the next mmc_blk_probe() used the first free idx of 0, which oopses in sysfs, since it is used by another card. Change-Id: Ia3272a0a2cae0fbe6fa885a7a41355d66b5dfc5e Signed-off-by: Anna Lemehova Signed-off-by: Adrian Hunter Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat Signed-off-by: Sahitya Tummala commit 8d973b3c9730a6ac78f41c26b1b42db848b777a5 Author: Russell King Date: Mon Sep 7 15:06:42 2009 +0100 ARM: Fix pfn_valid() for sparse memory On OMAP platforms, some people want to declare to segment up the memory between the kernel and a separate application such that there is a hole in the middle of the memory as far as Linux is concerned. However, they want to be able to mmap() the hole. This currently causes problems, because update_mmu_cache() thinks that there are valid struct pages for the "hole". Fix this by making pfn_valid() slightly more expensive, by checking whether the PFN is contained within the meminfo array. Change-Id: Ife73699cd98228278272a38bff44c750fbe10125 Signed-off-by: Russell King Signed-off-by: Michael Bohan Tested-by: Khasim Syed Mohammed commit 34928124c0d94ded5c1487ab74438161a44ae833 Author: Eric Dumazet Date: Wed Jul 8 19:36:05 2009 +0000 net: sk_prot_alloc() should not blindly overwrite memory Some sockets use SLAB_DESTROY_BY_RCU, and our RCU code correctness depends on sk->sk_nulls_node.next being always valid. A NULL value is not allowed as it might fault a lockless reader. Current sk_prot_alloc() implementation doesnt respect this hypothesis, calling kmem_cache_alloc() with __GFP_ZERO. Just call memset() around the forbidden field. CRs-fixed: 225694 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Naveen Ramaraj commit e5a337f9922144c945808e6a88e28868ab7d2bc6 Author: Nick Pelly Date: Fri Nov 13 14:16:32 2009 -0800 Bluetooth: Enter active mode before establishing a SCO link. When in sniff mode with a long interval time (1.28s) it can take 4+ seconds to establish a SCO link. Fix by requesting active mode before requesting SCO connection. This improves SCO setup time to ~500ms. Bluetooth headsets that use a long interval time, and exhibit the long SCO connection time include Motorola H790, HX1 and H17. They have a CSR 2.1 chipset. Verified this behavior and fix with host Bluetooth chipsets: BCM4329 and TI1271. 2009-10-13 14:17:46.183722 > HCI Event: Mode Change (0x14) plen 6 status 0x00 handle 1 mode 0x02 interval 2048 Mode: Sniff 2009-10-13 14:17:53.436285 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17 handle 1 voice setting 0x0060 2009-10-13 14:17:53.445593 > HCI Event: Command Status (0x0f) plen 4 Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1 2009-10-13 14:17:57.788855 > HCI Event: Synchronous Connect Complete 0x2c) plen 17 status 0x00 handle 257 bdaddr 00:1A:0E:F1:A4:7F type eSCO Air mode: CVSD CRs-fixed: 228729 Signed-off-by: Nick Pelly Signed-off-by: Marcel Holtmann Signed-off-by: Ron Shaffer commit 5558bb58e7aee909c11f5ec94216328d6339a1dc Author: Erik Gilling Date: Tue Aug 25 20:09:12 2009 -0700 power: wakelocks: fix buffer overflow in print_wake_locks Change-Id: Ic944e3b3d3bc53eddc6fd0963565fd072cac373c Signed-off-by: Erik Gilling Signed-off-by: Bryan Huntsman commit 7f82ff973021305e4fba0bed130af68621f5a546 Author: Andrei Emeltchenko Date: Thu Sep 3 12:34:19 2009 +0300 Bluetooth: Set general bonding security for ACL by default This patch fixes double pairing issues with SSP. It was observed that when pairing with SSP bluez asks confirmation 2 times. http://www.spinics.net/lists/linux-bluetooth/msg02473.html This also causes bug when we initiate SSP connection from Vista. The reason is because bluetoothd does not store link keys since ioctl HCIGETAUTHINFO returns 0. Setting default general bonding fixes these issues. Signed-off-by: Andrei Emeltchenko Signed-off-by: David Scherba commit ef13103668a962788c80969bd1529051b51eb0c1 Author: Marcel Holtmann Date: Tue Apr 28 09:04:55 2009 -0700 Bluetooth: Fix connection establishment with low security requirement The Bluetooth 2.1 specification introduced four different security modes that can be mapped using Legacy Pairing and Simple Pairing. With the usage of Simple Pairing it is required that all connections (except the ones for SDP) are encrypted. So even the low security requirement mandates an encrypted connection when using Simple Pairing. When using Legacy Pairing (for Bluetooth 2.0 devices and older) this is not required since it causes interoperability issues. To support this properly the low security requirement translates into different host controller transactions depending if Simple Pairing is supported or not. However in case of Simple Pairing the command to switch on encryption after a successful authentication is not triggered for the low security mode. This patch fixes this and actually makes the logic to differentiate between Simple Pairing and Legacy Pairing a lot simpler. Based on a report by Ville Tervo Signed-off-by: Marcel Holtmann Signed-off-by: David Scherba commit 7e17dbe4258affd7cbb7416e3ec97f8f4e5cfef2 Author: Dima Zavin Date: Mon Dec 14 01:13:05 2009 -0800 [ARM] msm: kgsl: Fix a typo when checking pmem region size Change-Id: Icab8179e15569c77762e24764380f8f97d0d43e2 Signed-off-by: Dima Zavin [sadas@quicinc.com: Changed the offset where patch is applied] Signed-off-by: Shubhraprakash Das commit fec6a78be8407bdd4db8a27d674f3578a0b65e6d Author: Dima Zavin Date: Fri Dec 4 20:26:50 2009 -0800 [ARM] msm: kgsl: allow the framebuffer to be mapped into the mmu The from_pmem ioctl can now accept an fd for the framebuffer, and create an mmu mapping so that the GPU can render straight into the fb. Change-Id: I8845eb9ee3ce793349e71785311655c8b096e6eb Signed-off-by: Dima Zavin [sadas@quicinc.com: Patch applied to a different driver version] Signed-off-by: Shubhraprakash Das commit 7c31d95fcb7bee83bd404f35f685654e652e7ef8 Author: Dima Zavin Date: Thu Jan 21 15:41:54 2010 -0700 [ARM] msm: kgsl: allow the framebuffer to be mapped into the mmu The from_pmem ioctl can now accept an fd for the framebuffer, and create an mmu mapping so that the GPU can render straight into the fb. Signed-off-by: Dima Zavin Signed-off-by: Shubhraprakash Das commit 6e53aca28623e3ad64248cf58e11c266878dda10 Author: HK Chen Date: Fri Dec 18 14:06:35 2009 +0800 [ARM] msm: q6audio: remove device gain control for pcm playback. Change-Id: Id243b6771a6a324931afa86c662eef8b907b213b Signed-off-by: Dima Zavin Signed-off-by: Bryan Huntsman commit 238cffe059b35a2b8b8713190bc7c942653a5c69 Author: Brian Swetland Date: Sun Dec 13 23:07:50 2009 -0800 qsd8k: audio: avoid incorrect sampling rate on first input pcm open Also avoid double calling audio_tx_analog_enable() Signed-off-by: Brian Swetland Signed-off-by: Paul Eastham Signed-off-by: Bryan Huntsman commit e607fd448e1cee97c75930a9e7c2cd2ab7985f4c Author: Iliyan Malchev Date: Thu Dec 10 15:06:39 2009 -0800 [ARM] qsd8k: initialize the spinlock in dal_client Signed-off-by: Iliyan Malchev Signed-off-by: Bryan Huntsman commit 23dd3b2c8ed63ec70a34165e1178f5cfb98d3670 Author: Brian Swetland Date: Mon Dec 7 19:33:16 2009 -0800 qsd8k: audio: reorder audio path setup around pcm open Some clicks and pops on stream start are avoided if the audio path setup is deferred until after the stream is opened but before the stream is started. The whole audio path management scheme wants some serious rewriting, but for now we'll stick with a minimal-risk change. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit fc8ad462433053e5db50ab42a85419cb3c83ac25 Author: Brian Swetland Date: Mon Nov 30 14:46:19 2009 -0800 qsd8k: audio: do not require acdb_ids on channel open This allows the simple case of using the default device to work. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 3ec7669f03d3fe2ba2f0fe5f896d331df8e59d95 Author: HK Chen Date: Fri Nov 20 11:36:09 2009 +0800 qsd8k: audio: change the timing when ACDB updates to avoid tick sound during voice call. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 8403702f649d02351207a840bb480349e20d40fd Author: HK Chen Date: Fri Nov 20 11:29:25 2009 +0800 qsd8k: audio: change the timing for ADIE enable/disable. Avoid pop noises. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit cba23c471e44153c77781af6efce3e6dbf105f6e Author: HK Chen Date: Sat Nov 14 06:24:07 2009 +0800 qsd8k: audio: remove redundant ACDB updates during audio route changes. Audio HAL will pass the ACDB ID to audio driver when audio route changes. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit b41b084357333dc11767e1cdb18adbdf6d0ee225 Author: HK Chen Date: Fri Nov 13 13:44:19 2009 +0800 qsd8k: audio: remove redundant ACDB updates for audio playback and recording. q6audio_open_*() now takes an acdb_id to allow the device to be changed as part of the channel open process. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit fdf1684fe87bc0960fc7349ca92824153445f017 Author: HK Chen Date: Wed Nov 18 07:28:26 2009 +0800 qsd8k: audio: clean up code for ACDB update. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 88c0abf08173a90cc07bfcda192d29fece5d9d7c Author: HK Chen Date: Wed Nov 25 11:19:29 2009 -0800 [ARM] qsd8k: audio: fix typo in q6audio_devices.h Signed-off-by: Iliyan Malchev Signed-off-by: Bryan Huntsman commit ec482ea18f77a2f7999dfc2fe23eb30b271c306d Author: Brian Swetland Date: Mon Nov 23 06:14:37 2009 -0800 qsd8k: audio: pcm_out: default buffer size is now 3072 Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 6e102b8ca980bbff681c067861bcf15dfcb6a613 Author: Brian Swetland Date: Mon Nov 16 21:39:02 2009 -0800 qsd8k: audio: enhance stuck dal debugging Dump the packet we were in the act of sending, if we timed out while waiting for a reply. This covers the situation of failing on a different channel than one being traced. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit cf65b5f23367f65f5a90d7bc731228d0c8f0f733 Author: HK Chen Date: Sat Nov 14 13:21:35 2009 +0800 Revert "qsd8k: audio: change the command order of path control." This reverts commit a44a2f4d5852a2830e821f8203aef52b5b69f3b2. Change-Id: I2f4b04c6d757170c8604c57803805253b05165ae Signed-off-by: Dima Zavin Signed-off-by: Bryan Huntsman commit 9fff6137d40a6cbcdd54960387c89007ecd4c2c8 Author: HK Chen Date: Wed Nov 11 04:53:06 2009 +0800 qsd8k: audio: fix bongus ID look up in q6audio_set_rx_volume(). Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 3a4adb7e4f2a24ffa5c007a9a5cf0500bed0285b Author: Brian Swetland Date: Wed Nov 11 22:59:44 2009 -0800 qsd8k: audio: correctly release the firmware on acdb change Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit ea284ceca18365cc17be51b307ac20ea8e18a832 Author: Brian Swetland Date: Tue Nov 10 21:08:09 2009 -0800 qsd8k: trace dal io and dump it on fatal error Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 1bd636ee346ed0f87bcc01a0509f0028b0dba4f1 Author: Brian Swetland Date: Tue Nov 10 21:07:14 2009 -0800 qsd8k: dal: add tracing capabilities to DAL channels If requested, log the last 32 calls, replies, and/or events. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 01cf30eee4cc41b943a286d871f20be90cec8a91 Author: HK Chen Date: Tue Nov 10 17:27:58 2009 -0800 qsd8k: audio: fix ordering of analog/digital power up sequencing for tx Avoids noise on audio input. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 3af1f1a44f86b85f88f3e70d787c629bc2f84c83 Author: HK Chen Date: Sat Nov 7 04:05:10 2009 +0800 qsd8k: audio: change the command order of path control. This more closely matches the QCT CAD "Common Audio Driver" and is probably more correct. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit ed4ef1033b57fbec1580bb8a378026364b0b3194 Author: HK Chen Date: Wed Nov 4 12:30:19 2009 +0800 qsd8k: audio: fix volume control. Per QCT's comments, volume control only works when there are active audio/voice sessions, or DSP will return status 20 (UNSUPPORTED). To solve this issue, QCT has introduced new voice device ID which is using for in-call volume control. It will directly apply the volume setting to next voice call. Also, for in-call uplink volume, remove the redundant volume setting and use the default setting in DSP (0dB as default). Signed-off-by: Brian Swetland [bryanh@quicinc.com: removed audio_tx_volume()] Signed-off-by: Bryan Huntsman commit c762bda738523ecc8094b348098a20c7feaa8e3f Author: Brian Swetland Date: Thu Nov 5 20:54:55 2009 -0800 qsd8k: audio: tracing, and stuck dsp panic code If the dsp doesn't respond in 5s, it will probably never respond, leaving the device in a bad state -- panic in that case. Add some debug chatter on pcm in/out open and close as well. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 8bcd73cb7b5349d873f38c84313d4e87ad172359 Author: HK Chen Date: Sat Oct 31 07:33:28 2009 +0800 qsd8k: audio: change the buffer size in pcm driver from 8192 to 4800. Userspace expects 4800 default. Easier to fix it on this side. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit c0a2b6fdf8772e3856f4b40a221d86c754651b16 Author: HK Chen Date: Sat Oct 31 07:03:05 2009 +0800 qsd8k: audio: fix recording fail issue when sampling rate higher than 8K. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 695db3dadd661492b3054ecf8d0c495b48951914 Author: HK Chen Date: Wed Oct 28 15:41:04 2009 +0800 qsd8k: audio: add support for stream volume. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 5f5aa0b4ddbc9c10318ba1f74c3141371d5224af Author: HK Chen Date: Fri Oct 30 21:14:49 2009 -0700 qsd8k: audio: support ACDB reinitialization Signed-off-by: Brian Swetland [bryanh@quicinc.com: adjusted ioctl values] Signed-off-by: Bryan Huntsman commit 3e728d64e2616866d14a679e7a9d41cd7e4fd968 Author: HK Chen Date: Tue Oct 20 16:36:02 2009 +0800 qsd8k: add receiver analog control Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit 815b4f4b959853df4ac7267239d0d532f8f19677 Author: HK Chen Date: Fri Oct 23 22:00:19 2009 +0800 qsd8k: audio: fix q6audio_update_acdb(). Correctly indicate RX or TX device. Signed-off-by: Brian Swetland Signed-off-by: Bryan Huntsman commit a67dd513da8bc07de843151f758bc7e86fa9c3e1 Author: Brian Swetland Date: Tue Oct 27 14:24:10 2009 -0700 qsd8k: audio: move to new dsp protocol (3200.04+) Signed-off-by: Brian Swetland [bryanh@quicinc.com: fixed dal_attach() args] Signed-off-by: Bryan Huntsman commit e7479ccaa2fc97f66299948c1e05da4868e6927b Author: Mike Chan Date: Mon Oct 26 17:48:34 2009 -0700 [ARM] msm: qdsp: add wakelocks Signed-off-by: Mike Chan commit 6525e7c62a758026309d2ffa45394dff249bc585 Author: Brian Swetland Date: Sat Oct 24 15:30:40 2009 -0700 qsd8k: audio: handle transient errors during pcm stream open Sometimes we get an EUNSUPPORTED (?!) error while trying to open a pcm stream. If we retry in 1ms it succeeds. Add some debugging/tracing code handy for diagnosing issues like this (disabled by default). Signed-off-by: Brian Swetland commit b9c959f9db47cefb326d3ffeac3a54744ac9bfed Author: stevel Date: Tue Jun 16 15:27:45 2009 -0400 [ARM] msm: usb: gadget: Configure endpoints properly in msm72k_enable Fixes a problem with full-speed USB support. Signed-off-by: Mike Lockwood [vskrishn@qualcomm.com: Merged and changed INFO to dev_dbg] CRs-fixed: 220967, 217231 Signed-off-by: Vamsi Krishna commit 4c5d3b7fedce339c85bf3eba46073a2ab3ad59fb Author: Russell King - ARM Linux Date: Wed Oct 14 12:28:38 2009 -0700 ARM: dma-mapping: switch ARMv7 DMA mappings to retain 'memory' attribute On ARMv7, it is invalid to map the same physical address multiple times with different memory types. Since system RAM is already mapped as 'memory', subsequent remapping of it must retain this attribute. However, DMA memory maps it as "strongly ordered". Fix this by introducing 'pgprot_dmacoherent()' which provides the necessary page table bits for DMA mappings. Signed-off-by: Russell King Change-Id: Ia937a13ef557d3f207c0df75d09bb5d8dc4c673f Signed-off-by: Abhijeet Dharmapurikar commit 83c6bfec6bb39e888a757676d46c99cb56b839f1 Author: Russell King - ARM Linux Date: Wed Oct 14 12:28:38 2009 -0700 ARM: dma-mapping: switch ARMv7 DMA mappings to retain 'memory' attribute On ARMv7, it is invalid to map the same physical address multiple times with different memory types. Since system RAM is already mapped as 'memory', subsequent remapping of it must retain this attribute. However, DMA memory maps it as "strongly ordered". Fix this by introducing 'pgprot_dmacoherent()' which provides the necessary page table bits for DMA mappings. Signed-off-by: Russell King Change-Id: Ic0f02f8e85f02abf6ad1542bb23fbefd13122c00 Signed-off-by: Abhijeet Dharmapurikar commit d97b2968ec22e69f8457f78af84b7d91b8b4b1f7 Author: Iliyan Malchev Date: Fri Jun 5 15:29:54 2009 -0700 msm: adsp: retry msm_adsp_write() when a queue is full. Commit fee2df57284bcca209ad9cf9ab5f7cf895592b3f replaced an mdelay(1) with a udelay(1) in two places, which sped up msm_adsp_write() considerably in those cases where we did not have to wait for the DSP to get ready for a command. This had the side effect that back-to-back DSP commands can be rejected by the DSP for a given DSP module and queue number when the DSP is still busy processing the last command for that queue. This patch retries sending the command 100 times (for up to ~1ms) in such situations. CRs-Fixed: 219055 Signed-off-by: Iliyan Malchev Signed-off-by: Suresh Vankadara commit 03be10b44c3018c25b3d7b7547d527839b17bb52 Author: Kyungmin Park Date: Thu Oct 29 16:16:47 2009 +0530 haptic: ISA1200 haptic device support I2C based ISA1200 haptic driver support. This chip supports both internal and external. But only external configuration are implemented. Signed-off-by: Kyungmin Park Signed-off-by: Mohan Pallaka commit 6d3baacd67178633f37dd6f50630d3790095208e Author: Brian Swetland Date: Thu Jul 30 15:04:57 2009 -0700 {ARM] msm: qsd8k: support for qdsp6 audio subsystem Provide support for QDSP6's AUDIO service, as well as the A9's ACDB (Audio Config Database) and ADIE services, necessary for audio operation. Provide pcm in/out drivers. Major contributions, and submitted on behalf of HK Chen @ HTC. Signed-off-by: Brian Swetland Cc: HK Chen [zpfeffer@quicinc.com: Merged and changed some ioctls] Signed-off-by: Zach Pfeffer commit ab4681360e309e0fb91a5b82d7fe429d9d9de012 Author: Dima Zavin Date: Sun Oct 18 02:07:48 2009 -0700 [ARM] msm: Add qdsp6 config option and makefile Change-Id: I6120d03a96339139d4d88f32e165d26b75ac805e Signed-off-by: Dima Zavin [zpfeffer@quicinc.com: remove old snd init, bug fix, merge Kconfig] Signed-off-by: Zach Pfeffer commit 9fd3e7a18582fb889b26c3c66c74d9f5c445afa8 Author: Paul Gortmaker Date: Thu Dec 3 09:53:14 2009 -0500 To fully support the armv7-a instruction set/optimizations, support for the R_ARM_MOVW_ABS_NC and R_ARM_MOVT_ABS relocation types is required. The MOVW and MOVT are both load-immediate instructions, MOVW loads 16 bits into the bottom half of a register, and MOVT loads 16 bits into the top half of a register. The relocation information for these instructions has a full 32 bit value, plus an addend which is stored in the 16 immediate bits in the instruction itself. The immediate bits in the instruction are not contiguous (the register # splits it into a 4 bit and 12 bit value), so the addend has to be extracted accordingly and added to the value. The value is then split and put into the instruction; a MOVW uses the bottom 16 bits of the value, and a MOVT uses the top 16 bits. CRs-fixed: 219405 Signed-off-by: David Borman Signed-off-by: Bruce Ashfield Signed-off-by: Paul Gortmaker Signed-off-by: Franco Venturi commit 1479dea4c9fa0b6c35d1112b446a857675f348da Author: Alan Cox Date: Thu Jun 11 13:56:16 2009 +0100 tty: fix bluetooth scribbling on low latency flags Bluetooth shouldn't be doing this as most drivers don't support the flag, furthermore it shouldn't be needed with newer buffering. This becomes rather more visible as the locking fixes make the abuse of low_latency visible as spew on the users console/dmesg. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds Signed-off-by: Sankalp Bose commit 9c51e4a71a723b5df786b646eef876fc73bfac35 Author: Brian Swetland Date: Tue Jul 14 11:26:42 2009 -0700 [ARM] msm: qsd8k: Device Access Layer (DAL) RPC Device Access Layer (DAL) RPC is yet another remote interface to software on the baseband and dsp processors of the msm7k/qsd8k family. It uses SMD as a transport. Signed-off-by: Brian Swetland Signed-off-by: Zach Pfeffer commit 1bbef63b6775e2f032ba2f57ab1e2fdb78ea1e46 Author: Kyungmin Park Date: Tue Oct 27 15:32:52 2009 +0530 Haptic: add haptic configuration (v2) haptic class support Changelog v1: Fix typo Signed-off-by: Kyungmin Park Reviewed-by: Trilok Soni Signed-off-by: Mohan Pallaka commit 000b6230fd16696b9b27a860668c7ede177c65f7 Author: Kyungmin Park Date: Tue Oct 27 15:25:00 2009 +0530 Haptic: Add haptic maintainer Add me to haptic class maintainer Signed-off-by: Kyungmin Park Signed-off-by: Mohan Pallaka commit 1d31b0f3b67dd65851a99385795bc75ec45dd4e2 Author: Kyungmin Park Date: Fri Oct 9 09:01:20 2009 +0000 Haptic: Documentation for haptic class (v2) Describe the haptic class and how to use Changelog v1: Apply comments and feedbacks Signed-off-by: Kyungmin Park Reviewed-by: Trilok Soni Signed-off-by: Mohan Pallaka commit 6760ecc0f36223eead20a3e4b16e9ddb566f43fd Author: Kyungmin Park Date: Wed Oct 7 06:17:01 2009 +0000 Haptic: add haptic class New haptic class support. This class handles the haptic devices. Signed-off-by: Kyungmin Park Reviewed-by: Trilok Soni Signed-off-by: Mohan Pallaka commit 17e93c592f2bfa9184f47d589813497563817690 Author: Charles Manning Date: Mon Oct 5 10:01:49 2009 -0700 yaffs: Read performance optimization YAFFS supports the idea of "chunk groups" which allow the tnode entries to be smaller. For example, if we have 2^17 chunks but only 16 bits of tnode, then each chunk group is 2 ^ (17-16) = 2 entries. If chunk groups are being used then we don't know exactly which chunk is being references and we have to search for the chunk by reading the tags. If you're using wide tnodes then the chunk group is size 1 then there is no need to search since we know which it is. We thus don't need to do the read-and-search. On our phone target hardware, write performance remained unchanged, but read performance improved by appx 35%, measured with LMDD with the OnDemand CPU governor. Signed-off-by: Charles Manning Signed-off-by: David Neiss commit 7be6888c775386d6ec044d9cf48e90fe84695664 Author: Henrik Rydberg Date: Sat May 23 09:51:20 2009 -0700 Input: multitouch - add tracking ID to the protocol There are a few multi-touch devices that support finger tracking well in hardware, Stantum being the prime example. By exposing the tracking ID in the MT protocol, evdev bandwidth and cpu usage in user space can be reduced. This patch adds the ABS_MT_TRACKING_ID to the MT protocol. Signed-off-by: Henrik Rydberg Tested-by: St��phane Chatty Signed-off-by: Dmitry Torokhov Signed-off-by: Trilok Soni commit 50eed727e531666a611cfc6300a3cd1b2ff77ce6 Author: Henrik Rydberg Date: Tue Apr 28 07:47:33 2009 -0700 Input: add detailed multi-touch finger data report protocol In order to utilize the full power of the new multi-touch devices, a way to report detailed finger data to user space is needed. This patch adds a multi-touch (MT) protocol which allows drivers to report details for an arbitrary number of fingers. The driver sends a SYN_MT_REPORT event via the input_mt_sync() function when a complete finger has been reported. In order to stay compatible with existing applications, the data reported in a finger packet must not be recognized as single-touch events. In addition, all finger data must bypass input filtering, since subsequent events of the same type refer to different fingers. A set of ABS_MT events with the desired properties are defined. The events are divided into categories, to allow for partial implementation. The minimum set consists of ABS_MT_TOUCH_MAJOR, ABS_MT_POSITION_X and ABS_MT_POSITION_Y, which allows for multiple fingers to be tracked. If the device supports it, the ABS_MT_WIDTH_MAJOR may be used to provide the size of the approaching finger. Anisotropy and direction may be specified with ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MINOR and ABS_MT_ORIENTATION. Devices with more granular information may specify general shapes as blobs, i.e., as a sequence of rectangular shapes grouped together by a ABS_MT_BLOB_ID. Finally, the ABS_MT_TOOL_TYPE may be used to specify whether the touching tool is a finger or a pen. Signed-off-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov Signed-off-by: Trilok Soni commit 7424538ca56a13aae145c8d71d26a75e58a6a1c0 Author: Henrik Rydberg Date: Tue Apr 28 07:45:31 2009 -0700 Input: allow certain EV_ABS events to bypass all filtering With the upcoming multi-touch interface as an example, there is a need to make certain that all reported events actually get passed to the event handler. This patch equips the input core with the ability to bypass all filtering for certain EV_ABS events. Signed-off-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov Signed-off-by: Trilok Soni commit 5018df68f75b481db48e521f322f0fb5e0545fee Author: Dima Zavin Date: Mon Mar 30 18:36:59 2009 -0700 msm: Add touchscreen device definition Signed-off-by: Dima Zavin Signed-off-by: Mohan Pallaka commit 9da6621c4933b1ac213219050ea36f58fdfc3e58 Author: George G. Davis Date: Wed Apr 1 20:27:18 2009 +0100 [ARM] 5440/1: Fix VFP state corruption due to preemption during VFP exceptions We've observed that ARM VFP state can be corrupted during VFP exception handling when PREEMPT is enabled. The exact conditions are difficult to reproduce but appear to occur during VFP exception handling when a task causes a VFP exception which is handled via VFP_bounce and is then preempted by yet another task which in turn causes yet another VFP exception. Since the VFP_bounce code is not preempt safe, VFP state then becomes corrupt. In order to prevent preemption from occuring while handling a VFP exception, this patch disables preemption while handling VFP exceptions. Signed-off-by: George G. Davis Acked-by: Catalin Marinas Signed-off-by: Russell King Signed-off-by: Dave Estes commit 0c86a834f655c51df1daf88ed75d8a9136c51ba2 Author: Arve Hj��nnev��g Date: Wed Jun 24 17:50:40 2009 -0700 [ARM] msm_serial_debugger: Support 19.2MHz clock. Signed-off-by: Arve Hj��nnev��g [pkondeti@qualcomm.com: constants adjusted for a different clock divider value] Signed-off-by: Pavankumar Kondeti commit eba19702b374e0fc2acabef5db8ee41fd0f337f0 Author: Brian Swetland Date: Wed Apr 29 17:13:41 2009 -0700 msm_serial: detect uart clock and deal with tcxo or tcxo/4 Signed-off-by: Brian Swetland [pkondeti@qualcomm.com: constants adjusted for a different clock divider value] Signed-off-by: Pavankumar Kondeti commit 3540c3ea87634e83015f29dfc1f8f926e8c74f78 Author: Dima Zavin Date: Mon Mar 30 18:35:36 2009 -0700 input: Add driver for Qualcomm MSM touchscreen controller Signed-off-by: Dima Zavin Signed-off-by: Mohan Pallaka commit a32673698a6d174414852425a25fb9340ec55ac5 Author: Tero Kristo Date: Tue Aug 18 17:40:29 2009 -0700 Cpufreq: Added input event hook to ramp up cpu frequency This will cause switch to maximum opp immediately when user interaction occurs, i.e. touchscreen input or keypad activity. Signed-off-by: Tero Kristo Signed-off-by: Jouni Hogander commit de9153895821ae7dc48ee723625deff86d82725b Author: Iliyan Malchev Date: Fri Jun 12 16:45:19 2009 -0700 [ARM] msm: camera: mt9t013: correct for overexposure on snapshots Signed-off-by: Iliyan Malchev commit f84d0c16c373d9b9f93994940d8973cfba50dd7e Author: Iliyan Malchev Date: Wed Jun 10 13:51:23 2009 -0700 [ARM] msm: mt9t013: fix check for maximum autoexposure value Signed-off-by: Iliyan Malchev commit 16bc906bc81d6be2cfcf0469aaf43753d366c0e0 Author: Iliyan Malchev Date: Wed Jun 3 15:36:24 2009 -0700 [ARM] msm: camera: rename all instances of struct _t to struct -- There were a number of instances where a (non-typedef'ed) struct or enum was named foo_t instead of foo. -- There were variables that ended on _t. This patch removes the trailing _t from these names. -- Renamed the old struct mm_vfe_resp_t to struct msm_vfe_callback. This is more descriptive and avoids a name clash with the already-extant struct msm_vfe_resp. Signed-off-by: Iliyan Malchev commit c45130469ab368e2e5e10e5137c45039b4150296 Author: Iliyan Malchev Date: Wed Jun 3 14:10:19 2009 -0700 [ARM] msm: camera: move msm_camera.c and msm_v4l2.c under msm/ Signed-off-by: Iliyan Malchev commit 95519621e24e5cf6efa133105dde78e75cc3f7fe Author: Iliyan Malchev Date: Tue Jun 2 18:16:43 2009 -0700 [ARM] msm: sapphire: camera: fix sensor orientation Signed-off-by: Iliyan Malchev commit 647f46cda26523c696116d77d6f169c47fd41c32 Author: Iliyan Malchev Date: Mon Jun 1 17:04:02 2009 -0700 [ARM] msm: enable new camera implementation Signed-off-by: Iliyan Malchev commit be6036fccefcfe84f66156c7bf32899866247eb3 Author: Iliyan Malchev Date: Thu May 21 15:31:42 2009 -0700 [ARM] msm: camera: add non-blocking control ioctl Signed-off-by: Iliyan Malchev commit a5c8b2150614ee699e766ada159d6dd2b36b3dea Author: Iliyan Malchev Date: Sun May 17 18:12:41 2009 -0700 [ARM] msm: camera: allow the control node to be opened multiple times -- created new msm_control_device_t structure for control nodes -- msm_control_device points to an msm_device_t -- moved ctrl_status_q from sync_t into msm_control_device_t -- restored the timeout in msm_control -- moved MSM_CAM_IOCTL_CTRL_CMD_DONE to msm_ioctl_control -- FIXME: the v4l2 frontend -- added a resp_fd to msm_ctrl_cmd_t which the control thread sets so that the config thread knows to which control device to send a MSM_CAM_IOCTL_CTRL_CMD_DONE. Signed-off-by: Iliyan Malchev commit 16cc27521652f072480b01c8759a69deb60e37b9 Author: Iliyan Malchev Date: Fri May 8 16:13:40 2009 -0700 [ARM] msm: camera: ignore timeout from control thread -- ioctl()s from the control thread may time out before the config thread has a chance to react, which will bring the config thread out of sync with the control thread; the best solution for now is to ignore the timeout values. This will have the side effect that bugs in userspace in the config and control threads will cause the control thread to block forever on an ioctl(), unless interrupted by a signal. -- Remove an unnecessary copy from user space for zero-length user buffers. -- Disable msm_camera debug. Signed-off-by: Iliyan Malchev commit a14c8f18e178d19c71e6ecd7244e4e3297a44ae0 Author: Iliyan Malchev Date: Thu May 7 17:26:29 2009 -0700 [ARM] msm: camera: CFG_GET_AF_MAX_STEPS + mt9t013 autofocus support + cleanup -- replaced incorrect EFAULT codes with EIO and EINVAL where appropriate -- fixed some indentation -- added power-on and power-off for autofocus module on mt9t013 sensor -- this needs to be improved: power on and off only when we do AF -- removed superfluous debug from samsung sensor driver (s5k3e2fx) -- in msm_camera.c, commented out error-recovery code in __msm_control -- added CFG_GET_AF_MAX_STEPS support for all camera sensors Signed-off-by: Iliyan Malchev commit 9c12ef88c869bdef2c4bc307f01ec6ac70c253eb Author: Iliyan Malchev Date: Wed Apr 29 21:30:02 2009 -0700 [ARM] msm: camera: major cleanup -- add MSM_DRAIN_QUEUE macros and use them -- remove all enumerations from msm_camera.h -- add an ioctl to unblock the frame thread -- drain queues selectively for frame and control threads -- add sensor_cfg_data_t::max_steps, which is not used at all right now -- NOTE: sensor_cfg_data_t->max_steps is not currently used Signed-off-by: Iliyan Malchev commit 1c969a48b453d64db972ee3c20bfa317ccb5467c Author: Iliyan Malchev Date: Mon Apr 27 15:48:19 2009 -0700 [ARM] msm: camera: reduce the number of kmallocs in frame callback -- in msm_vfe_sync(), remove one kmalloc() in the frame callback -- get rid of msm_camvfe_init() -- rename msm_vfe_phy_info --> msm_vfe_phy_info_t Signed-off-by: Iliyan Malchev commit 18e0307543a364949504543c623f06ddbe40edb8 Author: Iliyan Malchev Date: Mon Apr 27 14:53:34 2009 -0700 [ARM] msm: camera: clean up locking of queues in msm_device_t->sync Signed-off-by: Iliyan Malchev commit 4b3a0685a4132d31e3e2f59a87dbfb59f1b9edbe Author: Iliyan Malchev Date: Mon Apr 27 13:04:47 2009 -0700 [ARM] msm: camera: unify mutex handling, clean up code Signed-off-by: Iliyan Malchev commit a45afbbef27ada271a45b1980577b673e07d390e Author: Iliyan Malchev Date: Thu Apr 23 18:48:33 2009 -0700 [ARM] msm: camera: split device nodes This splits /dev/msm_camera{0,1,...} into /dev/{frame,control,config}{0,1,...}, which allows us to handle the camera separately in user space from a proprietary configuration daemon, and a separate daemon for control (for snapshot, effects, etc) and receiving frames. Signed-off-by: Iliyan Malchev commit 725896c63fba12e4922459f1728d46d8bdd60c62 Author: Iliyan Malchev Date: Tue Apr 14 11:38:33 2009 -0700 [ARM] msm: camera: add support for flash (disabled) + more fixes -- msm_camera.c: -- check for overlap in msm_pmem_table_add() -- fix a copy_to_user bug -- add MSM_CAM_IOCTL_FLASH_LED_CFG -- msm_vfe7x.c: implement vfe_7x_stop() -- renames mt9p012.c --> mt9p012_fox.c -- mt9t013 register update -- v4l2 updates Signed-off-by: Iliyan Malchev commit 0da88db015b95e029c315666316548aad881d7a3 Author: Iliyan Malchev Date: Tue Apr 14 01:15:04 2009 -0700 [ARM] msm: camera: add more checks to the pmem-lookup functions -- Added checks for failure for the following functions: msm_pmem_region_lookup, msm_pmem_frame_ptov_lookup, msm_pmem_stats_ptov_lookup, msm_pmem_frame_vtop_lookup, msm_pmem_stats_vtop_lookup -- Added explicit checks for CMD_GENERAL in several cases where vfe_config() is called -- With the exception of msm_config_vfe(), where both CMD_GENERAL and CMD_STATS_DISABLE are accepted, all other non-CMD_GENERAL are rejected as errors. Signed-off-by: Iliyan Malchev commit 9d97857f09e0d43895e45308575290e5c0fef39c Author: Iliyan Malchev Date: Mon Apr 13 18:51:18 2009 -0700 [ARM] msm: camera: simplify MSM_CAM_IOCTL_ENABLE_VFE, hook up DISABLE_VFE -- simplified camera_enable_cmd_t to include a fixed-size name field (32 chars) -- enable ioctl MSM_CAM_IOCTL_DISABLE_VFE Signed-off-by: Iliyan Malchev commit 4706f35fef62004147ab2321ae52032717c409ad Author: Iliyan Malchev Date: Mon Apr 13 17:46:49 2009 -0700 [ARM] msm: camera: return the correct value from __msm_get_pic Signed-off-by: Iliyan Malchev commit 55e10bb7d461ae18c7c231fb0f235f43706697ce Author: Iliyan Malchev Date: Wed Apr 8 14:21:37 2009 -0700 [ARM] msm: camera: conditionalize CDBG under CONFIG_MSM_CAMERA_DEBUG -- replaced those CDBG that report errors with pr_err -- added macros to report errors when copy_{from,to}_user fails -- simplified msm_pmem_table_add()'s prototype Signed-off-by: Iliyan Malchev commit ae56f7b9367edd6c0a57be00d4e302691d5c7bfe Author: Iliyan Malchev Date: Wed Apr 8 13:20:14 2009 -0700 [ARM] msm: remove unnecessary mutex from camera driver Signed-off-by: Iliyan Malchev commit 86dadf34ae756f7d82100aad3747b079ddf12f10 Author: Iliyan Malchev Date: Wed Apr 8 13:19:18 2009 -0700 [ARM] msm: sapphire: add support for 5M camera sensor Signed-off-by: Iliyan Malchev commit 0f28612cad3cf3110ef40135ac466a576ae339a9 Author: Iliyan Malchev Date: Fri Apr 3 16:10:33 2009 -0700 [ARM] msm: add an idle wakelock to the camera driver Signed-off-by: Iliyan Malchev commit d5f2794732bfb1d5722617bc369c2606f73f4a4b Author: Iliyan Malchev Date: Mon Jun 1 13:02:20 2009 -0700 [ARM] msm: report ADSP events #ifdef CONFIG_MSM_ADSP_REPORT_EVENTS Signed-off-by: Iliyan Malchev commit 8738a5e034d28b11f5c84c605d9bf5b537d5fb9f Author: Iliyan Malchev Date: Wed Apr 1 17:29:08 2009 -0700 [ARM] msm: AMSS >= 6350 swaps VFE_CLK and VFE_MDC_CLK Signed-off-by: Iliyan Malchev commit 9628b68fe17db6a01883bd20af7e11e05611c5f9 Author: Iliyan Malchev Date: Mon Jun 1 13:06:05 2009 -0700 [ARM] msm: camera: initial commit (disabled) Signed-off-by: Iliyan Malchev commit 03adf09bfd74640df03e05fd01c706f14c45b0b2 Author: KOSAKI Motohiro Date: Fri Jul 10 13:32:09 2009 -0400 [for -mm] mem_notify v6: support fasync feature implement FASYNC capability to /dev/mem_notify. fd = open("/dev/mem_notify", O_RDONLY); fcntl(fd, F_SETOWN, getpid()); fcntl(fd, F_SETSIG, SIGUSR1); flags = fcntl(fd, F_GETFL); /* when low memory, receive SIGUSR1 */ fcntl(fd, F_SETFL, flags|FASYNC); ChangeLog v5 -> v6: o rewrite usage example o cleanups number of wakeup tasks calculation. v5: new Signed-off-by: KOSAKI Motohiro commit 6445d5cf41863cae99180e9badaaecf30c86e64e Author: KOSAKI Motohiro Date: Fri Jul 10 13:30:37 2009 -0400 [for -mm] mem_notify v6: ignore very small zone for prevent incorrect low mem notify on X86, ZONE_DMA is very very small. it cause undesirable low mem notification. It should ignored. but on other some architecture, ZONE_DMA have 4GB. 4GB is large as it is not possible to ignored. therefore, ignore or not is decided by zone size. ChangeLog: v5: new Signed-off-by: KOSAKI Motohiro commit edbbfc01313df989fc749bd7883d2dc6003234a8 Author: KOSAKI Motohiro Date: Fri Jul 10 13:29:10 2009 -0400 [for -mm] mem_notify v6: add new mem_notify field to /proc/zoneinfo show new member of zone struct by /proc/zoneinfo. ChangeLog: v5: change display order to at last. Signed-off-by: Marcelo Tosatti Signed-off-by: KOSAKI Motohiro commit eacd4d2044a5fcae6bc277a790ad5bd008182077 Author: KOSAKI Motohiro Date: Fri Jul 10 13:27:03 2009 -0400 [for -mm] mem_notify v6: memory_pressure_notify() caller the notification point to happen whenever the VM moves an anonymous page to the inactive list - this is a pretty good indication that there are unused anonymous pages present which will be very likely swapped out soon. and, It is judged out of trouble at the following situations. o memory pressure decrease and stop moves an anonymous page to the inactive list. o free pages increase than (pages_high+lowmem_reserve)*2. ChangeLog: v5: add out of trouble notify to exit of balance_pgdat(). Signed-off-by: Marcelo Tosatti Signed-off-by: KOSAKI Motohiro commit 0fb1b16701edaff8677ced8191b9a06988a9da23 Author: KOSAKI Motohiro Date: Fri Jul 10 13:18:51 2009 -0400 [for -mm] mem_notify v6: introduce /dev/mem_notify new device (the core of this patch series) the core of this patch series. add /dev/mem_notify device for notification low memory to user process. fd = open("/dev/mem_notify", O_RDONLY); if (fd < 0) { exit(1); } pollfds.fd = fd; pollfds.events = POLLIN; pollfds.revents = 0; err = poll(&pollfds, 1, -1); // wake up at low memory ... ChangeLog v5 -> v6: o improve number of wakeup tasks fomula when task is a few. Signed-off-by: Marcelo Tosatti Signed-off-by: KOSAKI Motohiro commit ebbc1e86c57f0b936b6ec0d488b7e676b965f05c Author: Jarkko Lavinen Date: Thu Nov 27 14:30:32 2008 +0200 mmc: Accept EXT_CSD rev 1.3 since it is backwards compatible with 1.2 Signed-off-by: Jarkko Lavinen Signed-off-by: Pierre Ossman commit fac182b608376539d302692f742eaf24207c3609 Author: Robert Love Date: Thu Aug 28 10:50:55 2008 -0400 Fix spinlock recursion in msm_console_write msm_console_write properly locks port->lock, but we can end up in this function while already holding the lock if processing a sysrq or oops off of our own interrupt handler. Fix by using spin_trylock in the sysrq or oops case. Fix is ugly, but similar to what other serial drivers do. Signed-off-by: Robert Love Signed-off-by: Bryan Huntsman Signed-off-by: Zach Pfeffer Signed-off-by: David Brown commit 7541c803fdb9f49f84bbc19217dce7cdc5c1748d Author: Solomon Chiu Date: Wed Mar 3 15:49:57 2010 -0800 [ARM] qsd8k: mahimahi: enable support for rgb666 on post-EVT1 CDMA revs Signed-off-by: Iliyan Malchev commit 086b30d3c51f2cb9599fcb923918c58dfd099e19 Author: Solomon Chiu Date: Wed Mar 3 15:48:34 2010 -0800 [ARM] msm: mdp_lcdc: support output format rgb666 Signed-off-by: Iliyan Malchev commit 929ee91e83a3ef380b9c0ab573185d28923c846d Author: Solomon Chiu Date: Wed Mar 3 15:47:37 2010 -0800 [ARM] msm_fb: add definitions for RGB555 and RGB666 output interface formats Signed-off-by: Iliyan Malchev commit f797f5b9a88eb92e7834f0862857d047fc1031cd Author: Iliyan Malchev Date: Wed Mar 17 13:58:55 2010 -0700 [ARM] msm: msm_defconfig: increase mmap_min_addr to 32k A lot of kernel structures are larger than 4k, and so NULL-pointer dereferences could still be exploitable. Signed-off-by: Iliyan Malchev commit 4a8b102321f02bd4959f4a233535b3c6effa85c4 Author: Iliyan Malchev Date: Wed Mar 17 13:58:55 2010 -0700 [ARM] qsd8k: mahimahi_defconfig: increase mmap_min_addr to 32k A lot of kernel structures are larger than 4k, and so NULL-pointer dereferences could still be exploitable. Signed-off-by: Iliyan Malchev commit aeae9f779847b8574cee602a6e25f1eb18be6268 Author: Iliyan Malchev Date: Wed Mar 17 12:15:56 2010 -0700 [ARM] msm: msm_defconfig: switch to CFQ, set mmap_min_addr This brings msm_defconfig in sync with mahimahi_defconfig. Also, we disable explicitly setting CONFIG_XFRM_IPCOMP. It is still enabled indirectly via the settings in IPv4 and IPv6 that turn on support for IPCOMP. Signed-off-by: Iliyan Malchev commit 4efa13d323815641105ed7e0875caa681f4c3d98 Author: Dmitry Shmidt Date: Wed Mar 17 17:14:22 2010 -0700 net: wireless: bcm4329: Fix SoftAP start/stop Signed-off-by: Dmitry Shmidt commit dcad68836dbe5bcce29d6519478e534c89142fef Author: Iliyan Malchev Date: Wed Mar 17 12:14:41 2010 -0700 [ARM] qsd8k: mahimahi_defconfig: remove APANIC from the kernel We use last_kmsg on mahimahi instead. Signed-off-by: Iliyan Malchev commit 87d957f5484cbbb6b01e171f4d813f34c6144b78 Author: Andy Yeh Date: Fri Mar 12 13:44:13 2010 -0800 [ARM] msm: camera: fix greenish snapshot in low light (w/o flash) -- stream-on snapshot after writing gain/line -- correct wrong reg 0x3051 to 0x3151 -- set 0x105 to 0x1h to prevent first corrupted frame -- parameter hold/release is removed from snapshot session Signed-off-by: Iliyan Malchev commit 0f5f9fc17943f5f1359db933fda8638bb7fd9657 Author: Dmitry Shmidt Date: Fri Mar 12 10:15:31 2010 -0800 net: wireless: bcm4329: Turn ON SoftAP support Signed-off-by: Dmitry Shmidt commit 99cccdeb5b2c673e844b5b149b580ee30bd58cb4 Author: Dmitry Shmidt Date: Thu Mar 11 15:24:07 2010 -0800 net: wireless: bcm4329: Version 4.218.204 update (SoftAP support) Signed-off-by: Dmitry Shmidt commit 595a71d7a24ebded1b2d3ec9d5d871de7588f40c Author: Iliyan Malchev Date: Thu Mar 11 16:09:54 2010 -0800 [ARM] msm: make hw3d master and client char devices (used to be misc) Signed-off-by: Iliyan Malchev commit 7c1b97f8ef6bf6320601390a1c75265358e506cc Author: Haley Teng Date: Wed Mar 10 13:43:33 2010 -0800 [ARM] msm: usb: diag: fix several deadlocks -- diag_release() can get blocked because user_lock was being acquired before wait_event_interruptible() in diag_write()/diag_read(). -- wake up 'read_wq' and 'write_wq' when usb status changes, to help userspace return from read()/write() when - usb is offline - echo 0 > /sys/module/diag/parameters/enabled Signed-off-by: Iliyan Malchev commit c6d806af8a5f94dcafc95a602db7889edb9202b1 Author: Mike Lockwood Date: Wed Mar 10 20:58:15 2010 -0500 [ARM] msm: htc: Add platform data for RNDIS vendor ID and MAC address. This fixes a kernel panic in rndis.c when receiving the OID_GEN_VENDOR_DESCRIPTION command. Signed-off-by: Mike Lockwood commit 7a1e501a6dc71c8bde299447015d37610d03a0dc Author: Mike Lockwood Date: Wed Mar 10 17:07:02 2010 -0500 [ARM] msm: mahimahi: Add platform data for RNDIS ethernet USB function Signed-off-by: Mike Lockwood commit 7d7072a0c53868bb664b03623967e6307529df66 Merge: 1ca5c60 67078ec Author: Arve Hj��nnev��g Date: Wed Mar 10 16:40:54 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit 67078ecae3edb5b4657dcb9f67f744ecccd18a97 Merge: dc13661 7f5e918 Author: Arve Hj��nnev��g Date: Wed Mar 10 16:38:33 2010 -0800 Merge commit 'v2.6.32.9' into android-2.6.32 commit dc136618cb23810dd3d4adfcb836b289cd528b4f Author: Arve Hj��nnev��g Date: Wed Mar 10 16:38:13 2010 -0800 Revert "sysfs: Fix sysfs owner and group." This reverts commit f1f8e7cd6f796b15ed011361f09b57db796d9b4e. commit 7dc693330c1fda407643b95c876fc072845c0593 Author: Mike Lockwood Date: Wed Mar 10 17:05:03 2010 -0500 USB: gadget: f_rndis: Add platform data for RNDIS vendor ID and MAC address. This fixes a kernel panic in rndis.c when receiving the OID_GEN_VENDOR_DESCRIPTION command. Signed-off-by: Mike Lockwood commit 1ca5c60c7ebfa7d1bbcd1e328890707a1bd65ceb Author: Iliyan Malchev Date: Tue Mar 9 12:01:14 2010 -0800 a1026: in-call tuning improvements Signed-off-by: Iliyan Malchev commit 25f5b90309d7ecb2386c8bb77737a14d9df78999 Merge: 2ad6d68 a47633b Author: Dima Zavin Date: Tue Mar 9 12:37:38 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit a47633bdbcc9b87f2a72e9bdf317f05e2e6c8051 Author: Nick Pelly Date: Tue Dec 8 19:42:21 2009 -0800 Bluetooth: Use non-flushable pb flag by default for ACL data on capable chipsets. With Bluetooth 2.1 ACL packets can be flushable or non-flushable. This commit makes ACL data packets non-flushable by default on compatible chipsets, and adds the L2CAP_LM_FLUSHABLE socket option to explicitly request flushable ACL data packets for a given L2CAP socket. This is useful for A2DP data which can be safely discarded if it can not be delivered within a short time (while other ACL data should not be discarded). Note that making ACL data flushable has no effect unless the automatic flush timeout for that ACL link is changed from its default of 0 (infinite). Change-Id: Ie3d4befdeaefb8c979de7ae603ff5ec462b3483c Signed-off-by: Nick Pelly commit 71682ea19f8d5d96034ce113acbbf83ac58173e6 Author: Nick Pelly Date: Tue Mar 9 12:08:00 2010 -0800 Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets." This reverts commit d7897fd1e9fb3a5df0740dc2dc45ec94ca0965f2. Change-Id: I3401550b6dc97b683104e9fdac30a617a2db8c8e Signed-off-by: Nick Pelly commit 2ad6d6838149fce48854d8488f834c0b8003c1f6 Author: Dmitry Shmidt Date: Mon Mar 8 18:31:48 2010 -0800 net: wireless: bcm4329: Fix "driver stop" scan processing Signed-off-by: Dmitry Shmidt commit 3a222c34cc724362d40db5b4a79be7ccad6ab695 Author: Davy Lin Date: Mon Mar 8 14:57:33 2010 -0800 [ARM] qsd8k: mahimahi: fix modify the remote-key ADC table and handling code On some headsets/earphones, remote keys cannot be detected correctly on mahimahi CDMA, and remote_key_adc_table needs to be adjusted slightly to fit for both versions of mahimahi. Signed-off-by: Iliyan Malchev commit af337b891e8628336c306139ce9806c1078f539b Author: Stanley Chu Date: Thu Mar 4 10:59:22 2010 -0800 [ARM] msm: usb: diag: fix a memory leak in tx_req_idle Signed-off-by: Iliyan Malchev commit f874e6a4a138fc0c2fde1d915d184d45021cf673 Author: Kuma Chang Date: Wed Mar 3 14:23:45 2010 -0800 [ARM] msm: usb: diag: add support for getting qdsp6 logs for QXDM Signed-off-by: Iliyan Malchev commit 7c45b9b86d69a9c8ac3eeb10ecb1f025893c98c4 Author: Mike Chan Date: Wed Mar 3 16:48:19 2010 -0800 i2c: akm8973: Use normal suspend instead of early suspend Can now generate events when screen is off + wakelock. Change-Id: I07ca77ea7465e05d01e5978cae639926fadeab8f Signed-off-by: Mike Chan Signed-off-by: Iliyan Malchev commit 3923da24dca6477d1cbf7f45783ad42036752a47 Author: Brian Swetland Date: Sat Feb 27 16:13:23 2010 -0800 qsd8k: video: new video encoder driver The latest DSP image for 8250 does h264/mpeg4/etc with no assist from the apps processor. This driver supports the new DSP interface. It is not backward compatible with the old venc driver. Signed-off-by: Brian Swetland commit fe935ad0e2929abe284bf8fc75480c5fa44bad3c Author: Brian Swetland Date: Sun Feb 21 16:53:49 2010 -0800 qsd8k: audio: call q6audio_dsp_not_responding() instead of BUG() This hooks into the DSP crash notification / dumping mechanism. Signed-off-by: Brian Swetland commit 1588883c2378f51f27e82f9d58903c2acac47edb Author: Brian Swetland Date: Wed Feb 24 16:13:20 2010 -0800 qsd8k: debugging / ramdump driver for QDSP6 Provide a mechanism for userspace to get notification of DSP crashes, and to extract the DSP's RAM image before allowing the crash to "complete". Signed-off-by: Brian Swetland commit e4bbc7d68e099afba877e1bb0b9531b48390e413 Merge: 63217f8 f6320db Author: Dima Zavin Date: Tue Mar 2 16:21:39 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit f6320db51173e3b94f54b87944b88d3b363c4487 Author: Dima Zavin Date: Tue Mar 2 15:47:57 2010 -0800 pmem: Add cache flush ioctl for pmem buffers Change-Id: I9156bad829e8c65087f122b48cc57638902fab12 Signed-off-by: Dima Zavin commit 63217f8b51d6401cc2042ca015a96580b2d1b6b6 Author: Iliyan Malchev Date: Tue Mar 2 15:20:39 2010 -0800 [ARM] msm: fix warnings in smd_debug Signed-off-by: Iliyan Malchev commit a5a7cf5f5683d0de89c14e5ad95165cc8b9fb427 Author: Iliyan Malchev Date: Tue Mar 2 14:27:00 2010 -0800 Revert "[ARM] msm: smd_debug: add SMEM debug info for TCXO and network related statistics" This reverts commit 5619a299efa2102ec2a3da330773ce7fde310630. Signed-off-by: Iliyan Malchev commit 99ace9cad0227b1859ca0a1f67d16b2e8b4d8d62 Author: Iliyan Malchev Date: Tue Mar 2 14:26:35 2010 -0800 Revert "[ARM] qsd8k: mahimahi_defconfig: set CONFIG_SMD_OFFSET_TCXO_STAT" This reverts commit 40634687d201dd8d4e39be2e6b0a0cf84add4b5a. Signed-off-by: Iliyan Malchev commit 3516393a369bd0d33a7bb56c54d723e7538dd19a Merge: 64d1df6 b1d4000 Author: Dima Zavin Date: Tue Mar 2 12:08:19 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit 64d1df6078a948c0179b5035fc0733d7c1521989 Author: Shubhraprakash Das Date: Mon Mar 1 16:18:45 2010 -0800 [ARM] msm: kgsl: Remove the need to poll for timestamp completion Use conditional RB interrupt generation when we need to wait on timestamps to avoid polling in userspace. Change-Id: Ib0ae4257d2fbc2b220004c4e29137ac7ae1e0589 Signed-off-by: Dima Zavin commit 40634687d201dd8d4e39be2e6b0a0cf84add4b5a Author: Iliyan Malchev Date: Wed Feb 24 15:58:27 2010 -0800 [ARM] qsd8k: mahimahi_defconfig: set CONFIG_SMD_OFFSET_TCXO_STAT Signed-off-by: Iliyan Malchev commit f6f7540d2591fdc0489a8a5169769406ce6f28c1 Author: Eiven Peng Date: Wed Feb 24 15:50:29 2010 -0800 [ARM] msm: clock: print still-running clocks before power-collapse suspend Signed-off-by: Iliyan Malchev commit 5619a299efa2102ec2a3da330773ce7fde310630 Author: Eiven Peng Date: Wed Feb 24 14:31:16 2010 -0800 [ARM] msm: smd_debug: add SMEM debug info for TCXO and network related statistics -- /sys/module/smd/parameters/print_stats_on_suspend enables printing TCXO stats on every suspend/resume and screen on/off event -- /sys/kernel/debug/smd/stat prints out these stats as well Signed-off-by: Iliyan Malchev commit 086401b454b149ee55351298a79f7ba9e68a171f Author: Iliyan Malchev Date: Thu Jan 14 15:00:42 2010 -0800 [ARM] msm: camera: s5k3e2fx lens correcions Signed-off-by: Iliyan Malchev commit b3e45f3e986063610789877b79936edf535dd606 Author: Greg Goldman Date: Mon Mar 1 09:36:38 2010 -0800 net: wireless: bcm4329: Fix ISCAN state machine Signed-off-by: Dmitry Shmidt commit 2f2821041f2ac624b078b50644b0e94f4b82c26c Author: Mike Lockwood Date: Sat Feb 27 00:09:17 2010 -0500 [ARM] msm: msm7k_udc: Call usb_connected function in platform data on configure Fixes USB charging events that broke during the move from function to gadget USB drivers Signed-off-by: Mike Lockwood commit b1d4000fe60cec6a05fd09b7a6697ede7ab649a2 Author: Mike Lockwood Date: Fri Feb 26 09:34:19 2010 -0500 USB: gadget: composite: Don't increment interface number for alt settings. Signed-off-by: Mike Lockwood commit 6fd76fd99efabcc28ca58d32257a608be22e1019 Author: Mike Lockwood Date: Fri Feb 26 09:30:01 2010 -0500 USB: gadget: composite: Don't call set_alt() on functions that are hidden. Signed-off-by: Mike Lockwood commit 61b4fcc826a6654ac9b0a179b2411c4ec92e4879 Author: Dmitry Shmidt Date: Wed Feb 24 14:29:20 2010 -0800 net: wireless: bcm4329: Prevent sleeping for 1 sec after new packet arrival Signed-off-by: Dmitry Shmidt commit 06d9e7a66729fa7ea766c6928ebe6fe9168f4f27 Author: Dmitry Shmidt Date: Wed Feb 24 14:24:52 2010 -0800 [ARM] msm: Fix mmc_platform_data warning Signed-off-by: Dmitry Shmidt commit 784bf8547d00227f0d8e77bb3e41e4b79b5c3306 Author: Mike Lockwood Date: Thu Feb 25 10:45:09 2010 -0500 [ARM] msm: msm_defconfig: Enable CONFIG_USB_ANDROID_RNDIS_WCEIS Change-Id: I8c7bcfbaf915cbf4ab7ec2916738ed20eff36894 Signed-off-by: Mike Lockwood commit 2b3da98da9bd4699ac6719536e7e9eae1d65eec4 Author: Mike Lockwood Date: Wed Feb 24 10:11:01 2010 -0500 [ARM] msm: htc: Update USB configuration for RNDIS ethernet: UMS USB function is disabled when RNDIS is active. Use official USB product IDs from HTC. Signed-off-by: Mike Lockwood commit b65490f01966cfb2727c3bf2bab0f9796dc854ed Merge: 44f1db6 3b07724 Author: Dima Zavin Date: Wed Feb 24 15:36:26 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit 3b077241e02041b1f03fee912896b8de1d7ac096 Author: Nick Pelly Date: Thu Feb 11 11:54:28 2010 -0800 Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections. __u16 sco_pkt_type is introduced to struct sockaddr_sco. It allows bitwise selection of SCO/eSCO packet types. Currently those bits are: 0x0001 HV1 may be used. 0x0002 HV2 may be used. 0x0004 HV3 may be used. 0x0008 EV3 may be used. 0x0010 EV4 may be used. 0x0020 EV5 may be used. 0x0040 2-EV3 may be used. 0x0080 3-EV3 may be used. 0x0100 2-EV5 may be used. 0x0200 3-EV5 may be used. This is similar to the Packet Type parameter in the HCI Setup Synchronous Connection Command, except that we are not reversing the logic on the EDR bits. This makes the use of sco_pkt_tpye forward portable for the use case of white-listing packet types, which we expect will be the primary use case. If sco_pkt_type is zero, or userspace uses the old struct sockaddr_sco, then the default behavior is to allow all packet types. Packet type selection is just a request made to the Bluetooth chipset, and it is up to the link manager on the chipset to negiotiate and decide on the actual packet types used. Furthermore, when a SCO/eSCO connection is eventually made there is no way for the host stack to determine which packet type was used (however it is possible to get the link type of SCO or eSCO). sco_pkt_type is ignored for incoming SCO connections. It is possible to add this in the future as a parameter to the Accept Synchronous Connection Command, however its a little trickier because the kernel does not currently preserve sockaddr_sco data between userspace calls to accept(). The most common use for sco_pkt_type will be to white-list only SCO packets, which can be done with the hci.h constant SCO_ESCO_MASK. This patch is motivated by broken Bluetooth carkits such as the Motorolo HF850 (it claims to support eSCO, but will actually reject eSCO connections after 5 seconds) and the 2007/2008 Infiniti G35/37 (fails to route audio if a 2-EV5 packet type is negiotiated). With this patch userspace can maintain a list of compatible packet types to workaround remote devices such as these. Based on a patch by Marcel Holtmann. Change-Id: I304d8fda5b4145254820a3003820163bf53de5a5 Signed-off-by: Nick Pelly commit 44f1db67650d8c8ac2c79687c77617a9e0bc3861 Author: San Mehat Date: Wed Feb 24 13:13:29 2010 -0800 [ARM] configs: mahimahi_defconfig: Switch to CFQ I/O scheduler by default Signed-off-by: San Mehat commit 352230dec86678270bc895cfa84cd3b95d5caeac Author: Mike Lockwood Date: Wed Feb 24 09:48:32 2010 -0500 [ARM] msm: mahimahi: UMS USB function is disabled when RNDIS is active. Signed-off-by: Mike Lockwood commit 9dfbb662b1d029fb405e78fe757fb244a1ec76b9 Merge: 1456427 e7e66e1 Author: Dima Zavin Date: Wed Feb 24 12:42:27 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit 1456427d668ce202a0738dae390b9b08fd2cfd81 Author: Dima Zavin Date: Wed Feb 24 12:32:35 2010 -0800 [ARM] msm: kgsl: move translation error dummy space 32 bytes up Leave the bottom 32bytes of the dummy area zeroed out for other uses (like VGT dummy cycles). This is needed so that in case of a translation error, garbage written into this area does not have adverse effects. Change-Id: I3c7abe028bece82fec8c53bdf1d243dad1917746 Signed-off-by: Dima Zavin commit e7e66e1a05730d61f5e009208de6848a8de717f7 Author: Nick Pelly Date: Wed Feb 24 09:29:45 2010 -0800 Revert "Bluetooth: Change RFCOMM to use BT_CONNECT2 for BT_DEFER_SETUP" This reverts commit 8bf4794174659b06d43cc5e290cd384757374613. Change-Id: Ieaeed6866996446e0392e387b77b446361f23d46 Signed-off-by: Nick Pelly commit 33a3a31ffafc73c537e4a99c99da766863cc9d41 Author: Nick Pelly Date: Wed Feb 24 09:29:10 2010 -0800 Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP" This reverts commit e2139b32726e5dd184974c785ea3f62026590801. Change-Id: Id948d5860840aaf85eca7d8894a7bb3192f0bb47 Signed-off-by: Nick Pelly commit a8d5021410094d76f4b6003b67ec5ab1d33a6ec6 Author: Mike Lockwood Date: Wed Feb 24 10:20:59 2010 -0500 USB: gadget: android: Disable UMS when RNDIS ethernet is active. Signed-off-by: Mike Lockwood commit 433c632c44e4c9abbcc3ab5dcc5cf83c5332a848 Author: Dima Zavin Date: Wed Feb 24 01:29:10 2010 -0800 [ARM] msm: kgsl: clear the dummyspace region at initialization The dummyspace area is being used to insert dummy operation for some of the blocks when reprogramming the page tables. Non-zero data in that region was causing the VGT to go off into the weeds. Change-Id: Ib124c44df2eabb303675a4a10fb36418b173259a Signed-off-by: Dima Zavin commit c87ad52cc9a1f4e9be88f6ac46cecea587b461b5 Author: Dima Zavin Date: Wed Feb 24 01:27:56 2010 -0800 [ARM] msm: kgsl: release the memory back into the free pool AFTER unmapping it Change-Id: Id91f085ef46b7a1bdbcff96b9c41c864a6943004 Signed-off-by: Dima Zavin commit 85f1caa31029519a01702011a93889c119a77472 Author: Dima Zavin Date: Mon Feb 22 23:29:20 2010 -0800 [ARM] msm: kgsl: properly cleanup when pagetable creation fails Change-Id: I017e36ec89e2f9435c60eae4ccaf0875824ed2b8 Signed-off-by: Dima Zavin commit d116272e21d524afd8c039361cbf633880f0f682 Author: Nick Pelly Date: Tue Feb 23 15:53:34 2010 -0800 [ARM] sapphire: Set rfkill hardware block to false. We do not have a hardware block for the Bluetooth chip on sapphire. This was a mistake made switching from the 2.6.29 to 2.6.32 rfkill API. Change-Id: Ifacf416e37a52b550911a2fec6329a93c7a7475a Signed-off-by: Nick Pelly commit 8364b84108404c713254453bec840f19e25673aa Author: Nick Pelly Date: Tue Feb 23 15:53:34 2010 -0800 [ARM] trout: Set rfkill hardware block to false. We do not have a hardware block for the Bluetooth chip on trout. This was a mistake made switching from the 2.6.29 to 2.6.32 rfkill API. Change-Id: I86a6a2be5caacd8e7f9c95376dcac1cb0c21779e Signed-off-by: Nick Pelly commit e50415a8b79e095ceee0dac1e7e88edf7e92ffed Author: Nick Pelly Date: Tue Feb 23 15:53:34 2010 -0800 [ARM] mahimahi: Set rfkill hardware block to false. We do not have a hardware block for the Bluetooth chip on mahimahi. This was a mistake made switching from the 2.6.29 to 2.6.32 rfkill API. Change-Id: I817fb2b7d6cdab968f74b2298907f18ac02d5bd9 Signed-off-by: Nick Pelly commit ae991396e9c66ca7bb73fceb62e632ff4ed6c4e0 Author: San Mehat Date: Tue Feb 23 16:09:47 2010 -0800 android: logger: Add new system log for framework/system log messages Signed-off-by: San Mehat commit d7f8e2c47be93c0107d60da2debb85df02d82a82 Author: Iliyan Malchev Date: Tue Feb 23 15:13:33 2010 -0800 [ARM] msm: qdsp5: audio_in: pass large-enough buffers to the event callbacks Signed-off-by: Iliyan Malchev commit 160996686fed10376abce4e8a45dbddc72c1fb95 Author: Iliyan Malchev Date: Tue Feb 23 15:00:49 2010 -0800 [ARM] msm: qdsp5: clean up read-event functions, add error checks -- read_event_16, read_event_32, and read_modem_event accept the size of the buffer in bytes, not in numbers of uint16_t or uint32_t -- read_modem_event now checks the length of the buffer -- read_event_16 and read_event_32 print out a warning if the buffer is too small Signed-off-by: Iliyan Malchev commit 7f5e918e62cbc9ac27c2f47d3c3dd4b86f67ff0e Author: Greg Kroah-Hartman Date: Tue Feb 23 07:38:51 2010 -0800 Linux 2.6.32.9 commit c7f14122d1c633d5d6d9c999235d7f6778510b26 Author: Jonathan Brassow Date: Tue Feb 16 18:42:53 2010 +0000 dm log: userspace fix overhead_size calcuations commit ebfd32bba9b518d684009d9d21a56742337ca1b3 upstream. This patch fixes two bugs that revolve around the miscalculation and misuse of the variable 'overhead_size'. 'overhead_size' is the size of the various header structures used during communication. The first bug is the use of 'sizeof' with the pointer of a structure instead of the structure itself - resulting in the wrong size being computed. This is then used in a check to see if the payload (data_size) would be to large for the preallocated structure. Since the bug produces a smaller value for the overhead, it was possible for the structure to be breached. (Although the current users of the code do not currently send enough data to trigger this bug.) The second bug is that the 'overhead_size' value is used to compute how much of the preallocated space should be cleared before populating it with fresh data. This should have simply been 'sizeof(struct cn_msg)' not overhead_size. The fact that 'overhead_size' was computed incorrectly made this problem "less bad" - leaving only a pointer's worth of space at the end uncleared. Thus, this bug was never producing a bad result, but still needs to be fixed - especially now that the value is computed correctly. Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 7607864c43f7d2559153179fabd9dc8ade6b70a0 Author: Nikanth Karthikesan Date: Tue Feb 16 18:42:47 2010 +0000 dm stripe: avoid divide by zero with invalid stripe count commit 781248c1b50c776a9ef4be1130f84ced1cba42fe upstream. If a table containing zero as stripe count is passed into stripe_ctr the code attempts to divide by zero. This patch changes DM_TABLE_LOAD to return -EINVAL if the stripe count is zero. We now get the following error messages: device-mapper: table: 253:0: striped: Invalid stripe count device-mapper: ioctl: error adding target to table Signed-off-by: Nikanth Karthikesan Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 98d7938431c181dea6a03f5f89b550f081ad6220 Author: Wey-Yi Guy Date: Fri Feb 5 11:40:00 2010 -0800 iwlwifi: Fix to set correct ht configuration commit 098dfded5b1b09927995e89c6d689f85a0f53384 upstream. iwl_set_rxon_ht() only get called in iwl_post_associate(); which cause possible incorrect ht configuration. Adding the call in iwl_mac_config() if IEEE80211_CONF_CHANGE_CHANNEL flag is set to re-configure and send rxon command. Fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2146 Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit de30e10d0080bccca8fe56f8dcb75171fffdb695 Author: Benoit Papillault Date: Fri Feb 5 01:21:03 2010 +0100 mac80211: Fix probe request filtering in IBSS mode commit 0da780c269957783d341fc3559e6b4c9912af7b4 upstream. We only reply to probe request if either the requested SSID is the broadcast SSID or if the requested SSID matches our own SSID. This latter case was not properly handled since we were replying to different SSID with the same length as our own SSID. Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 20f774c4adc1f0690b300103b3f046c79d82ed99 Author: Sujith Date: Tue Feb 9 10:07:00 2010 +0530 ath9k: Fix sequence numbers for PAE frames commit 6c8afef551fef87a3bf24f8a74c69a7f2f72fc82 upstream. Currently, PAE frames are not assigned proper sequence numbers. Since sending PAE frames as part of aggregates breaks crupto with several APs, they are sent as normal MPDUs. Fix the seqeuence number issue by updating the frame with the internal sequence number. Tested-by: Felix Fietkau Signed-off-by: Sujith Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 51a53302d168c9c6089cb931acebfbc5a2e81a48 Author: Larry Finger Date: Tue Feb 2 10:08:19 2010 -0600 b43: Fix throughput regression commit b6c3f5be7c6ac3375f44de4545c1ffe216b34022 upstream. Commit c7ab5ef9bcd281135c21b4732c9be779585181be entitled "b43: implement short slot and basic rate handling" reduced the transmit throughput for my BCM4311 device from 18 Mb/s to 0.7 Mb/s. The basic rate handling portion is OK, the problem is in the short slot handling. Prior to this change, the short slot enable/disable routines were never called. Experimentation showed that the critical part was changing the value at offset 0x0010 in the shared memory. This is supposed to contain the 802.11 Slot Time in usec, but if it is changed from its initial value of zero, performance is destroyed. On the other hand, changing the value in the MMIO register corresponding to the Interframe Slot Time increased performance from 18 to 22 Mb/s. A BCM4306/3 also shows dramatic improvement of the transmit rate from 5.3 to 19.0 Mb/s. Other changes in the patch include removal of the magic number for the MMIO register, and allowing the slot time to be set for any PHY operating in the 2.4 GHz band. Previously, the routine was executed only for G PHYs. Signed-off-by: Larry Finger Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 081312e8c147a85df0f37dcc45d7e2fbaf79dfb2 Author: Tyler Hicks Date: Wed Nov 4 02:48:01 2009 -0600 eCryptfs: Add getattr function commit f8f484d1b6677dd5cd5e7e605db747e8c30bbd47 upstream. The i_blocks field of an eCryptfs inode cannot be trusted, but generic_fillattr() uses it to instantiate the blocks field of a stat() syscall when a filesystem doesn't implement its own getattr(). Users have noticed that the output of du is incorrect on newly created files. This patch creates ecryptfs_getattr() which calls into the lower filesystem's getattr() so that eCryptfs can use its kstat.blocks value after calling generic_fillattr(). It is important to note that the block count includes the eCryptfs metadata stored in the beginning of the lower file plus any padding used to fill an extent before encryption. https://bugs.launchpad.net/ecryptfs/+bug/390833 Reported-by: Dominic Sacr�� Signed-off-by: Tyler Hicks Cc: Tim Gardner Signed-off-by: Greg Kroah-Hartman commit be6520201bc0c80ec869ec035607ace48a5f78c4 Author: Chuck Lever Date: Mon Feb 15 12:19:53 2010 -0500 NFS: Too many GETATTR and ACCESS calls after direct I/O commit 65d269538a1129495ac45a14a777cd11cfe881d8 upstream. The cached read and write paths initialize fattr->time_start in their setup procedures. The value of fattr->time_start is propagated to read_cache_jiffies by nfs_update_inode(). Subsequent calls to nfs_attribute_timeout() will then use a good time stamp when computing the attribute cache timeout, and squelch unneeded GETATTR calls. Since the direct I/O paths erroneously leave the inode's fattr->time_start field set to zero, read_cache_jiffies for that inode is set to zero after any direct read or write operation. This triggers an otw GETATTR or ACCESS call to update the file's attribute and access caches properly, even when the NFS READ or WRITE replies have usable post-op attributes. Make sure the direct read and write setup code performs the same fattr initialization as the cached I/O paths to prevent unnecessary GETATTR calls. This was likely introduced by commit 0e574af1 in 2.6.15, which appears to add new nfs_fattr_init() call sites in the cached read and write paths, but not in the equivalent places in fs/nfs/direct.c. A subsequent commit in the same series, 33801147, introduces the fattr->time_start field. Interestingly, the direct write reschedule path already has a call to nfs_fattr_init() in the right place. Reported-by: Quentin Barnes Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 2acc8d9f806fad17c81c91b3266775b78894f252 Author: Dave Airlie Date: Sun Jan 31 07:07:14 2010 +1000 drm/radeon/kms: use udelay for short delays commit 01d4503968f471f876fb44335800d2cf8dc5a2ce upstream. For usec delays use udelay instead of scheduling, this should allow reclocking to happen faster. This also was the cause of reported 33s delays at bootup on certain systems. fixes: freedesktop.org bug 25506 Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 498a84db834a62eef2e5cb2fb85d051c39f89fff Author: Arjan van de Ven Date: Wed Jan 27 15:25:39 2010 -0800 ACPI: fix High cpu temperature with 2.6.32 commit 370d5cd88509b93b76eb2f5f97efbd71c25061cb upstream. Since the rewrite of the CPU idle governor in 2.6.32, two laptops have surfaced where the BIOS advertises a C2 power state, but for some reason this state is not functioning (as verified in both cases by powertop before the patch in .32). The old governor had the accidental behavior that if a non-working state was chosen too many times, it would end up falling back to C1. The new governor works differently and this accidental behavior is no longer there; the result is a high temperature on these two machines. This patch adds these 2 machines to the DMI table for C state anomalies; by just not using C2 both these machines are better off (the TSC can be used instead of the pm timer, giving a performance boost for example). Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14742 Signed-off-by: Arjan van de Ven Reported-by: Signed-off-by: Andrew Morton Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit c51bfb22f31d384833e82a66872cccbab7c593df Author: Thomas Renninger Date: Fri Jan 29 17:48:51 2010 +0100 ACPI: Add NULL pointer check in acpi_bus_start commit d2f6650a950dadd20667a04a9dc785f240d43695 upstream. If acpi_bus_add does not return a device and it's passed to acpi_bus_start, bad things will happen: BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 IP: [] acpi_bus_start+0x14/0x24 ... [] acpiphp_bus_add+0xba/0x130 [acpiphp] [] enable_device+0x132/0x2ff [acpiphp] [] acpiphp_enable_slot+0xb8/0x130 [acpiphp] [] handle_hotplug_event_func+0x87/0x190 [acpiphp] Next patch would make this NULL pointer check obsolete, but better having one more than one missing... Signed-off-by: Thomas Renninger Acked-by: Bjorn Helgaas Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit ea658ff1d6314ed206393dd23d2cd45b22f8f6b4 Author: Jelle Martijn Kok Date: Wed Feb 10 09:34:09 2010 -0600 rtl8187: Add new device ID commit 174b24963eaf96dc5e093502ee09639aed13eb2f upstream. Add new RTL8187B device. Signed-off-by: Larry Finger Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit fda9759364aea7d1acc8f278e26c98894f5ef52e Author: Linus Torvalds Date: Tue Feb 16 12:35:07 2010 -0800 USB: usbfs: properly clean up the as structure on error paths commit ddeee0b2eec2a51b0712b04de4b39e7bec892a53 upstream. I notice that the processcompl_compat() function seems to be leaking the 'struct async *as' in the error paths. I think that the calling convention is fundamentally buggered. The caller is the one that did the "reap_as()" to get the as thing, the caller should be the one to free it too. Freeing it in the caller also means that it very clearly always gets freed, and avoids the need for any "free in the error case too". From: Linus Torvalds Cc: Alan Stern Cc: Marcus Meissner Signed-off-by: Greg Kroah-Hartman commit 2bac497bb2f16f1c01a61a0132d2f7a8dabd0e2a Author: Greg KH Date: Mon Feb 15 09:37:46 2010 -0800 USB: usbfs: only copy the actual data received commit d4a4683ca054ed9917dfc9e3ff0f7ecf74ad90d6 upstream. We need to only copy the data received by the device to userspace, not the whole kernel buffer, which can contain "stale" data. Thanks to Marcus Meissner for pointing this out and testing the fix. Reported-by: Marcus Meissner Tested-by: Marcus Meissner Cc: Alan Stern Cc: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit a206591bd37f7f63d1ccaabf73cbaff25b29f51d Author: Laurent Pinchart Date: Wed Feb 10 13:32:49 2010 +0100 class: Free the class private data in class_release commit 18d19c96457d172d913510c083bc7411ed40cb10 upstream. Fix a memory leak by freeing the memory allocated in __class_register for the class private data. Signed-off-by: Laurent Pinchart Acked-by: Artem Bityutskiy Signed-off-by: Greg Kroah-Hartman commit 0f102935a606e13e923905451c097acf8e87e4cd Author: Eric W. Biederman Date: Wed Feb 3 23:13:24 2010 -0800 sysfs: sysfs_sd_setattr set iattrs unconditionally commit 7c0ff870d1ed287504a61ed865f3d728c757436b upstream. There is currently a bug in sysfs_sd_setattr inherited from sysfs_setattr in 2.6.32 where the first time we set the attributes on a sysfs file we allocate backing store but do not set the backing store attributes. Resulting in overly restrictive permissions on sysfs files. The fix is to simply modify the code so that it always executes when we update the sysfs attributes, as we did in 2.6.31 and earlier. Signed-off-by: Eric W. Biederman Tested-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 458c2928268392756c01fafebbebc31403968c2c Author: Dick Hollenbeck Date: Wed Dec 9 12:31:34 2009 -0800 serial: 8250: add serial transmitter fully empty test commit bca476139d2ded86be146dae09b06e22548b67f3 upstream. When controlling an industrial radio modem it can be necessary to manipulate the handshake lines in order to control the radio modem's transmitter, from userspace. The transmitter should not be turned off before all characters have been transmitted. serial8250_tx_empty() was reporting that all characters were transmitted before they actually were. === Discovered in parallel with more testing and analysis by Kees Schoenmakers as follows: I ran into an NetMos 9835 serial pci board which behaves a little different than the standard. This type of expansion board is very common. "Standard" 8250 compatible devices clear the 'UART_LST_TEMT" bit together with the "UART_LSR_THRE" bit when writing data to the device. The NetMos device does it slightly different I believe that the TEMT bit is coupled to the shift register. The problem is that after writing data to the device and very quickly after that one does call serial8250_tx_empty, it returns the wrong information. My patch makes the test more robust (and solves the problem) and it does not affect the already correct devices. Alan: We may yet need to quirk this but now we know which chips we have a way to do that should we find this breaks some other 8250 clone with dodgy THRE. Signed-off-by: Dick Hollenbeck Signed-off-by: Alan Cox Cc: Kees Schoenmakers Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d13e7a58664e0e35db5e524176cb70143c7c07c2 Author: Takashi Iwai Date: Mon Dec 28 12:24:22 2009 +0100 ALSA: usb-audio - Avoid Oops after disconnect commit 78b8d5d2ee280c463908fd75f3bdf246bcb6ac8d upstream. As the release of substreams may be done asynchronously from the disconnection, close callback needs to check the shutdown flag before actually accessing the usb interface. Reference: Novell bnc#505027 http://bugzilla.novell.com/show_bug.cgi?id=565027 Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 98baa75bcbacb200b7e4e0ee01b508f4d459d8ce Author: George Kadianakis Date: Thu Dec 17 01:16:00 2009 +0200 Staging: fix rtl8187se compilation errors with mac80211 commit df574b8ecfb3a84af96229f336a6be88ca4a7055 upstream. This patch fixes compilation problems that were caused by function naming conflicts between the rtl8187se driver and the mac80211 stack. Signed-off-by: George Kadianakis Cc: maximilian attems Signed-off-by: Greg Kroah-Hartman commit 5a863d4181b7d028e19868211c12169babbee39f Author: Yinghai Lu Date: Sat Nov 21 00:23:37 2009 -0800 x86: Re-get cfg_new in case reuse/move irq_desc commit 37ef2a3029fde884808ff1b369677abc7dd9a79a upstream. When irq_desc is moved, we need to make sure to use the right cfg_new. Signed-off-by: Yinghai Lu LKML-Reference: <4B07A739.3030104@kernel.org> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 314a4e5441e5402e16c5e810f33a4ed842d0a473 Author: Joerg Roedel Date: Wed Feb 3 16:13:41 2010 +0100 x86/amd-iommu: Fix deassignment of a device from the pt_domain commit d3ad9373b7c29b63d5e8460a69453718d200cc3b upstream. Deassigning a device from the passthrough domain does not work and breaks device assignment to kvm guests. This patch fixes the issue. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit 16ecf8a237415fac700d6c227f763a2be566c92a Author: Joerg Roedel Date: Wed Feb 3 16:13:08 2010 +0100 x86/amd-iommu: Fix IOMMU-API initialization for iommu=pt commit f5325094379158e6b876ea0010c807bf7890ec8f upstream This patch moves the initialization of the iommu-api out of the dma-ops initialization code. This ensures that the iommu-api is initialized even with iommu=pt. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit 6d14e6b46af551e2551594ab5ab9356fb4cebbe7 Author: Rafael J. Wysocki Date: Thu Feb 4 14:00:41 2010 -0800 pktgen: Fix freezing problem commit 1b3f720bf033fde1fbb6231f9b156b918c5f68d8 upstream. Add missing try_to_freeze() to one of the pktgen_thread_worker() code paths so that it doesn't block suspend/hibernation. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=15006 Signed-off-by: Rafael J. Wysocki Reported-and-tested-by: Ciprian Dorin Craciun Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit e045288ec2a2274dc26eaba6b21cf2770b48e0ed Author: Tejun Heo Date: Thu Jan 28 16:04:15 2010 +0900 ahci: add Acer G725 to broken suspend list commit cedc9bf906dae044443d403371c887affdb44168 upstream. Acer G725 shares the same suspend problem with the HP laptops which lose ATA devices on resume. New firmware which fixes the problem is already available. Add G725 with old firmwares to the broken suspend list. This problem has been reported in bko#15104. http://bugzilla.kernel.org/show_bug.cgi?id=15104 Signed-off-by: Tejun Heo Reported-by: Jani-Matti H��tinen Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit 2c494f553a2c3c9dc155fc5bb0eff27e3a0fbef2 Author: Catalin Marinas Date: Thu Feb 4 01:04:50 2010 -0500 Call flush_dcache_page after PIO data transfers in libata-sff.c commit 2d68b7fe55d9e19a8a868224ed0dfd6526568521 upstream. flush_dcache_page() must be called after (!ATA_TFLAG_WRITE) the data copying to avoid D-cache aliasing with user space or I-D cache coherency issues (when reading data from an ATA device using PIO, the kernel dirties the D-cache but there is no flush_dcache_page() required on Harvard architectures). Signed-off-by: Catalin Marinas Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit c74c819eabc8b9ccfc91eafc8c253bce57661dae Author: Sergey Matyukevich Date: Tue Feb 2 13:43:59 2010 -0800 rtc-fm3130: add missing braces commit f4b5162820de60204afa5c8639335f4931b7fb0c upstream. Add missing braces for multiline 'if' statements in fm3130_probe. Signed-off-by: Sergey Matyukevich Signed-off-by: Alessandro Zummo Cc: Sergey Lapin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit c5fc9aa0845fa2920e0f9d70844151832bfd9d1a Author: Al Viro Date: Thu Jan 28 22:11:38 2010 -0500 befs: fix leak commit 8dd5ca532c2d2c2b85f16bc038ebfff05b8853e1 upstream. Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit a63123d12b7ced1d75b548379251982ad2583fbe Author: Alex Murray Date: Wed Jan 13 23:15:03 2010 +1030 ALSA: hda - Improved MacBook (Pro) 5,1 / 5,2 support commit a76221d47ef2b73ff16c0fef00a784026308ea02 upstream. This patch adds support for automatically muting the speakers when headphones are inserted, as well as relabelling the headphone widgets from the non-standard "HP" to the standard "Headphone" for the mb5 model. Signed-off-by: Alex Murray Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit b49b8e39e9c06a4d07c215de211279a91c42abc7 Author: Eric Dumazet Date: Mon Feb 8 15:00:39 2010 -0800 dst: call cond_resched() in dst_gc_task() commit 2fc1b5dd99f66d93ffc23fd8df82d384c1a354c8 upstream. Kernel bugzilla #15239 On some workloads, it is quite possible to get a huge dst list to process in dst_gc_task(), and trigger soft lockup detection. Fix is to call cond_resched(), as we run in process context. Reported-by: Pawel Staszewski Tested-by: Pawel Staszewski Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 1393ad25685ec7f91137160dc482e7bb00cb27d2 Author: Takashi Iwai Date: Fri Feb 12 18:17:06 2010 +0100 ALSA: hda - use WARN_ON_ONCE() for zero-division detection commit d6d8bf549393484e906913f02fa3c9518a2819b6 upstream. Replace the zero-division warning message with WARN_ON_ONCE() per the advice by Linus. This shouldn't happen, but if it happens, it's possible that the bug happens often due to buggy IRQs. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 473e685ee12ccd50d626b58c455dde6bbb51df61 Author: Matt Fleming Date: Fri Dec 11 22:58:17 2009 +0000 sh: Couple kernel and user write page perm bits for CONFIG_X2TLB commit fcb4ebd678858850e8b029909064175cb627868d upstream. pte_write() should check whether the permissions include either the user or kernel write permission bits. Likewise, pte_wrprotect() needs to remove both the kernel and user write bits. Without this patch handle_tlbmiss() doesn't handle faulting in pages from the P3 area (our vmalloc space) because of a write. Mappings of the P3 space have the _PAGE_EXT_KERN_WRITE bit but not _PAGE_EXT_USER_WRITE. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt Signed-off-by: Greg Kroah-Hartman commit 36a508e6c61a3c49680ee349149a8f5f1fb5acd8 Author: Kashyap, Desai Date: Mon Jan 25 16:20:52 2010 +0530 SCSI: mptfusion : mptscsih_abort return value should be SUCCESS instead of value 0. commit 9858ae38011d699d4c2fa7f3493a47accf43a0f5 upstream. retval should be SUCCESS/FAILED which is defined at scsi.h retval = 0 is directing wrong return value. It must be retval = SUCCESS. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 483d7142396f0d8b8f8748a4069b71c13ca662e5 Author: Wu Fengguang Date: Fri Feb 5 15:02:13 2010 -0500 devmem: fix kmem write bug on memory holes commit c85e9a97c4102ce2e83112da850d838cfab5ab13 upstream devmem: fix kmem write bug on memory holes [ cebbert@redhat.com : backport to 2.6.32 ] write_kmem() used to assume vwrite() always return the full buffer length. However now vwrite() could return 0 to indicate memory hole. This creates a bug that "buf" is not advanced accordingly. Fix it to simply ignore the return value, hence the memory hole. Signed-off-by: Wu Fengguang Cc: Andi Kleen Cc: Benjamin Herrenschmidt Cc: Christoph Lameter Cc: Ingo Molnar Cc: Tejun Heo Cc: Nick Piggin Cc: KAMEZAWA Hiroyuki Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman commit 6b344d83ca458327faa0e1f6afd45c39cceab2a6 Author: KAMEZAWA Hiroyuki Date: Fri Feb 5 15:01:09 2010 -0500 devmem: check vmalloc address on kmem read/write commit 325fda71d0badc1073dc59f12a948f24ff05796a [ cebbert@redhat.com : backport to 2.6.32 ] devmem: check vmalloc address on kmem read/write Otherwise vmalloc_to_page() will BUG(). This also makes the kmem read/write implementation aligned with mem(4): "References to nonexistent locations cause errors to be returned." Here we return -ENXIO (inspired by Hugh) if no bytes have been transfered to/from user space, otherwise return partial read/write results. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Wu Fengguang Cc: Greg Kroah-Hartman Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman commit 0e1104ada32d242bc6169a2ce4eb19ec4febb813 Author: Wu Fengguang Date: Fri Feb 5 15:00:52 2010 -0500 /dev/mem: introduce size_inside_page() commit f222318e9c3a315723e3524fb9d6566b2430db44 upstream /dev/mem: introduce size_inside_page() [ cebbert@redhat.com : backport to 2.6.32 ] [ subset of original patch, for just /dev/kmem ] Introduce size_inside_page() to replace duplicate /dev/mem code. Also apply it to /dev/kmem, whose alignment logic was buggy. Signed-off-by: Wu Fengguang Acked-by: Andi Kleen Cc: Marcelo Tosatti Cc: Greg Kroah-Hartman Cc: Mark Brown Cc: Johannes Berg Cc: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman commit 06eeea406c93680a55dd333971638af7289f8f7b Author: Len Brown Date: Sat Jan 30 18:01:42 2010 -0500 dell-wmi, hp-wmi, msi-wmi: check wmi_get_event_data() return value commit fda11e61ff8a4e3a8ebbd434e46560b67cc0ca9d upstream [ backport to 2.6.32 ] When acpi_evaluate_object() is passed ACPI_ALLOCATE_BUFFER, the caller must kfree the returned buffer if AE_OK is returned. The callers of wmi_get_event_data() pass ACPI_ALLOCATE_BUFFER, and thus must check its return value before accessing or kfree() on the buffer. Signed-off-by: Len Brown Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman commit 9f835c304f14fe5ad4f435c58e9c1e08fda71886 Author: Anisse Astier Date: Sat Jan 30 18:00:17 2010 -0500 wmi: Free the allocated acpi objects through wmi_get_event_data commit 3e9b988e4edf065d39c1343937f717319b1c1065 upstream [ backported to 2.6.32 ] These function allocate an acpi object by calling wmi_get_event_data, which then calls acpi_evaluate_object, and it is not freed afterwards. And kernel doc is fixed for parameters of wmi_get_event_data. Signed-off-by: Anisse Astier Acked-by: Randy Dunlap Acked-by: Carlos Corbacho Signed-off-by: Len Brown Cc: Chuck Ebbert Signed-off-by: Greg Kroah-Hartman commit fa56c7eaeca469055d79d1a2fe66a67829e44bf0 Author: Herbert Xu Date: Mon Feb 1 09:17:56 2010 +1100 crypto: padlock-sha - Add import/export support commit a8d7ac279743077965afeca0c9ed748507b68e89 upstream. As the padlock driver for SHA uses a software fallback to perform partial hashing, it must implement custom import/export functions. Otherwise hmac which depends on import/export for prehashing will not work with padlock-sha. Reported-by: Wolfgang Walter Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman commit fe42d89779a0c5639afe0e543aac1f7d1d7d9582 Author: Stefan Haberland Date: Mon Dec 7 12:51:52 2009 +0100 dasd: remove strings from s390dbf commit b8ed5dd54895647c2690575aad6f07748c2c618a upstream. Remove strings from s390 debugfeature entries that could lead to a crash when the data is read from dbf because the strings do not exist any more. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit 26d415dcf38423cb4c990e82c71e19011a9ad4e6 Author: Zhenyu Wang Date: Wed Nov 25 13:09:39 2009 +0800 drm/i915: Don't wait interruptible for possible plane buffer flush commit b9241ea31fae4887104e5d1b3b18f4009c25a0c4 upstream. When we setup buffer for display plane, we'll check any pending required GPU flush and possible make interruptible wait for flush complete. But that wait would be most possibly to fail in case of signals received for X process, which will then fail modeset process and put display engine in unconsistent state. The result could be blank screen or CPU hang, and DDX driver would always turn on outputs DPMS after whatever modeset fails or not. So this one creates new helper for setup display plane buffer, and when needing flush using uninterruptible wait for that. This one should fix bug like https://bugs.freedesktop.org/show_bug.cgi?id=24009. Also fixing mode switch stress test on Ironlake. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 47516b77eb1beb5b35c17112284493d008bc7c4a Author: Daniel Vetter Date: Tue Sep 15 22:57:32 2009 +0200 drm/i915: add i915_lp_ring_sync helper commit 48764bf43f746113fc77877d7e80f2df23ca4cbb upstream. This just waits until the hw passed the current ring position with cmd execution. This slightly changes the existing i915_wait_request function to make uninterruptible waiting possible - no point in returning to userspace while mucking around with the overlay, that piece of hw is just too fragile. Also replace a magic 0 with the symbolic constant (and kill the then superflous comment) while I was looking at the code. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 30b1b8f0078eb8ada282f814f47dbecf4283fdfc Author: Zhenyu Wang Date: Mon Dec 28 13:23:36 2009 +0800 drm/i915: remove full registers dump debug commit 823f68fd646da6a39a9c0d3eb4c60d69dab5aa13 upstream. This one reverts 9e3a6d155ed0a7636b926a798dd7221ea107b274. As reported by http://bugzilla.kernel.org/show_bug.cgi?id=14485, this dump will cause hang problem on some machine. If something really needs this kind of full registers dump, that could be done within intel-gpu-tools. Cc: Ben Gamari Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 242a71829e57a4962e43f89cf50d5fa99ff8a3e5 Author: Patrick McHardy Date: Mon Feb 8 11:18:07 2010 -0800 netfilter: nf_conntrack: fix hash resizing with namespaces commit d696c7bdaa55e2208e56c6f98e6bc1599f34286d upstream. 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. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit d619798aab2394997e0a4b9d2cb362306f221c97 Author: Alexey Dobriyan Date: Mon Feb 8 11:17:43 2010 -0800 netfilter: xtables: compat out of scope fix commit 14c7dbe043d01a83a30633ab6b109ba2ac61d9f7 upstream. 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 Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit 51d3a347944f76bc2f304e0622d61b9b39fec585 Author: Alexey Dobriyan Date: Mon Feb 8 11:17:22 2010 -0800 netfilter: nf_conntrack: restrict runtime expect hashsize modifications commit 13ccdfc2af03e09e60791f7d4bc4ccf53398af7c upstream. 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 Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit 747edef00c9b2147ca0b3d5bc33e9291a9a6d86e Author: Eric Dumazet Date: Mon Feb 8 11:16:56 2010 -0800 netfilter: nf_conntrack: per netns nf_conntrack_cachep commit 5b3501faa8741d50617ce4191c20061c6ef36cb3 upstream. 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 Signed-off-by: Greg Kroah-Hartman commit de2545859df3c04462ef39bf8056e587a1d2fa17 Author: Patrick McHardy Date: Mon Feb 8 11:16:26 2010 -0800 netfilter: nf_conntrack: fix memory corruption with multiple namespaces commit 9edd7ca0a3e3999c260642c92fa008892d82ca6e upstream. 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit dc5b9893d10ba7132098e7ad991103430227724b Author: Borislav Petkov Date: Thu Feb 11 17:15:57 2010 +0100 amd64_edac: Do not falsely trigger kerneloops commit cab4d27764d5a8654212b3e96eb0ae793aec5b94 upstream. An unfortunate "WARNING" in the message amd64_edac dumps when the system doesn't support DRAM ECC or ECC checking is not enabled in the BIOS used to trigger kerneloops which qualified the message as an OOPS thus misleading the users. See, e.g. https://bugs.launchpad.net/ubuntu/+source/linux/+bug/422536 http://bugzilla.kernel.org/show_bug.cgi?id=15238 Downgrade the message level to KERN_NOTICE and fix the formulation. Signed-off-by: Borislav Petkov Acked-by: Doug Thompson Signed-off-by: Greg Kroah-Hartman commit 00510c8f39d7b3501cc7ec79b677186ffbc7ca7e Author: Marcel Selhorst Date: Wed Feb 10 13:56:32 2010 -0800 tpm_infineon: fix suspend/resume handler for pnp_driver commit 93716b9470fbfd9efdc7d0f2445cb34635de3f6d upstream. When suspending, tpm_infineon calls the generic suspend function of the TPM framework. However, the TPM framework does not return and the system hangs upon suspend. When sending the necessary command "TPM_SaveState" directly within the driver, suspending and resuming works fine. Signed-off-by: Marcel Selhorst Cc: OGAWA Hirofumi Cc: Debora Velarde Cc: Rajiv Andrade Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit d632dfd88b02f1f89cbb9ec2d595580d1eba03bf Author: Marcelo Tosatti Date: Fri Jan 29 17:28:41 2010 -0200 KVM: PIT: control word is write-only commit ee73f656a604d5aa9df86a97102e4e462dd79924 upstream. PIT control word (address 0x43) is write-only, reads are undefined. Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit aa1dcdd6eb7f457dee130987d5d5229e5a67184c Author: Jason Wang Date: Wed Jan 27 19:13:49 2010 +0800 kvmclock: count total_sleep_time when updating guest clock commit 923de3cf5bf12049628019010e36623fca5ef6d1 upstream. Current kvm wallclock does not consider the total_sleep_time which could cause wrong wallclock in guest after host suspend/resume. This patch solve this issue by counting total_sleep_time to get the correct host boot time. Signed-off-by: Jason Wang Acked-by: Glauber Costa Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 1c63c20663a84b03a2dc47d1c1998f1883081162 Author: Jason Wang Date: Wed Jan 27 19:13:40 2010 +0800 Export the symbol of getboottime and mmonotonic_to_bootbased commit c93d89f3dbf0202bf19c07960ca8602b48c2f9a0 upstream. Export getboottime and monotonic_to_bootbased in order to let them could be used by following patch. Signed-off-by: Jason Wang Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 134bb65d8d9fa4e8bf3a7637e983e8d01e063544 Author: Francesco Lavra Date: Sun Feb 7 09:49:58 2010 -0300 V4L/DVB: dvb-core: fix initialization of feeds list in demux filter commit 691c9ae099b9bcb5c27125af00a4a90120977458 upstream. A DVB demultiplexer device can be used to set up either a PES filter or a section filter. In the former case, the ts field of the feed union of struct dmxdev_filter is used, in the latter case the sec field of the same union is used. The ts field is a struct list_head, and is currently initialized in the open() method of the demux device. When for a given demuxer a section filter is set up, the sec field is played with, thus if a PES filter needs to be set up after that the ts field will be corrupted, causing a kernel oops. This fix moves the list head initialization to dvb_dmxdev_pes_filter_set(), so that the ts field is properly initialized every time a PES filter is set up. Signed-off-by: Francesco Lavra Reviewed-by: Andy Walls Tested-by: hermann pitton Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit 113819bc44213c5b931517f86a1c9c93c22e2f20 Author: NeilBrown Date: Tue Feb 9 12:31:47 2010 +1100 md: fix 'degraded' calculation when starting a reshape. commit 9eb07c259207d048e3ee8be2a77b2a4680b1edd4 upstream. This code was written long ago when it was not possible to reshape a degraded array. Now it is so the current level of degraded-ness needs to be taken in to account. Also newly addded devices should only reduce degradedness if they are deemed to be in-sync. In particular, if you convert a RAID5 to a RAID6, and increase the number of devices at the same time, then the 5->6 conversion will make the array degraded so the current code will produce a wrong value for 'degraded' - "-1" to be precise. If the reshape runs to completion end_reshape will calculate a correct new value for 'degraded', but if a device fails during the reshape an incorrect decision might be made based on the incorrect value of "degraded". This patch is suitable for 2.6.32-stable and if they are still open, 2.6.31-stable and 2.6.30-stable as well. Reported-by: Michael Evans Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman commit 892faa5a39f6236bccbe6f48a5f736a8aec9b278 Author: Trond Myklebust Date: Mon Feb 8 09:32:40 2010 -0500 NFS: Fix the mapping of the NFSERR_SERVERFAULT error commit fdcb45777a3d1689c5541e1f85ee3ebbd197d2c1 upstream. It was recently pointed out that the NFSERR_SERVERFAULT error, which is designed to inform the user of a serious internal error on the server, was being mapped to an error value that is internal to the kernel. This patch maps it to the error EREMOTEIO, which is exported to userland through errno.h. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit 5ba0facdbeb73ead6fe04d6bc5947e2fb4f29320 Author: Trond Myklebust Date: Mon Feb 8 09:32:27 2010 -0500 NFS: Fix a bug in nfs_fscache_release_page() commit 2c1740098c708b465e87637b237feb2fd98f129a upstream. Not having an fscache cookie is perfectly valid if the user didn't mount with the fscache option. This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=15234 Signed-off-by: Trond Myklebust Acked-by: David Howells Signed-off-by: Greg Kroah-Hartman commit 16e63ecd5d683fe18d91fcd1e6a7f63468f7d805 Author: Trond Myklebust Date: Wed Feb 3 08:27:35 2010 -0500 NFS: Fix a umount race commit 387c149b54b4321cbc790dadbd4f8eedb5a90468 upstream. Ensure that we unregister the bdi before kill_anon_super() calls ida_remove() on our device name. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit 04673da74dbd331040fa439bd72963a35f1b67cf Author: Trond Myklebust Date: Wed Feb 3 08:27:22 2010 -0500 NFS: Fix an Oops when truncating a file commit 9f557cd8073104b39528794d44e129331ded649f upstream. The VM/VFS does not allow mapping->a_ops->invalidatepage() to fail. Unfortunately, nfs_wb_page_cancel() may fail if a fatal signal occurs. Since the NFS code assumes that the page stays mapped for as long as the writeback is active, we can end up Oopsing (among other things). The only safe fix here is to convert nfs_wait_on_request(), so as to make it uninterruptible (as is already the case with wait_on_page_writeback()). Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit e7055c2366a5a5b507492905200d4327949b81ce Author: Trond Myklebust Date: Tue Jan 26 15:42:21 2010 -0500 NFSv4: Ensure that the NFSv4 locking can recover from stateid errors commit 2bee72a6aa1e6d0a4f5da56217f0d0bbbdd0d9a3 upstream. In most cases, we just want to mark the lock_stateid sequence id as being uninitialised. Signed-off-by: Trond Myklebust Reviewed-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman commit 1236ff906f9d3044cd24d22463c3c943ee92e3a2 Author: Trond Myklebust Date: Tue Jan 26 15:42:30 2010 -0500 NFSv4: Don't allow posix locking against servers that don't support it commit 8e469ebd6dc32cbaf620e134d79f740bf0ebab79 upstream. Signed-off-by: Trond Myklebust Reviewed-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman commit 438b9c70b8800b0c12ec6bc784e00bbae24a75ca Author: Trond Myklebust Date: Tue Jan 26 15:41:53 2010 -0500 NFS: Try to commit unstable writes in nfs_release_page() commit 82be934a59ff891cac598727e5a862ba2b9d1fac upstream. If someone calls nfs_release_page(), we presumably already know that the page is clean, however it may be holding an unstable write. Signed-off-by: Trond Myklebust Reviewed-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman commit 1f9382ec17cc4fa5344b871658345e569fba8af7 Author: Trond Myklebust Date: Tue Jan 26 15:41:34 2010 -0500 NFS: Fix a reference leak in nfs_wb_cancel_page() commit c9edda7140ec6a22accf7f2f86da362dfbfd41fc upstream. Signed-off-by: Trond Myklebust Reviewed-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman commit ea332d671c5f6802d85572c2af13b9a671d8ea88 Author: Jeff Layton Date: Fri Feb 5 13:14:00 2010 -0500 cifs: fix length calculation for converted unicode readdir names commit f12f98dba6ea1517cd7fbb912208893b9c014c15 upstream. cifs_from_ucs2 returns the length of the converted name, including the length of the NULL terminator. We don't want to include the NULL terminator in the dentry name length however since that'll throw off the hash calculation for the dentry cache. I believe that this is the root cause of several problems that have cropped up recently that seem to be papered over with the "noserverino" mount option. More confirmation of that would be good, but this is clearly a bug and it fixes at least one reproducible problem that was reported. This patch fixes at least this reproducer in this kernel.org bug: http://bugzilla.kernel.org/show_bug.cgi?id=15088#c12 Reported-by: Bjorn Tore Sund Acked-by: Dave Kleikamp Signed-off-by: Jeff Layton Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman commit 35e2093d5d7b632c083af3578c05876375828314 Author: Michael Neuling Date: Wed Feb 10 13:56:42 2010 -0800 fs/exec.c: restrict initial stack space expansion to rlimit commit 803bf5ec259941936262d10ecc84511b76a20921 upstream. When reserving stack space for a new process, make sure we're not attempting to expand the stack by more than rlimit allows. This fixes a bug caused by b6a2fea39318e43fee84fa7b0b90d68bed92d2ba ("mm: variable length argument support") and unmasked by fc63cf237078c86214abcb2ee9926d8ad289da9b ("exec: setup_arg_pages() fails to return errors"). This bug means that when limiting the stack to less the 20*PAGE_SIZE (eg. 80K on 4K pages or 'ulimit -s 79') all processes will be killed before they start. This is particularly bad with 64K pages, where a ulimit below 1280K will kill every process. To test, do: 'ulimit -s 15; ls' before and after the patch is applied. Before it's applied, 'ls' should be killed. After the patch is applied, 'ls' should no longer be killed. A stack limit of 15KB since it's small enough to trigger 20*PAGE_SIZE. Also 15KB not a multiple of PAGE_SIZE, which is a trickier case to handle correctly with this code. 4K pages should be fine to test with. [kosaki.motohiro@jp.fujitsu.com: cleanup] [akpm@linux-foundation.org: cleanup cleanup] Signed-off-by: Michael Neuling Signed-off-by: KOSAKI Motohiro Cc: Americo Wang Cc: Anton Blanchard Cc: Oleg Nesterov Cc: James Morris Cc: Ingo Molnar Cc: Serge Hallyn Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 3d87cb443857acc25dddd3696b6f7a459807d154 Author: Jiri Slaby Date: Thu Nov 19 17:16:37 2009 +0100 resource: add helpers for fetching rlimits commit 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd upstream. We want to be sure that compiler fetches the limit variable only once, so add helpers for fetching current and maximal resource limits which do that. Add them to sched.h (instead of resource.h) due to circular dependency sched.h->resource.h->task_struct Alternative would be to create a separate res_access.h or similar. Signed-off-by: Jiri Slaby Cc: James Morris Cc: Heiko Carstens Cc: Andrew Morton Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 27df9c09dd64b05f862d5a05cfb1b1e479a44f0c Author: Dan Williams Date: Wed Jan 13 13:33:12 2010 -0700 ioat: fix infinite timeout checking in ioat2_quiesce commit 7e55a70c5b9a57c12f49c44b0847c9343d4f54e4 upstream. Fix typo in ioat2_quiesce. check 'tmo' is zero, not 'end'. Also applies to 2.6.32.3 Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit 2b8fcd4ed0db58421d1600ff6e3b01dd68b3ef83 Author: Stephen M. Cameron Date: Fri Feb 5 13:14:04 2010 +0100 cciss: Make cciss_seq_show handle holes in the h->drv[] array commit 531c2dc70d339c5dfa8c3eb628c3459dc6f3a075 upstream. It is possible (and expected) for there to be holes in the h->drv[] array, that is, some elements may be NULL pointers. cciss_seq_show needs to be made aware of this possibility to avoid an Oops. To reproduce the Oops which this fixes: 1) Create two "arrays" in the Array Configuratino Utility and several logical drives on each array. 2) cat /proc/driver/cciss/cciss* in an infinite loop 3) delete some of the logical drives in the first "array." Signed-off-by: Stephen M. Cameron Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit e031c71282e8223cc8fc088e4c1bf86900ce9927 Author: Jun'ichi Nomura Date: Fri Jan 29 09:56:22 2010 +0900 freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb commit 4b06e5b9ad8abb20105b2b25e42c509ebe9b2d76 upstream. Thanks Thomas and Christoph for testing and review. I removed 'smp_wmb()' before up_write from the previous patch, since up_write() should have necessary ordering constraints. (I.e. the change of s_frozen is visible to others after up_write) I'm quite sure the change is harmless but if you are uncomfortable with Tested-by/Reviewed-by on the modified patch, please remove them. If MS_RDONLY, freeze_bdev should just up_write(s_umount) instead of deactivate_locked_super(). Also, keep sb->s_frozen consistent so that remount can check the frozen state. Otherwise a crash reported here can happen: http://lkml.org/lkml/2010/1/16/37 http://lkml.org/lkml/2010/1/28/53 This patch should be applied for 2.6.32 stable series, too. Reviewed-by: Christoph Hellwig Tested-by: Thomas Backlund Signed-off-by: Jun'ichi Nomura Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit 344542028e96bd2c105ea5da4330af90db94e2b7 Author: Thomas Renninger Date: Mon Dec 14 11:44:15 2009 +0100 CPUFREQ: Fix use after free of struct powernow_k8_data commit 557a701c16553b0b691dbb64ef30361115a80f64 upstream. Easy fix for a regression introduced in 2.6.31. On managed CPUs the cpufreq.c core will call driver->exit(cpu) on the managed cpus and powernow_k8 will free the core's data. Later driver->get(cpu) function might get called trying to read out the current freq of a managed cpu and the NULL pointer check does not work on the freed object -> better set it to NULL. ->get() is unsigned and must return 0 as invalid frequency. Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14391 Signed-off-by: Thomas Renninger Tested-by: Michal Schmidt Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit 65798849d8abac3b382f6d3c2ef6a3722657cd19 Author: Jody Bruchon Date: Sat Feb 6 10:46:26 2010 -0500 ALSA: hda-intel: Avoid divide by zero crash commit fed08d036f2aabd8d0c684439de37f8ebec2bbc2 upstream. On my AMD780V chipset, hda_intel.c can crash the kernel with a divide by zero for as-yet unknown reasons. A simple check for zero prevents it, though the problem that causes it remains. Since the workaround is harmless and won't affect anyone except victims of this bug, it should be safe; moreover, because this crash can be triggered by a user-mode application, there are denial of service implications on the systems affected by the bug without the patch. Signed-off-by: Jody Bruchon Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit bb0d31fbf221f50a44ba5d59dfcf54bbf128ac2b Author: Mark Brown Date: Thu Feb 11 19:20:48 2010 +0000 regulator: Fix display of null constraints for regulators commit 973e9a2795b3b41d8408a0bb6f87b783c5efc88a upstream. If the regulator constraints are empty and there is no voltage reported then nothing will be added to the text displayed for the constraints, leading to random stack data being printed. This is unlikely to happen for practical regulators since most will at least report a voltage but should still be fixed. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood Signed-off-by: Greg Kroah-Hartman commit a20bc629020fc785f75f6c7051795b5a12b0e932 Author: Daniel Vetter Date: Sun Feb 7 16:20:18 2010 +0100 drm/i915: Update write_domains on active list after flush. commit 99fcb766a3a50466fe31d743260a3400c1aee855 upstream. Before changing the status of a buffer with a pending write we will await upon a new flush for that buffer. So we can take advantage of any flushes posted whilst the buffer is active and pending processing by the GPU, by clearing its write_domain and updating its last_rendering_seqno -- thus saving a potential flush in deep queues and improves flushing behaviour upon eviction for both GTT space and fences. In order to reduce the time spent searching the active list for matching write_domains, we move those to a separate list whose elements are the buffers belong to the active/flushing list with pending writes. Orignal patch by Chris Wilson , forward-ported by me. In addition to better performance, this also fixes a real bug. Before this changes, i915_gem_evict_everything didn't work as advertised. When the gpu was actually busy and processing request, the flush and subsequent wait would not move active and dirty buffers to the inactive list, but just to the flushing list. Which triggered the BUG_ON at the end of this function. With the more tight dirty buffer tracking, all currently busy and dirty buffers get moved to the inactive list by one i915_gem_flush operation. I've left the BUG_ON I've used to prove this in there. References: Bug 25911 - 2.10.0 causes kernel oops and system hangs http://bugs.freedesktop.org/show_bug.cgi?id=25911 Bug 26101 - [i915] xf86-video-intel 2.10.0 (and git) triggers kernel oops within seconds after login http://bugs.freedesktop.org/show_bug.cgi?id=26101 Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson Tested-by: Adam Lantos Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 68c12bf53608bceef97da294778dfa10349c7223 Author: Chris Wilson Date: Tue Feb 9 14:14:36 2010 +0000 drm/i915: Increase fb alignment to 64k commit fd2e8ea597222b8f38ae8948776a61ea7958232e upstream. An untiled framebuffer must be aligned to 64k. This is normally handled by intel_pin_and_fence_fb_obj(), but the intelfb_create() likes to be different and do the pinning itself. However, it aligns the buffer object incorrectly for pre-i965 chipsets causing a PGTBL_ERR when it is installed onto the output. Fixes: KMS error message while initializing modesetting - render error detected: EIR: 0x10 [i915] http://bugs.freedesktop.org/show_bug.cgi?id=22936 Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit d37bec021841c4388e9046d331291b4787932fdf Author: Jesse Barnes Date: Sat Feb 6 10:41:53 2010 -0800 drm/i915: handle FBC and self-refresh better commit ee25df2bc379728c45d81e04cf87984db1425edf upstream. On 945, we need to avoid entering self-refresh if the compressor is busy, or we may cause display FIFO underruns leading to ugly flicker. Fixes fdo bug #24314, kernel bug #15043. Tested-by: Alexander Lam Signed-off-by: Jesse Barnes Tested-by: Julien Cristau (fd.o #25371) Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 17eff773b4c988e6de965446283de7315ffbac85 Author: Jean Delvare Date: Fri Feb 5 17:48:13 2010 +0100 i2c-tiny-usb: Fix on big-endian systems commit 1c010ff8912cbc08d80e865aab9c32b6b00c527d upstream. The functionality bit vector is always returned as a little-endian 32-bit number by the device, so it must be byte-swapped to the host endianness. On the other hand, the delay value is handled by the USB stack, so no byte swapping is needed on our side. This fixes bug #15105: http://bugzilla.kernel.org/show_bug.cgi?id=15105 Reported-by: Jens Richter Signed-off-by: Jean Delvare Tested-by: Jens Richter Cc: Till Harbaum Signed-off-by: Greg Kroah-Hartman commit ce460107ed450221d040be0cf088973e58ad23eb Author: Paul Mundt Date: Thu Feb 4 06:57:58 2010 +0000 usb: r8a66597-hcd: Flush the D-cache for the pipe-in transfer buffers. commit 2717568e7c44fe7dc3f4f52ea823811cfeede2b5 upstream. This implements the same D-cache flushing logic for r8a66597-hcd as Catalin's isp1760 (http://patchwork.kernel.org/patch/76391/) change, with the same note applying here as well: When the HDC driver writes the data to the transfer buffers it pollutes the D-cache (unlike DMA drivers where the device writes the data). If the corresponding pages get mapped into user space, there are no additional cache flushing operations performed and this causes random user space faults on architectures with separate I and D caches (Harvard) or those with aliasing D-cache. This fixes up crashes during USB boot on SH7724 and others: http://marc.info/?l=linux-sh&m=126439837308912&w=2 Reported-by: Goda Yusuke Tested-by: Goda Yusuke Signed-off-by: Paul Mundt Acked-by: Yoshihiro Shimoda Signed-off-by: Greg Kroah-Hartman commit 6ea0e838a5594a90c5a0a4fdf989831e34684cb0 Author: Zhao Yakui Date: Fri Dec 11 09:26:10 2009 +0800 drm/i915: Add MALATA PC-81005 to ACPI LID quirk list commit a3cb5195f6db58dbebd8a31b877ddce082c9b63d upstream. The MALATA PC-81005 laptop always reports that the LID status is closed and we can't use it reliabily for LVDS detection. So add this box into the quirk list. https://bugs.freedesktop.org/show_bug.cgi?id=25523 Signed-off-by: Zhao Yakui Review-by: Jesse Barnes Tested-by: Hector Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 215bccb7df012f5d1fcf3e686c0a8167cea91ad3 Author: Zhao Yakui Date: Thu Jan 21 15:20:18 2010 +0800 drm/i915: Fix the incorrect DMI string for Samsung SX20S laptop commit f034b12dbb5749b11e9390e15e93ffa87ece8038 upstream. Signed-off-by: Zhao Yakui Reported-by: Philipp Kohlbecher Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 192ff23a2206eb5136c779bfed73171a4d214ad6 Author: Zhao Yakui Date: Wed Jan 6 13:30:36 2010 +0800 drm/i915: Add HP nx9020/SamsungSX20S to ACPI LID quirk list commit 40f33a92100f4d9b6e85ad642100cfe42d7ff57d upstream. The HP comaq nx9020/Samsung SX20S laptop always report that the LID status is closed and we can't use it reliabily for LVDS detection. So add the two boxes into the quirk list. http://bugzilla.kernel.org/show_bug.cgi?id=14957 http://bugzilla.kernel.org/show_bug.cgi?id=14554 Signed-off-by: Zhao Yakui Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 89fcd01fc9e169e4082c842b82cc428b3693f4b3 Author: Eric Anholt Date: Tue Dec 1 11:56:30 2009 -0800 drm/i915: Fix DDC on some systems by clearing BIOS GMBUS setup. commit f0217c42c9ab3d772e543f635ce628b9478f70b6 upstream. This is a sync of a fix I made in the old UMS code. If the BIOS uses the GMBUS and doesn't clear that setup, then our bit-banging I2C can fail, leading to monitors not being detected. Signed-off-by: Eric Anholt Cc: maximilian attems Signed-off-by: Greg Kroah-Hartman commit de00361567b613202c24bb31d48481da6d9d2959 Author: David John Date: Wed Jan 27 15:19:08 2010 +0530 drm/i915: Disable SR when more than one pipe is enabled commit 33c5fd121eabbccc9103daf6cda36941eb3c349f upstream. Self Refresh should be disabled on dual plane configs. Otherwise, as the SR watermark is not calculated for such configs, switching to non VGA mode causes FIFO underrun and display flicker. This fixes Korg Bug #14897. Signed-off-by: David John Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit e0ddca206e8b551662316053087e9e1184f11a34 Author: Jesse Barnes Date: Mon Oct 19 10:08:17 2009 +0900 drm/i915: enable self-refresh on 965 commit 1dc7546d1a73664e5d117715b214bea9cae5951c upstream. Need to calculate the SR watermark and enable it. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 6240058ce3725f5e708e1c17c3a676217e44ba9b Author: Zhenyu Wang Date: Mon Jan 25 10:35:16 2010 +0800 drm/i915: disable hotplug detect before Ironlake CRT detect commit eceb784cec4dc0fcc2993d9ee4a7c0d111ada80a upstream. This tries to fix CRT detect loop hang seen on some Ironlake form factor, to clear up hotplug detect state before taking CRT detect to make sure next hotplug detect cycle is consistent. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit c58b0c5ba927f27a610bb6b0b08b2d6288d5da17 Author: Jaroslav Kysela Date: Tue Feb 2 19:58:25 2010 +0100 ALSA: ctxfi - fix PTP address initialization commit 21956b61f594f7924d98240da74bc81c28601fa9 upstream. After hours of debugging, I finally found the reason why some source and runtime combination does not work. The PTP (page table pages) address must be aligned. I am not sure how much, but alignment to PAGE_SIZE is sufficient. Also, use ALSA's page allocation routines to ensure proper virtual -> physical address translation. Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit ea5d622831d40005e9219658d4987b1efd2350ab Author: Ray Copeland Date: Fri Feb 5 19:58:35 2010 +0100 hwmon: (adt7462) Wrong ADT7462_VOLT_COUNT commit 85f8d3e5faea8bd36c3e5196f8334f7db45e19b2 upstream. The #define ADT7462_VOLT_COUNT is wrong, it should be 13 not 12. All the for loops that use this as a limit count are of the typical form, "for (n = 0; n < ADT7462_VOLT_COUNT; n++)", so to loop through all voltages w/o missing the last one it is necessary for the count to be one greater than it is. (Specifically, you will miss the +1.5V 3GPIO input with count = 12 vs. 13.) Signed-off-by: Ray Copeland Acked-by: "Darrick J. Wong" Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3f28a62b9db311d6f45a5b0d7a9b2d4daae4afe1 Author: Jean Delvare Date: Fri Feb 5 19:58:36 2010 +0100 hwmon: (lm78) Request I/O ports individually for probing commit 197027e6ef830d60e10f76efc8d12bf3b6c35db5 upstream. Different motherboards have different PNP declarations for LM78/LM79 chips. Some declare the whole range of I/O ports (8 ports), some declare only the useful ports (2 ports at offset 5) and some declare fancy ranges, for example 4 ports at offset 4. To properly handle all cases, request all ports individually for probing. After we have determined that we really have an LM78 or LM79 chip, the useful port range will be requested again, as a single block. This fixes the driver on the Olivetti M3000 DT 540, at least. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3659b59c77436fb29437cb57cdd72a26de0ded8c Author: Jean Delvare Date: Fri Feb 5 19:58:36 2010 +0100 hwmon: (w83781d) Request I/O ports individually for probing commit b0bcdd3cd0adb85a7686b396ba50493871b1135c upstream. Different motherboards have different PNP declarations for W83781D/W83782D chips. Some declare the whole range of I/O ports (8 ports), some declare only the useful ports (2 ports at offset 5) and some declare fancy ranges, for example 4 ports at offset 4. To properly handle all cases, request all ports individually for probing. After we have determined that we really have a W83781D or W83782D chip, the useful port range will be requested again, as a single block. I did not see a board which needs this yet, but I know of one for lm78 driver and I'd like to keep the logic of these two drivers in sync. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3520341ce308afaf676c961e8432ff5c87d3121b Author: Linus Torvalds Date: Sun Feb 7 10:11:23 2010 -0800 Fix race in tty_fasync() properly commit 80e1e823989ec44d8e35bdfddadbddcffec90424 upstream. This reverts commit 703625118069 ("tty: fix race in tty_fasync") and commit b04da8bfdfbb ("fnctl: f_modown should call write_lock_irqsave/ restore") that tried to fix up some of the fallout but was incomplete. It turns out that we really cannot hold 'tty->ctrl_lock' over calling __f_setown, because not only did that cause problems with interrupt disables (which the second commit fixed), it also causes a potential ABBA deadlock due to lock ordering. Thanks to Tetsuo Handa for following up on the issue, and running lockdep to show the problem. It goes roughly like this: - f_getown gets filp->f_owner.lock for reading without interrupts disabled, so an interrupt that happens while that lock is held can cause a lockdep chain from f_owner.lock -> sighand->siglock. - at the same time, the tty->ctrl_lock -> f_owner.lock chain that commit 703625118069 introduced, together with the pre-existing sighand->siglock -> tty->ctrl_lock chain means that we have a lock dependency the other way too. So instead of extending tty->ctrl_lock over the whole __f_setown() call, we now just take a reference to the 'pid' structure while holding the lock, and then release it after having done the __f_setown. That still guarantees that 'struct pid' won't go away from under us, which is all we really ever needed. Reported-and-tested-by: Tetsuo Handa Acked-by: Greg Kroah-Hartman Acked-by: Am��rico Wang Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 22240ab64b5c6e76b3aa011808111cc3aed0a1ff Author: Thomas Gleixner Date: Wed Feb 3 09:33:05 2010 +0100 futex: Handle futex value corruption gracefully commit 59647b6ac3050dd964bc556fe6ef22f4db5b935c upstream. The WARN_ON in lookup_pi_state which complains about a mismatch between pi_state->owner->pid and the pid which we retrieved from the user space futex is completely bogus. The code just emits the warning and then continues despite the fact that it detected an inconsistent state of the futex. A conveniant way for user space to spam the syslog. Replace the WARN_ON by a consistency check. If the values do not match return -EINVAL and let user space deal with the mess it created. This also fixes the missing task_pid_vnr() when we compare the pi_state->owner pid with the futex value. Reported-by: Jermome Marchand Signed-off-by: Thomas Gleixner Acked-by: Darren Hart Acked-by: Peter Zijlstra Signed-off-by: Greg Kroah-Hartman commit c03d9d422d8dd3e8d2cd9e200e420bbaed5cb577 Author: Thomas Gleixner Date: Tue Feb 2 11:40:27 2010 +0100 futex: Handle user space corruption gracefully commit 51246bfd189064079c54421507236fd2723b18f3 upstream. If the owner of a PI futex dies we fix up the pi_state and set pi_state->owner to NULL. When a malicious or just sloppy programmed user space application sets the futex value to 0 e.g. by calling pthread_mutex_init(), then the futex can be acquired again. A new waiter manages to enqueue itself on the pi_state w/o damage, but on unlock the kernel dereferences pi_state->owner and oopses. Prevent this by checking pi_state->owner in the unlock path. If pi_state->owner is not current we know that user space manipulated the futex value. Ignore the mess and return -EINVAL. This catches the above case and also the case where a task hijacks the futex by setting the tid value and then tries to unlock it. Reported-by: Jermome Marchand Signed-off-by: Thomas Gleixner Acked-by: Darren Hart Acked-by: Peter Zijlstra Signed-off-by: Greg Kroah-Hartman commit 5f6af116c22817a6fe1999cc2d3925897af89086 Author: Mikael Pettersson Date: Sat Jan 23 22:36:29 2010 +0100 futex_lock_pi() key refcnt fix commit 5ecb01cfdf96c5f465192bdb2a4fd4a61a24c6cc upstream. This fixes a futex key reference count bug in futex_lock_pi(), where a key's reference count is incremented twice but decremented only once, causing the backing object to not be released. If the futex is created in a temporary file in an ext3 file system, this bug causes the file's inode to become an "undead" orphan, which causes an oops from a BUG_ON() in ext3_put_super() when the file system is unmounted. glibc's test suite is known to trigger this, see . The bug is a regression from 2.6.28-git3, namely Peter Zijlstra's 38d47c1b7075bd7ec3881141bb3629da58f88dab "[PATCH] futex: rely on get_user_pages() for shared futexes". That commit made get_futex_key() also increment the reference count of the futex key, and updated its callers to decrement the key's reference count before returning. Unfortunately the normal exit path in futex_lock_pi() wasn't corrected: the reference count is incremented by get_futex_key() and queue_lock(), but the normal exit path only decrements once, via unqueue_me_pi(). The fix is to put_futex_key() after unqueue_me_pi(), since 2.6.31 this is easily done by 'goto out_put_key' rather than 'goto out'. Signed-off-by: Mikael Pettersson Acked-by: Peter Zijlstra Acked-by: Darren Hart Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit 7313f5ad0cb1b501cbe67cf6c2dee018a2aa3321 Author: Linus Torvalds Date: Fri Feb 5 16:16:50 2010 -0800 Fix potential crash with sys_move_pages commit 6f5a55f1a6c5abee15a0e878e5c74d9f1569b8b0 upstream. We incorrectly depended on the 'node_state/node_isset()' functions testing the node range, rather than checking it explicitly. That's not reliable, even if it might often happen to work. So do the proper explicit test. Reported-by: Marcus Meissner Acked-and-tested-by: Brice Goglin Acked-by: Hugh Dickins Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 494d3b1d024487c3392ce4fb4d7b547d8bbb45e1 Author: Iliyan Malchev Date: Mon Feb 22 15:41:08 2010 -0800 [ARM] msm_defconfig: set CONFIG_DEBUG_BUGVERBOSE Signed-off-by: Iliyan Malchev commit 9d040d71002f7084817ad9a7df1da9d8d50300c6 Author: Mike Chan Date: Fri Feb 19 18:14:14 2010 -0800 power: ds2784: Change workqueue to freezable. Prevent i2c errors when making transactions while bridge is suspended. Wait until drivers have resumed before executing workqueue. Change-Id: I78c787fd5dd09fc7700f3093341532fe23f20eb8 Signed-off-by: Mike Chan commit 21ba0cac4b63286aaf41befb3b93c8ffb5036306 Author: Yongseok Koh Date: Tue Jan 19 17:33:49 2010 +0900 vmalloc: remove BUG_ON due to racy counting of VM_LAZY_FREE In free_unmap_area_noflush(), va->flags is marked as VM_LAZY_FREE first, and then vmap_lazy_nr is increased atomically. But, in __purge_vmap_area_lazy(), while traversing of vmap_are_list, nr is counted by checking VM_LAZY_FREE is set to va->flags. After counting the variable nr, kernel reads vmap_lazy_nr atomically and checks a BUG_ON condition whether nr is greater than vmap_lazy_nr to prevent vmap_lazy_nr from being negative. The problem is that, if interrupted right after marking VM_LAZY_FREE, increment of vmap_lazy_nr can be delayed. Consequently, BUG_ON condition can be met because nr is counted more than vmap_lazy_nr. It is highly probable when vmalloc/vfree are called frequently. This scenario have been verified by adding delay between marking VM_LAZY_FREE and increasing vmap_lazy_nr in free_unmap_area_noflush(). Even the vmap_lazy_nr is for checking high watermark, it never be the strict watermark. Although the BUG_ON condition is to prevent vmap_lazy_nr from being negative, vmap_lazy_nr is signed variable. So, it could go down to negative value temporarily. Consequently, removing the BUG_ON condition is proper. A possible BUG_ON message is like the below. kernel BUG at mm/vmalloc.c:517! invalid opcode: 0000 [#1] SMP EIP: 0060:[] EFLAGS: 00010297 CPU: 3 EIP is at __purge_vmap_area_lazy+0x144/0x150 EAX: ee8a8818 EBX: c08e77d4 ECX: e7c7ae40 EDX: c08e77ec ESI: 000081fe EDI: e7c7ae60 EBP: e7c7ae64 ESP: e7c7ae3c DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 Call Trace: [] free_unmap_vmap_area_noflush+0x69/0x70 [] remove_vm_area+0x22/0x70 [] __vunmap+0x45/0xe0 [] vmalloc+0x2c/0x30 Code: 8d 59 e0 eb 04 66 90 89 cb 89 d0 e8 87 fe ff ff 8b 43 20 89 da 8d 48 e0 8d 43 20 3b 04 24 75 e7 fe 05 a8 a5 a3 c0 e9 78 ff ff ff <0f> 0b eb fe 90 8d b4 26 00 00 00 00 56 89 c6 b8 ac a5 a3 c0 31 EIP: [] __purge_vmap_area_lazy+0x144/0x150 SS:ESP 0068:e7c7ae3c [ See also http://marc.info/?l=linux-kernel&m=126335856228090&w=2 ] Signed-off-by: Yongseok Koh Reviewed-by: Minchan Kim Cc: Nick Piggin Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 7175b7585f84bb8e7de5f6a1e694c3275377cecb Author: Mike Chan Date: Tue Feb 16 14:18:55 2010 -0800 power: wakelock: Print active wakelocks when has_wake_lock() is called When DEBUG_SUSPEND is enabled print active wakelocks when we check if there are any active wakelocks. In print_active_locks(), print expired wakelocks if DEBUG_EXPIRE is enabled Change-Id: Ib1cb795555e71ff23143a2bac7c8a58cbce16547 Signed-off-by: Mike Chan commit 0303d48afbbd7bde0682c20c0eff4439d8e9f0bb Author: Gary King Date: Fri Feb 5 09:13:40 2010 -0800 fix race between cache flush and kmap tlb shootdown for highmem pages, flush_dcache_page must pin the kmap mapping in-place using kmap_high_get, to ensure that the cache maintenance does not race with another context calling kunmap_high on the same page and causing the PTE to be zapped. Signed-off-by: Gary King Backport to 2.6.32. Signed-off-by: Arve Hj��nnev��g Change-Id: I395249e916e382c4e1282a316498ef8d5e38741b commit 45ae2e99f29c2c4aadbab898caf6549ae4f38307 Author: Mike Chan Date: Wed Feb 17 18:27:24 2010 -0800 i2c: busses: msm: Only acquire wakelock if xfer active in suspend Now i2c transfers do not abort suspend, as it did previously. Change-Id: Ib908d64a7daa3b0cb76b08e3441f68c42758b5fa Signed-off-by: Mike Chan commit 328bda94d0d4037be1a5d61a9572f19927aef2c5 Author: Dmitry Shmidt Date: Thu Feb 18 17:15:02 2010 -0800 net: wireless: bcm4329: Fix wl_iw_get_rssi() function Signed-off-by: Dmitry Shmidt commit 980bfabc06ae4d0db1092784c40657f2173edefe Author: Mike Lockwood Date: Thu Feb 18 09:50:28 2010 -0500 usb: gadget: u_ether: Remove warning from gether_disconnect() gether_disconnect() is always called before gether_connect() by the different USB ethernet functions, so this warning was firing during normal operation. Change-Id: I178cc7d1f67e9e87ac2e99c6674c4db8fcddf4a0 Signed-off-by: Mike Lockwood commit b448420178fa09bae903930adfbbc888c211afd4 Author: Arve Hj��nnev��g Date: Wed Jan 27 20:25:43 2010 -0800 [ARM] msm: mahimahi: Add touchscreen parameters for firmware version 5. Also change the x-axis parameters slightly for the old touchscreen. Change-Id: Ifc9bf5ca98361cc4c389632fe589fe01e8c16319 Signed-off-by: Arve Hj��nnev��g commit ce1c698ea8a242f386d03f236fac1af4f0e83495 Author: Nick Pelly Date: Wed Feb 17 20:45:48 2010 -0800 Revert "Bluetooth: Fix rejected connection not disconnecting ACL link" This reverts commit 9e726b17422bade75fba94e625cd35fd1353e682. Change-Id: I3bc2e4caa2a0e0c36b9c7de4a09b03276adae4e1 Signed-off-by: Nick Pelly commit 90eaad0def9d28a13a690802d4a80cc5725122e8 Author: Iliyan Malchev Date: Wed Feb 17 16:58:17 2010 -0800 [ARM] qsd8k: mahimahi: update the MPLL clock value on CDMA (235.93 MHz) Signed-off-by: Iliyan Malchev commit 8c5ff75d03205315508a929785fe036acdeadb87 Author: Iliyan Malchev Date: Wed Feb 17 16:50:29 2010 -0800 [ARM] qsd8k: add the ability to override the MPLL frequency Signed-off-by: Iliyan Malchev commit 2f0b504ec27454b530a62f3e4b1059a178359bb6 Author: Colin Cross Date: Wed Feb 17 16:26:37 2010 -0800 [ARM] msm: mdp: Fix blits with FLIP_UD set The calculation of the rotated y address was incorrect because the dst_ystride variable had already been munged into hardware format. Change-Id: I451205e915d2ef8166c3389d67c34138aeccc59d Signed-off-by: Colin Cross commit 54d7d73e267fbcdd334e23f86e3735a050313817 Author: Mike Lockwood Date: Wed Feb 17 18:48:26 2010 -0500 [ARM] msm: mahimahi_defconfig: Enable CONFIG_USB_ANDROID_RNDIS_WCEIS Change-Id: If241d0589ef66a56b4548346585a6f5677ec24ac Signed-off-by: Mike Lockwood commit 7354fe7b253c6441903d1cd49d14c83f1a6bf2b5 Merge: f9d47bf aace891 Author: Dima Zavin Date: Wed Feb 17 15:00:30 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit f9d47bfcd50fc03151911554e42f12c1a55ab4d2 Author: Iliyan Malchev Date: Wed Feb 17 14:21:47 2010 -0800 [ARM] mahimahi_defconfig: turn off swap Signed-off-by: Iliyan Malchev commit 41c4165b6efd7036dabcf266fd2bdf5f83df7485 Author: Mike Lockwood Date: Wed Feb 17 16:45:04 2010 -0500 [ARM] msm: usb: gadget: Fix reference after free bug in handle_endpoint() Change-Id: I5ca4121f43d002719c16fa8c0bcbdd67695bb189 Signed-off-by: Mike Lockwood commit fefbc0eadc9b10e2651cdcfeab0a639e98b0382f Author: Dima Zavin Date: Tue Feb 16 18:02:11 2010 -0800 [ARM] msm: mahimahi: Bump the reserved gpu memory from 3MB to 5MB This is necessary in order to support more than a handful of contexts due to new per-context page table support. Change-Id: I4e657e16f27919753c60b55f5bb3e9d5008cfd7a Signed-off-by: Dima Zavin commit a4b4a6ac4531ea4c6a62a65096c858382a9cc294 Author: Shubhraprakash Das Date: Thu Dec 3 18:59:00 2009 -0700 [ARM] msm: kgsl: switch to using per-fd page tables for GPU Instead of sharing a single, global page table, each GPU user (and fd) gets it's own set of page tables. This increases the per-context overhead in the driver, but greatly improves security and isolation. Change-Id: Ia3ad18204733cc9a4bae054f8f06cda697125640 Cc: Shubhraprakash Das Signed-off-by: Dima Zavin commit da9deb36ca38d646b52e76afc354c36783599100 Author: Dmitry Shmidt Date: Wed Feb 17 10:37:55 2010 -0800 net: wireless: bcm4329: Update to version 4.218.198 Signed-off-by: Dmitry Shmidt commit aace891ed58b0081b0207debb517567a499b50ed Author: Steve Kondik Date: Wed Feb 17 12:59:29 2010 -0500 Add USB_ANDROID_RNDIS_WCEIS option. Change-Id: I85973ebfcbfae6b401fb8b402842309c72655149 Signed-off-by: Mike Lockwood commit 0a39ec04c518d367d599db2edf1273edb5e2125e Author: Dima Zavin Date: Thu Dec 4 12:19:57 2008 -0800 mtd: nand: Allow NAND chip ids to be included standalone. Lets non-standard NAND drivers take advantage of known NAND chip information. Change-Id: I87e2fcb40b07b2ec91e102f1fa7f419a4b4af0a3 Signed-off-by: Dima Zavin commit 4f5aa52e86de9a3cb8333a731deab285795036cb Merge: adab5b4 3165252 Author: Dima Zavin Date: Tue Feb 16 11:42:40 2010 -0800 Merge branch 'android-2.6.32' into android-msm-2.6.32 commit 316525238a92d521456f389969b24adafc44c2e2 Author: Mike Lockwood Date: Sat Feb 13 16:37:16 2010 -0500 USB: gadget: android: Fix special case for RNDIS ethernet function Only set device descriptor bDeviceClass field to USB_CLASS_COMM when the RNDIS function is actually enabled. Signed-off-by: Mike Lockwood commit a3fccf6a0e53be3bff36f5c83d43b02fa7a629aa Author: Mike Lockwood Date: Sat Feb 13 19:16:07 2010 -0500 USB: composite: Compute interface numbers correctly when functions are hidden. Signed-off-by: Mike Lockwood commit adab5b4b2b4ac3a9073ae8faccf8be3fca99fb17 Author: Arve Hj��nnev��g Date: Tue Feb 9 20:39:25 2010 -0800 [ARM] Fix: Don't use domain manager mode when not needed. Some boot code passes kernel pointers to apis expecting user space pointers without calling set_fs first. Start with the kernel domain in manager mode so the system still boots. The previous patch changed the kernel domain to client mode, but since addr_limit was still set to KERNEL_DS, any code that called saved = get_fs(); set_fs(saved); would leave the kernel domain in manager mode and mask this problem. Change-Id: I9d9aecc3345402d475eb4b078880e50268d35535 Signed-off-by: Arve Hj��nnev��g commit ac0cf2c870ceb9e5199d7961cb3b1f7357177d14 Author: Mike Lockwood Date: Fri Feb 12 15:55:36 2010 -0500 [ARM] msm: htc: Board file changes for RNDS USB ethernet support. Change-Id: Idb40029bc35a2749cf07a76fcd56aeb0445ab8fe Signed-off-by: Mike Lockwood commit 3a82d82f8809bc61e82503af34ac51ed99e3e849 Author: Mike Lockwood Date: Fri Feb 12 15:54:48 2010 -0500 [ARM] msm: htc: Enable netfilter options needed for iptables in defconfig. Change-Id: I1a5c184fc3579ea2b773c62ac3fcd6c1b6281d97 Signed-off-by: Mike Lockwood commit 9545c29c1a3527cbf6059d09c758c6743a509be8 Author: Mike Lockwood Date: Fri Feb 12 14:44:32 2010 -0500 [ARM] msm: htc: Enable CONFIG_USB_ANDROID_RNDIS in defconfig Change-Id: I85ea2e15bb65fff73aa444b197d46a19eda85b9e Signed-off-by: Mike Lockwood commit 9a22f89408b725160d749ae6088e99dd99f090e9 Author: HK Chen Date: Wed Feb 10 23:06:42 2010 -0800 [ARM] qsd8k: audio: fix device auto reboot for first MT call (CDMA revs) Signed-off-by: Iliyan Malchev commit 3decea6e63157c3bd33ec28d4d68b1345567aaab Author: Haley Teng Date: Tue Feb 9 18:00:25 2010 -0800 [ARM] msm: usb: diag: add an ioctl to support dynamic routing of command ids Signed-off-by: Iliyan Malchev commit d6888e342606fcbc8faf5b8ce712b63a53380e2c Author: Haley Teng Date: Tue Feb 9 16:19:59 2010 -0800 [ARM] msm: usb: diag: add support to route some diag data to userspace -- compiles conditionally based on ROUTE_TO_USERSPACE -- when /dev/diag is opened, command ids 0xfb..0xff are routed to userspace Signed-off-by: Iliyan Malchev commit 86e0ec63937d6d55ce62dcc3bc1d6d03315f1551 Author: Haley Teng Date: Tue Feb 9 16:01:09 2010 -0800 [ARM] msm: usb: diag: export an attribute for userland to read SMD_DIAG traffic -- /sys/module/diag/parameters/tx_rx_count -- traffic is read in bytes Signed-off-by: Iliyan Malchev commit b188d384fcd1688fbd34a2689ce6f66e5c022d59 Author: Vincent Kao Date: Tue Feb 9 14:32:52 2010 -0800 [ARM] msm: usb: diag: implement tx/rx usb_request queues The queues replace original single req_in/req_out. Signed-off-by: Vincent Kao Signed-off-by: Haley Teng Signed-off-by: Iliyan Malchev commit 19badb0cad27224c10eb4ac79d165ab7e5197a06 Author: Haley Teng Date: Tue Feb 9 19:41:04 2010 -0800 [ARM] msm: mahimahi: register matrix key (2, 2) as dummy key on CDMA Signed-off-by: Iliyan Malchev commit df033fb02117e29162f32fcd04292cfa001b1e3a Author: Mike Lockwood Date: Mon Feb 8 05:35:19 2010 -0500 [ARM] msm: usb: gadget: Set max packet size to 64 for non-bulk endpoints. Signed-off-by: Mike Lockwood commit b78296d7c1fd8750ce32065faade31ee190a3633 Author: Mike Lockwood Date: Wed Feb 10 15:30:26 2010 -0500 [ARM] msm: mahimahi: board file support for RNDIS USB networking function Signed-off-by: Mike Lockwood commit c1aee63000bffb179ec1790a6afc3adc6c7cdbf3 Author: Mike Lockwood Date: Wed Feb 10 15:30:58 2010 -0500 [ARM] msm: mahimahi: Enable CONFIG_USB_ANDROID_RNDIS in defconfig Signed-off-by: Mike Lockwood commit eed2a638e97709135c8f419d0042f9bf040fe817 Author: Dima Zavin Date: Wed Feb 10 15:36:51 2010 -0800 [ARM] mtd: msm_nand: convert to using the flash_ids table for nand device info Rather than hard code yet another table of nand device ids, use the list that is part of the nand subsystem. Also, use the data in the extended device id info to properly set the device topology, instead of hardcoding. Change-Id: I3fd1493dabaae401ce6f33d0e6059c4296bb26e1 Signed-off-by: Dima Zavin commit d6d9645a82463b858f1b585eb5886f84d4ea026f Author: Dima Zavin Date: Wed Feb 10 15:42:03 2010 -0800 [ARM] mtd: msm_nand: Convert all NAND_ defines to MSM_NAND_ Needed to prevent collisions with defines in Change-Id: I2c82b6517947b65a5750752fe173c43d888a42e9 Signed-off-by: Dima Zavin commit d63d4964d75b9ad0aba91e82a943ebd84c7f07be Author: Dima Zavin Date: Thu Dec 4 12:19:57 2008 -0800 mtd: nand: Allow NAND chip ids to be included standalone. Lets non-standard NAND drivers take advantage of known NAND chip information. Change-Id: I3953d1c5e658d6d6871295d069f2555afd622118 Signed-off-by: Dima Zavin commit 450d70ddce9b4f2764cce9f994166d39236ac351 Author: Haley Teng Date: Wed Feb 10 12:47:29 2010 -0800 [ARM] qsd8k: mahimahi: VDD of jogball is supplied by a gpio on cdma revs Signed-off-by: Iliyan Malchev commit ac7fcf58bb04a15938c959879acdddbca7890b18 Author: Eric Olsen Date: Mon Feb 8 07:32:33 2010 -0800 [ARM] msm: mahimahi: microp: Improve false headset detection. Signed-off-by: Eric Olsen commit a0811a54fe7a5d1e48528d37055e128a01742a2e Author: Haley Teng Date: Tue Feb 2 12:31:33 2010 -0800 [ARM] qsd8k: mahimahi: add HTC OMA-DM support (for use on CDMA revs) Signed-off-by: Iliyan Malchev commit 08e906f5c8aef082155f0227ce030c714d22ed8d Author: Haley Teng Date: Tue Feb 2 12:31:33 2010 -0800 [ARM] msm: smd: initialize SMD tty nodes from a default table Also, add a way to override the default table. Signed-off-by: Iliyan Malchev commit 3bbc2aa25de773f075923a9492203cf9155ebc8d Author: Vincent Kao Date: Thu Feb 4 20:08:30 2010 -0800 [ARM] msm: usb: reset the PHY before suspend Signed-off-by: Iliyan Malchev commit ee702d1f4d4ef4ddcaf6427c14eff30be64096be Author: Mike Lockwood Date: Sat Feb 6 16:24:07 2010 -0500 [ARM] msm: mahimahi: Disable ACM serial support in defconfig Signed-off-by: Mike Lockwood commit 47275186d05e299486bbfc1fbba8ac17a60446f2 Author: Haley Teng Date: Mon Feb 1 15:34:50 2010 -0800 [ARM] qsd8k: mahimahi: the vdd of sdslot is supplied by gpio on cdma revs Signed-off-by: Iliyan Malchev commit 2f66503025f92aae96cebded4da5614924a7d88b Author: HK Chen Date: Mon Feb 1 14:47:31 2010 -0800 [ARM] qsd8k: mahimahi: override default ACDB file on some CDMA revs Signed-off-by: Iliyan Malchev commit 471648c43bf82dd50d258d955f82a1efc8c03db5 Author: HK Chen Date: Mon Feb 1 14:24:31 2010 -0800 [ARM] qsd8k: mahimahi: put in-call vol. control (GSM & CDMA) in board file CDMA revisions have non-linear volume control. Signed-off-by: Iliyan Malchev commit 8353a5642e2c2b8e898221235288995a4c600bb8 Author: Iliyan Malchev Date: Tue Jan 26 15:41:36 2010 -0800 [ARM] qsd8k: mahimahi: request ds2482 sleep gpio in board file Signed-off-by: Iliyan Malchev commit 1a480dd6a5a7c70ea09b7eba5c4cddce1710a6f2 Author: Arve Hj��nnev��g Date: Tue Jan 26 15:48:57 2010 -0800 [ARM] msm: mahimahi: Add a memory bank for available memory in ebi1 bank1. Change-Id: Ib2dd68bd0cb9633f645761f1bf543d660dbe372b Signed-off-by: Arve Hj��nnev��g commit f8b2eca0dea56cac7ad612bfbe7bd731596a75e2 Author: Arve Hj��nnev��g Date: Thu Jan 28 17:02:37 2010 -0800 [ARM] msm: mahimahi_defconfig: Enable highmem and reserve 768M vmalloc space. Change-Id: Ie477cc14281968f4a147706c641825cfed65ec92 Signed-off-by: Arve Hj��nnev��g commit 5115e18fa95bc2b66bc7c9b58cf4c729ef2e5fe9 Author: Arve Hj��nnev��g Date: Thu Jan 28 16:45:36 2010 -0800 [ARM] Add VMALLOC_RESERVE kconfig option. Change-Id: I67949f84c38a6e3e85456d129055cbdb2c007f73 Signed-off-by: Arve Hj��nnev��g commit d9edf1b179771863a5f88dd0cd54a83a95d46557 Author: Arve Hj��nnev��g Date: Tue Jan 26 17:18:48 2010 -0800 [ARM] Fix dma_unmap_page to work with highmem. Change-Id: I3c652afb929c9a30364936d6e277e9be13a43083 Signed-off-by: Arve Hj��nnev��g commit f9ab9fa6cfb129290a411d8b8f4ebb3772df8a4e Author: Russell King Date: Sat Oct 31 15:58:30 2009 +0000 ARM: dma-mapping: simplify page_to_dma() and __pfn_to_bus() The non-highmem() and the __pfn_to_bus() based page_to_dma() both compile to the same code, so its pointless having these two different approaches. Use the __pfn_to_bus() based version. Signed-off-by: Russell King Tested-By: Jamie Iles Reviewed-by: Catalin Marinas commit ed71f3d462a549e3de24a6dfcd16ff853ff09dc1 Author: Russell King Date: Sat Oct 31 16:07:16 2009 +0000 ARM: dma-mapping: provide dma_to_page() Signed-off-by: Russell King Tested-By: Jamie Iles commit 8bfbbd4a6db0ef835e94542eec4899239e16dd6e Author: Iliyan Malchev Date: Tue Jan 26 00:36:46 2010 -0800 [ARM] qsd8k: mahimahi: do not drive MAHIMAHI_GPIO_35MM_KEY_INT_SHUTDOWN on CDMA MAHIMAHI_GPIO_35MM_KEY_INT_SHUTDOWN is not defined for CDMA devices. Signed-off-by: Iliyan Malchev commit d0bb38342bfdd72d37ca619c86e70d65236f3806 Author: Ryan.CL Lin Date: Mon Jan 25 19:16:09 2010 -0800 [ARM] qsd8k: mahimahi: fix receiver no-sound issue on CDMA revisions 0xC1, 0xC2 Signed-off-by: Iliyan Malchev commit ed53f41d0df7d9724f1ab5729182b0c518ae5e12 Author: Ryan.CL Lin Date: Mon Jan 25 19:14:22 2010 -0800 [ARM] qsd8k: mahimahi: fix uplink no-sound issue on CDMA XB The no-audio issue is due to A1026 GPIO changes. Signed-off-by: Iliyan Malchev commit cd177a8fbcfd021022c65ee1957273eaf99960ee Author: Haley Teng Date: Tue Dec 15 13:47:36 2009 -0800 [ARM] qsd8k: mahimahi: correct the virtual key layout for CDMA version (system_rev == 0xC0) Signed-off-by: Haley Teng Signed-off-by: Iliyan Malchev commit 08f358da8e2cdcd47df926b6828f24dfc658c077 Author: Haley Teng Date: Tue Dec 15 13:39:10 2009 -0800 [ARM] qsd8k: mahimahi: add GPIO definitions for CDMA version Signed-off-by: Haley Teng Signed-off-by: Iliyan Malchev commit 2ab8f84864b1cbacee47c1e8bc7288944998a8d0 Author: Haley Teng Date: Tue Dec 15 12:36:18 2009 -0800 [ARM] qsd8k: mahimahi: add CDMA-board support for smb329 switch charger Signed-off-by: Haley Teng Signed-off-by: Iliyan Malchev commit f29a3b9a3e5217300264d07276f84483549b08ce Author: Iliyan Malchev Date: Fri Jan 22 14:51:03 2010 -0800 [ARM] qsd8k: mahimahi: add board support for ds2784_battery Signed-off-by: Iliyan Malchev commit 5d45bf91814145ce8f6cfbc2b77b156e14c2c4a9 Author: Haley Teng Date: Mon Jan 25 22:20:20 2010 -0800 [ARM] qsd8k: mahimahi: driver for SUMMIT Micro SMB329B switch charger Signed-off-by: Haley Teng Signed-off-by: Iliyan Malchev commit b6469a33513ebf4e7aeef3ad36bc8959c39aa05b Author: Iliyan Malchev Date: Tue Jan 19 11:05:31 2010 -0800 [ARM] qsd8k: mahimahi: add board support for tpa2018d1 on cdma revs Signed-off-by: Iliyan Malchev commit b82c7ff0d1e6e8d187932a35f47b8f80495f29cd Author: Iliyan Malchev Date: Tue Jan 19 10:53:10 2010 -0800 [ARM] qsd8k: mahimahi: add macro is_cdma_version() Signed-off-by: Iliyan Malchev commit 66db9c708c52071dadb102e25d85f429d11e7427 Author: HK Chen Date: Tue Feb 2 11:09:51 2010 -0800 [ARM] qsd8k: mahimahi: register as a misc. device for dynamic configuration -- Provide the following ioctls, which can override the defaults and retrieve current configuration: TPA2018_SET_CONFIG TPA2018_READ_CONFIG TPA2018_SET_MODE TPA2018_SET_PARAM -- Add a public header tpa2018d1.h for the ioctl()s Signed-off-by: Iliyan Malchev commit f5435be837ed2dffa6bdc87a692e20a1a74830eb Author: Haley Teng Date: Tue Dec 15 05:58:56 2009 -0800 [ARM] qsd8k: mahimahi: driver for tpa2018d1 (speaker amplifier) Signed-off-by: Haley Teng Signed-off-by: Iliyan Malchev commit 5d4f26e1a85807c02d58157db780b049f4cab8ac Author: Iliyan Malchev Date: Fri Jan 22 14:46:52 2010 -0800 [ARM] msm: mahimahi_defconfig: remove CONFIG_W1_SLAVE_DS2784 Signed-off-by: Iliyan Malchev commit 4b7d26c812092175efe5baf19761ea5b01bbd40d Author: Mike Lockwood Date: Mon Jan 25 15:12:03 2010 -0500 [ARM] msm: mahimahi: Enable ACM serial support in defconfig Use different USB PIDs when ACM is enabled to avoid confusion on Windows host. Signed-off-by: Mike Lockwood commit 92327deb4c6e1eed9f6e62b7fb7f889559dd1c10 Author: Mike Lockwood Date: Sun Jan 24 16:21:26 2010 -0500 [ARM] msm: Remove obsolete USB function support. Signed-off-by: Mike Lockwood commit 06efa3f6629e4e01ad6c4a2c75226c1b04449928 Author: Mike Lockwood Date: Sat Jan 16 13:15:25 2010 -0800 [ARM] msm: htc: Add support for ACM serial and RNDIS ethernet USB functions. Signed-off-by: Mike Lockwood commit b63314e400bc1e377723606c680f93f6129f9183 Author: Eric Olsen Date: Wed Jan 13 18:19:25 2010 -0800 drivers: input: misc: cm6302: Remove the GPIO for enable. Just use the function. Signed-off-by: Eric Olsen commit 589268f8a4ebe8782545dcb82492468337e68c4f Author: Haley Teng Date: Thu Feb 4 00:58:26 2010 -0800 [ARM] msm: usb: diag: support enable/disable at boot time Signed-off-by: Haley Teng Signed-off-by: Mike Lockwood commit 857ca75607e04a4501f55fd80324597d3a0a4730 Author: Mike Lockwood Date: Wed Jan 13 15:54:03 2010 -0800 USB: gadget: MSM7K diag gadget function driver. Change-Id: Ib25e367bc9951631c4288d63b93e48820a76bc36 Signed-off-by: Mike Lockwood commit e65aded46934ddd2fd22f4672d5e8b8a4dd71468 Author: Mike Lockwood Date: Fri Jan 8 14:14:49 2010 -0500 [ARM] msm: swordfish: Update platform data for android USB gadget driver. Signed-off-by: Mike Lockwood commit 00ea3ec930a4c14b61f03321abab570fc392b391 Author: Mike Lockwood Date: Mon Jan 11 21:38:46 2010 -0800 [ARM] msm: usb: gadget: misc [ARM] msm: usb: gadget: Reset the controller before and after resetting the PHY Change-Id: If0a415b4727608a78d7c667465cfa4aa0bf424e8 Signed-off-by: Mike Lockwood [ARM] msm: usb: gadget: use dev_set_name() Replacing strcpy() to device->bus_id which no longer exists in 2.6.32 Change-Id: I85d14a5569d8a70107e87bc275625cff11b836f6 Signed-off-by: Mike Lockwood [ARM] msm: usb: gadget: Integrate recent changes from msm_hsusb function driver Change-Id: I58d7cd8ea6622aef2e7d4fd0d2e47c08592aca49 Signed-off-by: Mike Lockwood [ARM] msm: usb: gadget: Add support for interrupt and isochronous endpoints Change-Id: Ica1c8e51883dff8d55156d79f831053807a2034e Signed-off-by: Mike Lockwood [ARM] msm: usb: gadget: Fix receiving ep0 out requests with length > 0 Change-Id: I4a476fcf326bbf0ea4bbafa8cbb703af8674925c Signed-off-by: Mike Lockwood [ARM] msm: usb: gadget: Another fix for ep0 requests with length > 0 Signed-off-by: Mike Lockwood commit db34a5da6be10fad3b2849643fde98d6c1d494c3 Author: Mike Lockwood Date: Mon Dec 14 00:21:35 2009 -0500 [ARM] msm: halibut: Update platform data for android USB gadget drivers. Signed-off-by: Mike Lockwood commit 83477228c07851495a3212b2102e079e572baa8a Author: Mike Lockwood Date: Mon Dec 14 00:21:16 2009 -0500 [ARM] msm: htc: Update platform data for android USB gadget drivers. Signed-off-by: Mike Lockwood commit c36f6d6690f16910ca058a065fa59ad090cc3320 Author: Arve Hj��nnev��g Date: Wed Jan 6 17:33:46 2010 -0800 [ARM] msm: generic_gpio: Use gpiolib. register_gpio_chip now call gpiochip_add with wrapper functions that hold a spinlock while calling the old generic_gpio gpio_chip functions. Change-Id: Ica8f705db97d3b18c98a695ebb28c3fcf58598df Signed-off-by: Arve Hj��nnev��g commit 6a51e8c169ab28cf5f8d79747e0a5bab23f33919 Author: Arve Hj��nnev��g Date: Wed Jan 6 17:29:32 2010 -0800 [ARM] msm: Remove extended gpio api. Change-Id: Ia3ebf9f50661514d3771dddf94e932995bd2b10f Signed-off-by: Arve Hj��nnev��g commit 57407e58e540b8cb248c79d8835f56fb97c4242a Author: Arve Hj��nnev��g Date: Thu Dec 17 18:47:12 2009 -0800 fix for 7k: [ARM] msm: pm: Clock AXI down during power collapse Change-Id: Ie0de5d7ec0984c311c733ebdc2e26fd3c3d2dc0c commit 3233acece5f65ed56b34071a7df68c1fdbfe952e Author: Dima Zavin Date: Tue Dec 15 19:20:35 2009 -0800 [ARM] msm: flush console before reboot If the console_sem was held while the system was rebooted, the messages in the temporary logbuffer would not have propogated to all the console drivers. This force releases the console sem if it failed to be acquired. Change-Id: I0c0a83af75e11d9378c3106bc88b327e1e7a1b16 Signed-off-by: Dima Zavin commit 574dba48a4e77b7419c2f2e047465ea05ce0e033 Author: Arve Hj��nnev��g Date: Mon Dec 14 17:43:33 2009 -0800 [ARM] msm: pm: Try to recover after timeout during resume. If the modem is stuck in the rsa state after a timeout a new sleep request with an early exit may get it unstuck. Also add a udelay to reduce timeout variation at different cpu speeds. Change-Id: I194b80f0fadb333c6f47ece807c7b200608c6e9f Signed-off-by: Arve Hj��nnev��g commit 394fb993086fff9d48cd634b4205afcd33f0a79e Author: Dima Zavin Date: Thu Nov 12 17:38:22 2009 -0800 [ARM] msm: pm: make default reboot use the pcom call instead of physical reset Change-Id: I2ad25d0d1c45616642744abd1ca29500c974735e Signed-off-by: Dima Zavin commit 077bb7b5054a00dffc12d22c2c2caaf213b7707b Author: Mike Chan Date: Tue Nov 3 16:17:25 2009 -0800 [ARM] msm: mahimahi: Set AXI to 128mhz when screen on, 61mhz when screen off Signed-off-by: Mike Chan [ARM] msm: pm: Clock AXI down during power collapse Keep AXI bus at 128 while the screen is on, however clock down when entering power collapse on idle when we ramp the cpu speed down. This maintains performance with idle power savings. Signed-off-by: Mike Chan [ARM] msm: pm: Only clock axi down to 120MHz when the screen is on. This may help with the recent lcdc underrun problems. Change-Id: I0478ddc131a18f90ee2299758899c2ea8ecdc508 Signed-off-by: Arve Hj��nnev��g commit ae1011771a42e5c65451ae29e7edb53d78f4ff13 Author: Iliyan Malchev Date: Fri Dec 11 11:52:14 2009 -0800 [ARM] msm: scorpion: Clear out efsr/adfsr on power-on and after fault Change-Id: I1c087d4f56c257357a34482d55e013ab041d15bf Signed-off-by: Dima Zavin commit e89412f9900ba5a4e92d30dd52afb0f513193ba9 Author: Iliyan Malchev Date: Thu Dec 10 00:30:03 2009 -0800 [ARM] qsd8k: print TCSR_SPARE2 in do_imprecise_ext Signed-off-by: Iliyan Malchev commit ec23902d9474a0d25f5fed43d03d819151f05315 Author: Iliyan Malchev Date: Thu Dec 10 00:28:51 2009 -0800 [ARM] qsd8k: map in TCSR_SPARE2 Signed-off-by: Iliyan Malchev commit 99e26e3374231aac6874a288303c1e8fde1e86be 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 commit 919a3172116efae4220cd74b3e87ceb842e40939 Author: Arve Hj��nnev��g Date: Tue Dec 1 20:00:01 2009 -0800 [ARM] Don't use domain 0 for the kernel domain if CONFIG_VERIFY_PERMISSION_FAULT is set. Change-Id: I17ff457e1d4b4f6b7dcf308a014fc6776950fad8 Signed-off-by: Arve Hj��nnev��g commit 88ef3ab11c3b660ef491aee8d19d19f0f8b735c3 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. Change-Id: I2b122dc00771fb65e7aa4f8dc6dbd20a6bb905d0 Signed-off-by: Dave Estes commit a8fb8b284653d4d00f058823ce12de2aae9d5100 Author: Arve Hj��nnev��g Date: Wed Oct 21 20:59:04 2009 -0700 [ARM] Don't use domain manager mode when not needed. Change-Id: I81a1be57e5053c08be54ebb21efb701274440d43 Signed-off-by: Arve Hj��nnev��g commit 26d76fef69bfae15a4fafe1743643ea7cca8a05e Author: Farmer Tseng Date: Tue Dec 1 18:03:28 2009 +0800 [ARM] msm: adjust i2c driving strength to 8mA According to HW and TI's suggestion, set i2c driving strength to 8mA. HW has confirmed that 8mA also suit to Dream and Sapphire. Change-Id: Ie3e0b81c4b4430d0f9799111dcc85b699b7824e6 Signed-off-by: Farmer Tseng commit 9dfc15cba19654f512473973fd9a0dc048a3a03b Author: Iliyan Malchev Date: Mon Nov 30 14:42:35 2009 -0800 [ARM] qsd8k: print out more registers on an imprecise external abort. Signed-off-by: Iliyan Malchev commit 063ba23f0db30dc16a435bca3669f96aa169485a Author: San Mehat Date: Wed Feb 3 12:59:29 2010 -0800 drivers: mmc: msm_sdcc: Add EMBEDDED_SDIO support Signed-off-by: Dmitry Shmidt commit e197b248110bff7fe6c25887d033b20140957f3b Author: San Mehat Date: Thu Dec 3 10:58:54 2009 -0800 mmc: msm_sdcc: Fix issue where clocks could be disabled mid transaction msmsdcc_enable_clocks() was incorrectly being called depending on the state of host->clks_on. This means the busclk idle timer was never being deleted if the clock was already on.. Bogus. Also fixes a possible double clk disable if the call to del_timer_sync() in msmsdcc_disable_clocks() raced with the busclk timer. Change-Id: I67c37fafa14814dc12d849cbaa982fd1df743eca Signed-off-by: San Mehat commit d9de2ff84fa363586f3b4663f9d491ca7fd72fbb Author: San Mehat Date: Wed Dec 2 17:24:58 2009 -0800 mmc: msm_sdcc: Fix the dma exec function to use the proper delays Signed-off-by: San Mehat commit 6c26145ca75e59a4802f0f7e554aa51674d849a7 Author: Dmitry Shmidt Date: Wed Dec 2 17:21:07 2009 -0800 mmc: msm_sdcc: Don't set host->curr.mrq until after we're sure the busclk timer won't fire Signed-off-by: San Mehat commit 7dfba24f605a842c9a1ecf864bbee7aa7302f7e9 Author: San Mehat Date: Tue Dec 1 10:10:47 2009 -0800 mmc: msm_sdcc: Enable busclk idle timer for power savings Change-Id: I2163dab09e2bbb92d3849f85642d18238b1b2dca Signed-off-by: San Mehat commit 3a8384260c67a7281207570666a58c9bfa2fb8dd Author: San Mehat Date: Wed Nov 25 11:16:57 2009 -0800 mmc: msm_sdcc: Don't disable interrupts while suspending Signed-off-by: San Mehat commit 73fa01f685b885f1849eb693b6faec17ea0085cb Author: San Mehat Date: Tue Nov 24 12:24:55 2009 -0800 mmc: msm_sdcc: Fix issue where we might not end a sucessfull request Change-Id: I40e99a6b9710a90c8f2bfa7dcaa7dd5794f57ee4 Signed-off-by: San Mehat commit c4e3e2a54f751dce88d0e4e73a2080dc599230af Author: San Mehat Date: Mon Nov 23 15:36:31 2009 -0800 mmc: msm_sdcc: Featurize busclock power save and disable it by default Change-Id: Ia7d416b96d519eaf6eeebf730fa360b867f1112c Signed-off-by: San Mehat commit 1a8965430f79930164860925c43c6c87e4d6386e Author: San Mehat Date: Sun Nov 22 17:19:07 2009 -0800 mmc: msm_sdcc: Fix bug where busclk expiry timer was not properly disabled Change-Id: I6836398ce46e88b8e0485396b0a2bd4cfad65da1 Signed-off-by: San Mehat commit 9fe094f6840ea3323773ce5446eea9d40301a86a Author: San Mehat Date: Sat Nov 21 12:29:46 2009 -0800 mmc: msm_sdcc: Reduce command timeouts and improve reliability. Based on an original patch by Brent DeGraaf: "Previous versions of the SD driver were beset with excessive command timeouts. These timeouts were silent by default, but happened frequently, especially during heavy system activity and concurrent access of two or more SD devices. Worst case, these timeouts would occasionally hit at the end of a successful write, resulting in false failures that could adversely affect journaling file systems if timing was unfortunate. This update tightens the association and timing between dma transfers and the commands that trigger them by utilizing a new api implemented in the datamover. In addition, it also fixes a dma cache coherency issue that was exposed during testing of this fix that occasionally resulted in card corruption. Processing of results in the interrupt status routine was modified to process command results prior to data because overwritten command results were observed during testing since the data section can result in command issuances of its own. This change also eliminates the software command timeout, relying entirely on the hardware version, since the software timeout was found to cause problems of its own after extensive testing (having hardware timer and software timers addressing the same issue was found to cause a race condition under heavy system load)." This change originally added PROG_DONE handling, which has been split out into a separate patch. Also on our platform, the data mover driver maintains coherency to ensure API reliability, so the above mentioned cache corruption issue was not an issue for us. Signed-off-by: San Mehat Cc: Brian Swetland Change-Id: Ifbf17cfafb858106d73bf49af52b5161a265a484 Signed-off-by: San Mehat commit 9a48138363afc7d65e130a6e68a4306c50cf47c7 Author: San Mehat Date: Mon Nov 16 11:59:01 2009 -0800 mmc: msm_sdcc: Schedule clock disable after probe Change-Id: I1424ece5c6d3a69002b51f5aa9caefb02b33b602 Signed-off-by: San Mehat commit bc19017fe3060bf92c0f4120aebe5ad3c1c6c339 Author: San Mehat Date: Mon Nov 16 10:17:30 2009 -0800 mmc: msm_sdcc: Wrap readl/writel calls with appropriate clk delays As it turns out, all sdcc register writes must be delayed by at least 3 core clock cycles for the writes to take effect. *sigh* Also removes the 30us constant delay on clock enable in favor of a 3 core clock delay. Change-Id: I78990791cede4be1c4a3439dd24530eeaafaf09f Signed-off-by: San Mehat commit 4bcf20ba49f266c90313aeca29edcab8c9b1912c Author: San Mehat Date: Fri Nov 13 13:42:06 2009 -0800 mmc: msm_sdcc: Driver clocking/irq improvements - Clocks are now disabled after 1 second of inactivity - Fixed issue which was causing us to loop through our ISR twice - Bump core clock enable delay to 30us Change-Id: I610746ccb5f40858eed146229472ec4d062c3b3d Signed-off-by: San Mehat commit c920f211d1bd30d2e065faa491554d745a80200e Author: San Mehat Date: Sat Nov 21 09:22:14 2009 -0800 [ARM] msm: Add 'execute' datamover callback Based on a patch from Brent DeGraaf: "The datamover supports channels which can be shared amongst devices. As a result, the actual data transfer may occur some time after the request is queued up. Some devices such as mmc host controllers will timeout if a command is issued too far in advance of the actual transfer, so if dma to other devices on the same channel is already in progress or queued up, the added delay can cause pending transfers to fail before they start. This change extends the api to allow a user callback to be invoked just before the actual transfer takes place, thus allowing actions directly associated with the dma transfer, such as device commands, to be invoked with precise timing. Without this mechanism, there is no way for a driver to realize this timing. Also adds a user pointer to the command structure for use by the caller to reference information that may be needed by the callback routine for proper identification and processing associated with that specific request. This change is necessary to fix problems associated with excessive command timeouts and race conditions in the mmc driver." This patch also fixes all the callers of msm_dmov_enqueue_cmd() to ensure their callback function is NULL. Signed-off-by: San Mehat Cc: Brent DeGraaf Cc: Brian Swetland commit 57926a7a5699104996e8c1a06c20f06fa4d337f4 Author: San Mehat Date: Mon Nov 2 18:46:09 2009 -0800 mmc: msm_sdcc: Snoop SDIO_CCCR_ABORT register Signed-off-by: San Mehat commit 9d749c5356a317e561cfe43497cfd724f1ef816f Author: San Mehat Date: Mon Nov 2 18:42:40 2009 -0800 mmc: core: Hack for allowing access to SDIO_CCCR_ABORT register Signed-off-by: San Mehat commit e9a1044b27a83ee07f2ef1d55584f284ef0fc548 Author: San Mehat Date: Sun Nov 8 13:00:37 2009 -0800 mmc: msm_sdcc: Clean up clock management and add a 10us delay after enabling clocks It appears that in some cases there may be a delay on the ARM9 in enabling our clock. As a result, we may put the controller into a bad state. Delay 10us after enabling clocks to let the peripheral settle. Note - this is all imperical. Also ensure set_ios() callback grabs the host lock. Signed-off-by: San Mehat commit 28462a2a886fd3d03362c42adfff59978af118ee 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 commit 231aefd583403146bb3db621eab21fcc3246eb46 Author: Nick Pelly Date: Sun Nov 8 16:07:53 2009 -0800 [ARM] msm: clock: hack: Always set axi clock to max rate when enabling uartdm. This implementation is a gross hack. We are working with Qualcomm to understand this further and get a better fix (perhaps in the radio). Signed-off-by: Nick Pelly commit a0ac3b7e44b56e7590aa962a0984355c24b3ef58 Author: HK Chen Date: Sun Oct 18 14:59:22 2009 +0800 qsd8k: audio: clean up htc_acoustic_qsd driver. Signed-off-by: Brian Swetland commit 28a5baf057acda298441fb344584e834a157396b Author: Arve Hj��nnev��g Date: Sun Nov 8 22:23:33 2009 -0800 [ARM] msm: mahimahi: htc_power_supply: Add support for docks. We use a 1-wire interface to the dock to get the dock id, get its bluetooth address and to set a bluetooth pin code. Change-Id: I55a1302feabbe8861fd6b85a475407924e5e55a9 Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: Hold wakelock while detecting dock Change-Id: Idcb87dfc291871859d02531f9aaf2df3fb394342 Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: Request dock gpio. Change-Id: Ic196a72413a411c78a471906b2593801300fdf73 Signed-off-by: Arve Hj��nnev��g commit 9a4e3a7746ec3282caada23e2e1a1d3118bab93d Author: Dima Zavin Date: Mon Oct 19 04:01:24 2009 -0700 [ARM] msm: configs: add mahimahi_defconfig Change-Id: Ie534c6a33d3451f19a004eddd9b347c15e5d3764 Signed-off-by: Dima Zavin mahimahi_defconfig: Enable REGULATOR_TPS65023 for power savings Signed-off-by: Mike Chan [ARM] mahimahi_defconfig: Tune cpufreq thresholds. Signed-off-by: Mike Chan [ARM] mahimahi: defconfig: Enable control groups + group scheduling in defconfig Signed-off-by: San Mehat [ARM] msm: mahimahi: Use bcm_bt_lpm on mahimahi. Change-Id: Ied56a75e008820e1ed94b317bdac533c050a220b Signed-off-by: Nick Pelly [ARM] mahimahi_defconfig: Update defconfig Change-Id: I332407f5a5888b456a8852e9aa7b693a991b9eaf Signed-off-by: Dima Zavin mahimahi_defconfig: cpufreq cleanup Signed-off-by: Mike Chan mahimahi_defconfig: Set userspace governor as default This prevents us from using 998mhz on boot before userspace can enforce the min/max limits, since we boot @ 1.25v and 998mhz requires 1.275v Signed-off-by: Mike Chan [ARM] msm: mahimahi: Enable power collapse on idle Change-Id: Ie56f37ff1da33d48a48805fbac9ab16827071f6f Signed-off-by: Arve Hj��nnev��g [ARM] mahimahi_defconfig: Don't compile the cypress tmg touch driver Change-Id: I1071c56c876463c44ec5e37ea4166a534d2f61fe Signed-off-by: Dima Zavin [ARM] mahimahi_defconfig: enable CONFIG_DEBUG_BUGVERBOSE Signed-off-by: Iliyan Malchev [ARM] configs: mahimahi: Add IPV6 Tunneling Signed-off-by: Dmitry Shmidt mahimahi_defconfig: Change wfi sleep time to 50ms Change-Id: Iedeabb0352b7fd3cd307e87c47c334d6d3635581 Signed-off-by: Mike Chan [ARM] msm: mahimahi_defconfig: remove some debugging config options Change-Id: I612f925b926f4f5e0f8e8600e3684a70251c0039 Signed-off-by: Dima Zavin mahimahi_defconfig: Enable media support on 2.6.32 Change-Id: If46a20dab48a691487046b33db1d24d1d76250af [ARM] mahimahi: defconfig: Enable BLK_DEV_LOOP in defconfig Signed-off-by: San Mehat [ARM] msm: mahimahi: Switch from USB function to USB gadget drivers. Change-Id: Ic07b1001fd1a77d98a2f4707a98bd4e247bba551 Signed-off-by: Mike Lockwood [ARM] defconfig: mahimahi: Enable NETFILTER, NAT, and related options Signed-off-by: San Mehat commit 2478aaa69799600dfd845b5bcca33118c5dcc66e Author: Dima Zavin Date: Mon Oct 19 04:00:49 2009 -0700 [ARM] msm: Add mahimahi to makefile and Kconfig Change-Id: I920a188ec90cd55f48aa5fde32f52556e54ff44e Signed-off-by: Dima Zavin commit a129aec2ec8b0b8ef9943e437415073620f15678 Author: Dima Zavin Date: Mon Feb 8 21:07:46 2010 -0800 [ARM] msm: mahimahi: Add support for the mahimahi device To use the reworked devices with debug uart over sdard one will need to "fastboot oem writeconfig 0 c" and make sure that config 8 does not have 0x400 set. Change-Id: I8f065b941143017f60d17a4a52c3c7beeb626620 Signed-off-by: Dima Zavin Cc: Brian Swetland Cc: Arve Hj��nnev��g Cc: Solomon Chiu Cc: Haley Teng Cc: Eric Olsen Cc: Iliyan Malchev Cc: Dmitry Shmidt Cc: Mike Lockwood Cc: San Mehat [ARM] msm: mahimahi: Update the memory map. - move framebuffer to SMI and mdp pmem to bank 2 of EBI - remove the gpu pmem regions since we now use the MMU - move the adsp region to bank 2, and make it bigger (41MB vs 32MB) - move ram console to SMI Change-Id: I88b4033e98374fc038609fbbb1c7e5cbed4f87c4 Signed-off-by: Dima Zavin [ARM] msm: mahimahi: Expand memory available to kernel to 219MB Change-Id: I59e69ce4209d16ce9804d3fa81814c9d0bda9a03 Signed-off-by: Dima Zavin [ARM] msm: mahimahi: Read bluetooth address from ATAG and export in sysfs. Signed-off-by: Nick Pelly mahimahi: pass set_slp_n() routine to ds2482 Saves about 0.25mA Signed-off-by: Brian Swetland [ARM] msm: mahimahi: make adsp pmem cacheable Signed-off-by: Erik Gilling [ARM] msm: mahimahi: Swap locations of back and home virtual keys on PVT Change-Id: Ia730e21230684ae5b8c6f359cf96e1c536ba40c2 Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Add an 8mb pmem region for camera snapshot Change-Id: I12e6ca74af7998a85874b3c05b10b174d608c7be Signed-off-by: Dima Zavin [ARM] msm: mahimahi: adjust usb signal strength in ulpi phy register Change-Id: I2b169de0016bd063a228cd05c9376f60497602c8 Signed-off-by: Haley Teng Acked-by: Dima Zavin mahimahi: update board file for new audience driver Signed-off-by: Brian Swetland Change the area of virtual key in PVT devices. Signed-off-by: viral wang [ARM] msm: mahimahi: Increase max voltage to 1.275 from 1.25 Signed-off-by: Mike Chan [ARM] mahimahi: wifi: Add sd_oobonly=1 to calibration data Signed-off-by: Dmitry Shmidt [ARM] mahimahi: Add bcm4329 wlan memory preallocation Signed-off-by: Dmitry Shmidt [ARM] mahimahi: Fix wlan calibration update Signed-off-by: Daniel Chen Signed-off-by: Dmitry Shmidt [ARM] mahimahi: Update wlan calibration data size Signed-off-by: Dmitry Shmidt [ARM] mahimahi: Fix wlan IRQ type Signed-off-by: Dmitry Shmidt [ARM] mahimahi: fix a race condition on setting the flash mode Signed-off-by: Iliyan Malchev [ARM] msm: mahimahi: Send current light sensor value when sensor is enabled. Change-Id: Icb42cfaf4cabe76864da14a16b85fc1f729c5d5d Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Fix problem with zero light sensor level not being reported After enabling the light sensor, we now send a -1 light sensor level to invalidate the cached value in the input famework and force an event to get sent to user space. Otherwise, if the light sensor value is zero when the sensor is enabled, no value will be reported. Change-Id: I4d45fc945a6d0e8c3d32cc9bd81180607497a35f Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Add microp jogball color support. Added jogball-backlight attr "color" for jogball-backlight color adjustment. Signed-off-by: Eric.SP Huang Signed-off-by: Eric Olsen [ARM] msm: mahimahi: Add support for light sensor factory calibration. Change-Id: I3030328f08298b9f1675cffd601ad53ef405a359 Signed-off-by: Eric.SP Huang Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Avoid flicker when writing same value to button backlight. Change-Id: I8984964afbca7d056cf99e9f5702130e44c73df6 Signed-off-by: Mike Lockwood Clean up driver debug message from the logs Change-Id: Id8524eee501c9a1644537454a59f9c7598e61dfe Signed-off-by: Eric Olsen [ARM] msm: mahimahi: Make calling brightness_set functions safe from interrupts Moves all the work that can sleep into workqueues The blank and unblank functions are already called from workqueues in the LCD driver, so no changes are needed for them. Signed-off-by: Colin Cross Change-Id: Iabb73903b6bc5a76879710759f2b13a0ee85f5b8 [ARM] msm: mahimahi: Fix build error in board-mahimahi-microp.c Signed-off-by: Colin Cross Change-Id: Icc04e853502a3cd9a04dd7f86fc29dd8ba15ace8 [ARM] msm: mahimahi: add a brightness level 20 Lineraly interpolate gamma values for brightness levels which do not have an explicit table. Also restrict levels to pre-defined set. Signed-off-by: Erik Gilling [ARM] msm: mahimahi: panel: Increase granularity of panel Panel now supports brightness granularity in increments of 2. Signed-off-by: Mike Chan [ARM] msm: mahimahi: Move lcd initialization to device_init Change-Id: Ib9b317a2cf62a09767eb0e305af99dcdf5913064 Signed-off-by: Colin Cross [ARM] msm: panel: Fix lcd panel gamma initialization Fixes a brightness jump during boot by keeping the gamma table that the bootloader wrote until the first time a new brightness level is set Change-Id: I1c1833ce4de75128c5375f6f11626a600c446d57 Signed-off-by: Colin Cross [ARM] msm: mahimahi: panel: Modify panel init, blank, and unblank sequences to match datasheet Change-Id: I9f78847f85b75b5ab0e18e081a76df79ce027111 Signed-off-by: Colin Cross [ARM] mahimahi: mmc: Update SD drive strengths as per HTC Signed-off-by: San Mehat [ARM] mach-msm: mahimahi-mmc: Add embedded sdio override table for bcm wifi Signed-off-by: San Mehat qsd8k: fix headset playback pop sound issue. Signed-off-by: Brian Swetland mahimahi: add delay on mic init to avoid noise Signed-off-by: Brian Swetland [ARM] msm: mahimahi-audio: Request gpios. Change-Id: I16687b0ad5014ed971dfb7875c10d59af56188ae Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: Use bcm_bt_lpm on mahimahi. Change-Id: Ied56a75e008820e1ed94b317bdac533c050a220b Signed-off-by: Nick Pelly [ARM] msm: microp: Add support for PVT headset buttons. Signed-off-by: Eric Olsen [ARM] msm: mahimahi: Change the power collapse/sleep frequency to be 19.2MHz This will make us go in and out of power collapse on the TCXO. This aligns us closer to what other Qualcomm supported OS's are doing and eliminates a possible instability. Change-Id: I2447323f8ab15132a2ac916db058694bfcd0bd81 Signed-off-by: Dima Zavin [ARM] msm: board-mahimahi: Disable wfi rampdown and busy spin Signed-off-by: Mike Chan [ARM] msm: mahimahi: Properly specify power-collapse speed in khz and not hz Change-Id: Ia962af83ae7f9114a59e39ad121edae2f00b46f4 Signed-off-by: Dima Zavin [ARM] msm: mahimahi: Use the MPLL (245MHz) for power collapse. Change-Id: I7a0d55cce9f27e2ad26fa7025c96d9b3ee265eda Signed-off-by: Dima Zavin mahimahi: update usb vid and pid Signed-off-by: Brian Swetland [ARM] msm: microp: Set ALS zone 0 to lowest/darkest threshold Signed-off-by: Mike Chan [ARM] msm: mahimahi: MicroP driver Additions for new LED scheme. Signed-off-by: Eric Olsen [ARM] msm: microp: Fix error in lightsensor for reporting level 0 Zero base error causing level 0 to be reported as level 1. Signed-off-by: Mike Chan [ARM] msm: microp: Change threshold for light sensor level 1 Change-Id: Ic5d75746567d5f023688f566b4117ee7b0cffb21 Signed-off-by: Mike Chan [ARM] msm: microp: Clean up logging. Added and error log and removed unneeded messages Signed-off-by: Eric Olsen [ARM] msm: microp: Lower light sensor threshold for level 7 Change-Id: Ia2cd7f1751472364c81bbdd13fcc3e99c3d5d8fe Signed-off-by: Mike Chan [ARM] msm: microp: Make sure we send an event when enabling the light sensor. Change-Id: Ia1f8aba961c5a919f1406e7547beb04f0dd4bcf7 Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Add logging to gsensor data for debugging orientation issue Signed-off-by: Eric Olsen [ARM] msm: mahimahi: Ensure 1ms delay between microp requests Signed-off-by: Eric Olsen [ARM] msm: microp: Disable logging for release. Signed-off-by: Eric Olsen [ARM] msm: mahimahi: Fix possible race condition in lightsensor_enable() Change-Id: I70ee11cfe262029e4075c96f3d899de4a7f2d327 Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: send a light sensor reading 1/2 second after enabling. This is a temporary hack to work around a race condition in the Sensor Manager. Change-Id: Ia770ef9da465704172e00f1a2c52d3ecbd21b012 Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Add support for docks. We use a 1-wire interface to the dock to get the dock id, get its bluetooth address and to set a bluetooth pin code. Change-Id: I55a1302feabbe8861fd6b85a475407924e5e55a9 Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: Hold wakelock while detecting dock Change-Id: Idcb87dfc291871859d02531f9aaf2df3fb394342 Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: Request dock gpio. Change-Id: Ic196a72413a411c78a471906b2593801300fdf73 Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: reserve 3MB for gpu sharedmem for contexts/pagetables/etc Change-Id: I875de434bd9b9a99761df5b973b32c839d78edfa Signed-off-by: Dima Zavin [ARM] qsd8k: mahimahi: correct MCLK driving strength Signed-off-by: Iliyan Malchev [ARM] msm: mahimahi: Raise the max dcdc1 pmic output (MSMC2 voltage) to 1.3V Change-Id: Id70ce5c0eec23b324c1123e34da1301a06306ba2 Signed-off-by: Dima Zavin [ARM] msm: mahimahi: use the mpll when going into wfi Though Qualcomm believes that going into wfi at any speed on scpll is valid, since it has not been as thoroughly tested, we should use the mpll as that is what most of their test cycles have verified. Change-Id: Ia14cec6706ec1fda52ac9885a88089804ade5e82 Signed-off-by: Dima Zavin [ARM] msm: mahimahi: Request gpios Change-Id: Ie98a946f15ae3cf2e7c912d00b728f1e05ce4fb1 Signed-off-by: Arve Hj��nnev��g [ARM] msm: mahimahi: Add platform data for android USB gadget driver Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: board file changes for USB gadget diag driver. Change-Id: I36c4fe54aba402903c7afacf23a74266455ff463 Signed-off-by: Mike Lockwood [ARM] msm: mahimahi: Remove enable gpio from the cm6302 platform data. Signed-off-by: Eric Olsen [ARM] msm: mahimahi: Add support for ACM serial and RNDIS ethernet USB functions. Signed-off-by: Mike Lockwood commit 910e0a5c79e5aa928b4c4ae4f927986bf1e9f3ae Author: Dima Zavin Date: Mon Oct 19 04:02:14 2009 -0700 [ARM] msm: htc: vibrator for qsd8x50 is on a diff gpio Change-Id: I4f0ba7b856a27d60205a674ab99092fcd2493331 Signed-off-by: Dima Zavin commit 52f4c4db9155d2f0d0d2de6082199a1fbb4a0422 Author: Eric Olsen Date: Thu Oct 1 15:04:38 2009 -0700 [ARM] msm: Add support for HTC 3.5mm headsets Change-Id: Ieac522e86d5589e1d930b3026b6610618657ad16 Signed-off-by: Eric Olsen Cc: Arec_Kao@htc.com commit 200bce2b9567f834bfcc349d920f4bb3d44b22a3 Author: Brian Swetland Date: Thu Nov 12 18:25:08 2009 -0800 mahimahi: enable usb power detection on vbus present This is the behaviour we had in 1.0, cupcake, and donut, and ensures that we will always charge if power is present (but only do fast charge if we recognize the supply). Signed-off-by: Brian Swetland commit 429d6be6e07aace375387d679bdbd32dee1f245a Author: Brian Swetland Date: Fri Aug 7 23:12:21 2009 -0700 [ARM] msm: add a HTC power supply driver Based on the htc_battery driver, this driver only publishes the AC and USB power supplies, since battery monitoring and charging is handled by the battery gauge driver. Change-Id: I345c20b393c26d4f94c8fc74f0cfeddd3f34fd46 Signed-off-by: Brian Swetland commit c2ae5646eb28932db223efdc42391fdbab0ebbf0 Author: HK Chen Date: Wed Aug 5 21:13:54 2009 +0800 [ARM] msm: add qsd8k htc acoustic driver. Change-Id: Ifb0028791129987f6801683e2bcf177bf4ce0aa9 Signed-off-by: Brian Swetland commit 8d8041c359705842ecc863e3eaa25a8adcd373ec Author: Nick Pelly Date: Thu Oct 29 13:51:17 2009 -0700 [ARM] msm: bcm_bt_lpm: Add driver for Broadcom Bluetooth low power mode. Signed-off-by: Nick Pelly [ARM] msm: bcm_bt_lpm: fix spinlocks Signed-off-by: Iliyan Malchev commit b859b02690f8642b63742491faa851b60aeb7d78 Author: Eric Olsen Date: Wed Aug 26 11:59:58 2009 -0700 i2c: chips: Add driver for AKM8973 Compass device Signed-off-by: Eric Olsen Signed-off-by: Iliyan Malchev Clean up driver debug message from the logs Change-Id: Id8524eee501c9a1644537454a59f9c7598e61dfe Signed-off-by: Eric Olsen [DRIVERS] i2c: akm8973: Fix for orientation issue Signed-off-by: Andy Chuang Signed-off-by: Eric Olsen commit d34d62f6c30895371314ac4008f475ed70ce4ab4 Author: Eric Olsen Date: Wed Sep 2 16:58:24 2009 -0700 include: Driver interface for lightsensor Signed-off-by: Eric Olsen commit 193e6046a8887ca28b49efe25221ad0f00b059bd Author: Eric Olsen Date: Wed Sep 2 16:49:08 2009 -0700 include: Driver interface for BMA150 G-sensor chip Signed-off-by: Eric Olsen commit e32bae58d4ef0fed15de07f626d8c345e6071650 Author: Iliyan Malchev Date: Mon Feb 8 20:09:03 2010 -0800 audience1026: add audience a1026 noise cancelation chip i2c driver Signed-off-by: Brian Swetland audience 1026: driver update 1) Support control of A1026_CLK_EN pin if hardware platform provided. 2) With new A1026 firmware(M11.4.0.9_B1747_HTC_Passion), modify i2c commands set to Audience A1026 when mode changing. 3) No need to get Ack when issuing a suspend i2c command to A1026. 4) Add A1026 software reset function. Signed-off-by: Brian Swetland change A1026 driver latency as Audience's suggestion. Signed-off-by: Brian Swetland audience1026: add control of noise suppression algorithm Added an IOCTL to force the type of noise suppression algorithm. The requested algorithm will override the choice made otherwise according to current audio path configuration. Added camcorder record configuration using back microphone. Signed-off-by: Eric Laurent Implement 8 VR modes for different settings on A1026 chip. i2c: chips: a1026: Modify I2C commands of in-call receiver mode. Remove NS from internal mic recording mode. Change-Id: I19294b6988052c98bd10eefcd3cbae2411c67f4d Signed-off-by: Dima Zavin Audience A1026 VR modes i2c commands updated. (V1-1) Audience A1026: driver clean-up -- made checkpatch happy; -- renamed some functions for bettter naming consistency; -- cleaned up pr_xxx statements, included __func__ everywhere; -- combined all DIAG ioctls under ENABLE_DIAG_IOCTLS (disabled by default); -- replaced all mdelay()s over 10ms with msleep(); -- cleaned up a1026_bootup_init(): execute_cmdmsg() was copied-and-pased there instead of being called directly; -- include/linux/a1026.h: combined kernel specifics under __KERNEL__, left; only the ioctl definitions exposed to userspace. Signed-off-by: Iliyan Malchev a1026: change digital gain of VR receiver modes to -3dB. Signed-off-by: Brian Swetland a1026: Update i2c commands for back Mic recording function. Signed-off-by: Brian Swetland a1026: latest I2C commands for all modes from Audience. Signed-off-by: Brian Swetland a1026: various improvements 1. Support A1026 i2c block write/read mechanism to shorten latency of a mode change. 2. Update some timing fine tune suggested by Audience. 3. When read back a command ACK, checking its 1st and 2nd byte is enough. Because in the case of get information cmd, the 3rd and 4th bytes can be different. Signed-off-by: Brian Swetland a1026: update to latest commands. - for internal mic and external mic reocrding, change DigitalOutputGain to 0dB. - for back mic recording, enable AGC and disable NS, also adds 6dB on DigitalOutputGain. - remove 2dB on DigitalOutputGain for phonecall receiver mode. Signed-off-by: Brian Swetland a1026: compensate the gains used by VR speaker and receiver modes for ADIE gain change. Signed-off-by: Brian Swetland a1026: Digital output gain of the A1026 from +15dB to 0dB for all VR modes. Signed-off-by: Paul Eastham a1026: add ioctl to write a 4-byte command w/o waiting for an ACK To be used for testing. Signed-off-by: Iliyan Malchev a1026: implement in-call TTY mode Signed-off-by: Iliyan Malchev commit 1c64cf8d945a98b1c3c97635d75d3220d3cdadf4 Author: Brian Swetland Date: Mon Feb 8 20:17:03 2010 -0800 ds2784_battery: 1wire ds2784 battery gauge device Signed-off-by: Brian Swetland ds2784_battery: 1wire battery gauge / battery driver - is_ac_power_supplied() to determine charge mode is a hack until the power supply framework provides a cleaner solution. Signed-off-by: Brian Swetland ds2784: recognize dummy batteries and handle them sanely If a dummy battery ("DUMMY!" in the EEPROM data at 0x20) is detected, set a flag to always lie to userspace about percentage (75%) and reset the ACC register to ~500mAh. Signed-off-by: Brian Swetland ds2784: clean up charge state management, add temp check - tidy up the charge state calculation a bit - remove some ugly globals - handle warm/hot/critical temperature states - report overtemp to userspace for hot+ states - log charge source and charge mode separately Signed-off-by: Brian Swetland ds2784battery: report 100% while maintaining charge Once we fully charge, we stop charging until we drop to 99% then we top off again. When in this state we will pretend we're fully charged (reporting 100% to userspace) until we drop below 99, to avoid confusion. Signed-off-by: Brian Swetland ds2784_battery: adjust poll interval when asleep If we're suspended and we are not on wall power, poll the battery gauge less often (every 10 minutes). Whenever we resume, program the timer for lastpoll+60s, to ensure that if we hadn't polled in >60s we do so upon wake. Signed-off-by: Brian Swetland ds2784_battery: remove some printk chatter, reduce log size Signed-off-by: Brian Swetland ds2784_battery: Request gpios. Change-Id: I89db04e543ee91cdbd67256f136adf4e4c6abca1 Signed-off-by: Arve Hj��nnev��g ds2784_battery: Use full status from ds2784. The battery could stop charging and drain completely while plugged into the charges. If the battery level never reached 100% the old code would not turn off the charge request. The hardware changer would then eventually turn off by itself and the battery would start to drain. Change-Id: Iac83b7acae68c23ca3c5648e3616076ba5de1b95 Signed-off-by: Arve Hj��nnev��g ds2784_battery: Briefly disable charger if it has discharged for an hour. If the battery fails to charge fully, the changer will eventually turn off. This will turn the charger back on. Change-Id: I051f87a2cddc8898fa3545eabd6401dd03afadb0 Signed-off-by: Arve Hj��nnev��g ds2784_battery: Disable charging at battery gauge instead of charger. Leaving the charger on allows the phone to draw most of its power from the charger while the battery provides power when more current than the charger can provide is needed. Change-Id: I04ae676b6e8cf0075fc73d1c5cb55a04446da689 Signed-off-by: Arve Hj��nnev��g [ARM] msm: merge w1_ds2784.c into ds2784_battery.c Signed-off-by: Iliyan Malchev [ARM] msm: ds2784_battery: remove board-specific code, add header Signed-off-by: Iliyan Malchev drivers: power: ds2784: Fix conversion of temperature so sign bit is maintained. Also report temperature changes when temp is above 45C. Signed-off-by: Eric Olsen commit 37cc1d401fb575b55bd4cf6be3b0876d59c217db Author: Arve Hj��nnev��g Date: Mon Dec 7 20:50:07 2009 -0800 w1/ds2482: Retry i2c transfers on failure. The w1 layer does not an error to be returned, and the ds2482 chip can nak i2c transfers. Change-Id: Id2802d782b1103a793c4d11297da515f94579ba1 Signed-off-by: Arve Hj��nnev��g commit 722210a797495c561766c762c340365e71e68d98 Author: Brian Swetland Date: Wed Oct 21 18:33:32 2009 -0700 ds2482: pass routine to write to SLP# pin via platform_data This allows for power savings when suspended. Signed-off-by: Brian Swetland commit caaf364092c21c70fa338c0b07c092b99f3e298c Author: Dima Zavin Date: Sun May 3 03:11:52 2009 -0700 input: support for Cypress TMG i2c capacitive touchscreen Based on a driver from HTC. - lots of cleanups. - don't do averaging/snapping for x/y coordinates add a fuzz value instead, and report the raw events to userspace. Signed-off-by: Dima Zavin commit 9c333d11858f93124d32a80882dbdfbd9e09b3c4 Author: Iliyan Malchev Date: Wed Jul 1 20:31:36 2009 -0700 capella cm3602 driver: initial implementation Signed-off-by: Iliyan Malchev commit 784311c43481edc2b230211066c466430ba1c4c0 Author: Dmitry Shmidt Date: Wed Jul 22 12:39:57 2009 -0700 drivers: net: wireless: Initial bcm4329 support Signed-off-by: Dmitry Shmidt net: bcm4329: Port driver to be used as built-in Signed-off-by: Dmitry Shmidt net: bcm4329: remove debug info from the module Signed-off-by: Dmitry Shmidt net: bcm4329: increase watchdog time and minor cleaning Signed-off-by: Dmitry Shmidt net: bcm4329: Add external wakeup interrupt and wakelocks Signed-off-by: Dmitry Shmidt net: bcm4329: Update to Ver 4.218.116 Signed-off-by: Dmitry Shmidt net: bcm4329: check driver started before open. Fix for bug. When driver is stopped and dhd_open is called. The sii->common_info was freed by driver stop. When dhd_open is called siutils will use the common_info structure that is now longer allocated. Change-Id: I46e6d8b15b0fa5b819f953bc18b5adb2a877377d Signed-off-by: Eric Olsen net: wireless: bcm4329: Add wakelocks for IOCTL calls Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Use GFP_ATOMIC only if necessary Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix SDIO IRQ race conditions on start/stop Signed-off-by: Dmitry Shmidt Initial Version 4.218.161 with OOB-only support Signed-off-by: Dmitry Shmidt net: wlan: bcm4329: Improve platform data use Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Add proper wakelock support Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Increase watchdog interval to 1000 ms Signed-off-by: Dmitry Shmidt net: bcm4329: check driver started before open. Fix for bug. When driver is stopped and dhd_open is called. The sii->common_info was freed by driver stop. When dhd_open is called siutils will use the common_info structure that is now longer allocated. Change-Id: I46e6d8b15b0fa5b819f953bc18b5adb2a877377d Signed-off-by: Eric Olsen Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Use GFP_ATOMIC only if necessary Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Remove debug print from wakelock functions Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Use preallocated memory Signed-off-by: Dmitry Shmidt drivers: bcm4329: Enable SDIO abort functionality + fix compilation error Signed-off-by: San Mehat net: wireless: bcm4329: Set watchdog to 100 ms Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Add mutex to "driver stop" and WL_IW_USE_THREAD_WL_OFF Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Increase driver start waiting timeout to 5 sec Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix scan list update Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Add non-continuous watchdog functionality Signed-off-by: Howard Harte Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Release dongle before bus detach Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Revert unnecessary dhdsdio_release_dongle() change Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Prevent "driver start" to be called on any command Signed-off-by: Penguin (Sen-Wen) Chang Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Increase timeout to handle delay caused by a2dp Signed-off-by: Matthew Lai net: wireless: bcm4329: Kill watchdog before "driver stop" command Signed-off-by: Anthony Huang net: wireless: bcm4329: Fix scan with more than 200 APs memory corruption Signed-off-by: Anthony Huang net: wireless: bcm4329: Add wakelocks to scanning threads Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix wakelock acquisition in scan threads Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix sending "start" message Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix add_timer race conditions Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix watchdog timer race conditions Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix "garbage" scan results processing Signed-off-by: Greg Goldman Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix unregister_netdevice() race conditions Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Prevent deadlock in SPINWAIT_SLEEP() Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Get IRQ type from platform data Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Stop transmit queue in case of firmware failure Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Set 2 retries to config registers access Signed-off-by: Greg Goldman Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix wl_iw_set_pmksa() functionality Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix to build on 2.6.32 Change-Id: Ia3b04fde342eadb86a778c48d1233a446ed8cc8d net: wireless: bcm4329: Fix ioctl synchronization Change-Id: Id1d0666b6011cf18e8b3b9afbc164aa2be43ceaf Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix cache scan result corruption Signed-off-by: Greg Goldman Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Add kernel backward compatibility Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix kernel warning for scan results Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Fix resources release in case of sdio failure Signed-off-by: Dmitry Shmidt net: wireless: bcm4329: Check if wl_iw_set_pmksa() fails Signed-off-by: Dmitry Shmidt commit 77b6912a3388f26f730220ed6cf153717f3926f8 Author: Dmitry Shmidt Date: Sun Nov 15 10:47:11 2009 -0800 [ARM] msm: Add ability to update calibration data size Signed-off-by: Dmitry Shmidt commit 1b75bcb86cc340b8bf8326e404d02a30d4b0a885 Author: Dmitry Shmidt Date: Wed Jul 8 17:06:27 2009 -0700 [ARM] msm: expose htc nvs data through /proc/calibration Change-Id: I10ad33dad67aa8a4c9ad8fc72117bf6948311ce2 Signed-off-by: Dmitry Shmidt commit d0bb4442aa048ce56ab9460fd3568b046c71fb69 Author: Dima Zavin Date: Sun Nov 15 14:43:04 2009 -0800 [ARM] msm: scorpion: Disable predecode repair cache for qsd8x50 The predecode repair cache is used to accelerate the decode of 32-bit Thumb-2 instructions which cross an instruction cache line boundary. There's a bug in 8x50 and pre-production 7x30 that causes these instruction to be executed incorrectly. Qualcomm Scorpion errata CR145669. Change-Id: If3a7cd4f476dd4238904a513dfc5f27191944034 Signed-off-by: Dima Zavin commit d5bcb5edb33c44ba76c3574e50eb8905fa165700 Author: Mike Chan Date: Sun Nov 15 18:56:13 2009 -0800 [ARM] msm: pm: Disable WFI rampdown and busy spin if there is no WFI speed If the board file specifies 0 as the WFI speed do not busy spin or ramp the cpu down. WFI speed ramp and busy spin are only required for 8k and not 7k. Signed-off-by: Mike Chan commit c0dbb27d4f944d2e2fc63c414594c532b4dae79c Author: Arve Hj��nnev��g Date: Tue Nov 3 20:47:16 2009 -0800 [ARM] msm: pm: Use scorpion specific A11S_CLK_SLEEP_EN value Change-Id: Ib0f9d70578066b8169aeded40759feec73179111 Signed-off-by: Arve Hj��nnev��g commit d8c3a9e67da5e51b2459a356e8574b397dc6ec1d Author: Arve Hj��nnev��g Date: Wed Oct 21 16:36:51 2009 -0700 [ARM] msm: clock: Hold spinlock while setting the clock rate. If two drivers change their rate request for a shared clock at the same time the driver that completed clk_find_min_rate first could make the proc comm call last. Move the spinlock from clk_find_min_rate to clk_set_rate to fix this. Change-Id: Ic73be15e868c36c8351fb954427721ec486e6129 Signed-off-by: Arve Hj��nnev��g commit 67559780d0efe2733ff5083273069a0839db66a3 Author: Arve Hj��nnev��g Date: Tue Oct 20 17:40:33 2009 -0700 [ARM] msm: Mark ebi1_clk shared. Change-Id: I6453442258813c63ea2b2dd28c236cb477e53590 Signed-off-by: Arve Hj��nnev��g commit de3f87bd52a8f29eb959c599d359ddadc2253530 Author: Arve Hj��nnev��g Date: Tue Oct 20 17:36:25 2009 -0700 [ARM] msm: clock: Add shared clock type. If CLKFLAG_SHARED is set, then clk_get will allocate a handle. When clk_set_rate is called on this handle the requested rate is saved in the handle and the rate is set to the maximum request. Change-Id: I339c040c7f7957157bde50c7be828c24ebc99625 Signed-off-by: Arve Hj��nnev��g commit a4110c0ad60bc2debeecb95972c631b0092c66bf Author: Arve Hj��nnev��g Date: Tue Oct 20 17:35:13 2009 -0700 [ARM] msm: clock: Add debugfs file with detailed information about all clocks Change-Id: Ie6c38093ee326d408b03a8b33dc734606b87c3c0 Signed-off-by: Arve Hj��nnev��g commit 98f89cf4f8ea9ed9feb507bd3e0af50a59bfea25 Author: Arve Hj��nnev��g Date: Tue Oct 20 17:29:24 2009 -0700 [ARM] msm: clock: Use hlist instead of list Change-Id: Id0bb9f2a6fe73ef05a818e7e5bd627c0052493b0 Signed-off-by: Arve Hj��nnev��g commit 90ee229a88ab5c22fcfc1dfad9e620c45f7eb6b0 Author: Dima Zavin Date: Tue Oct 20 11:38:21 2009 -0700 [ARM] msm: swordfish: Add the USB phy/core reset functions. Change-Id: Ia5434e313d44cb55a5482d46f98fc04ff5d1b847 Signed-off-by: Dima Zavin commit f3e9fede55a1be475dbbaea86671d8d8a925f519 Author: San Mehat Date: Fri Oct 16 11:56:34 2009 -0700 [ARM] mm: fault: Add imprecise abort handler which prints the fault status Signed-off-by: San Mehat [ARM] mm: fault: Fix a typo in the imprecise abort handler The code was calling 'mcr' instead of 'mrc', so we were writing to the coprocessor register instead of reading. Change-Id: Ie9d91ced01c6ac6d881e2f5624a61a5910f56bc2 Signed-off-by: Dima Zavin commit db64471663bc3a985507d4a5eb7c61f1038dedec Author: Dima Zavin Date: Mon Oct 5 16:20:55 2009 -0700 [ARM] msm: pm: make use of msm_fiq_xxx be conditional of MSM_FIQ_SUPPORT Change-Id: I6d4a9487949a679f31d35d6f2a5942dcc9d9f2f3 Signed-off-by: Dima Zavin commit a1573013a069327a51d847864a2c2ba207e5ba5c Author: Arve Hj��nnev��g Date: Mon Dec 7 16:33:57 2009 -0800 Regulator: tps65023: Wait for output voltage to change when setting dcdc1. Change-Id: Ic7b5421640f42387801337ad6fb55f93b77a1728 Signed-off-by: Arve Hj��nnev��g commit 36549b425bbaec231e486e4d8c7a802ec4c6b6a3 Author: Arve Hj��nnev��g Date: Mon Sep 28 20:06:48 2009 -0700 Regulator: tps65023: Set GO bit after updating the voltage. The voltage does not start to change until this bit set. Signed-off-by: Arve Hj��nnev��g commit b13b3dc4b4b844ac921f1fb5827e5ad15ed1098a Author: Arve Hj��nnev��g Date: Thu Sep 24 16:28:04 2009 -0700 Regulator: tps65023: Hack to work around msm i2c controller limitation The i2c controller on the msm platform cannot reliably read a single byte without so it reads an extra byte for single byte reads. This causes errors with this chip, but 3 byte reads do not seem to cause any problems. commit d2295158223d90d0fd8baaf6b280e15976ab9277 Author: Brian Swetland Date: Mon Feb 8 20:02:43 2010 -0800 [ARM] msm: qsd8k: DSP / DAL / Audio / Video MEGAPATCH [ARM] msm: qsd8k: Device Access Layer (DAL) RPC Device Access Layer (DAL) RPC is yet another remote interface to software on the baseband and dsp processors of the msm7k/qsd8k family. It uses SMD as a transport. Signed-off-by: Brian Swetland [ARM] msm: Add qdsp6 config option and makefile Change-Id: I6120d03a96339139d4d88f32e165d26b75ac805e Signed-off-by: Dima Zavin {ARM] msm: qsd8k: support for qdsp6 audio subsystem Provide support for QDSP6's AUDIO service, as well as the A9's ACDB (Audio Config Database) and ADIE services, necessary for audio operation. Provide pcm in/out drivers. Major contributions, and submitted on behalf of HK Chen @ HTC. Signed-off-by: Brian Swetland Cc: HK Chen [ARM] msm: qdsp6: Add video decode support for AMSS 3180+ - sometimes dal_call_f0 rpc returns failure need to investigate Signed-off-by: Dima Zavin [ARM]: msm: q6vdec: close the dsp in vdec_release to free up the pmem and proper cleanup of qdsp6 Signed-off-by: Tom Liu Signed-off-by: Colin Cross Change-Id: I6c9203685abbc50c8ef9633dfc99024dd720e17a qsd8k: vdec: hold wake/idlelocks while decoder is active DSP interrupts are being lost if we go to sleep while playing video. This usually doesn't happen because we usually have an audio channel open, providing its own wake/idlelocks, but this fixes the other case. Signed-off-by: Brian Swetland qsd8k: vdec: don't leak wakelocks Fix a stupid cut-and-paste error. Signed-off-by: Brian Swetland [ARM] msm: qdsp6: Add support for h/w video encode. Change-Id: If3d8c1d836955f834f4988f364cce07fce22bfa6 Signed-off-by: Dima Zavin [ARM] msm: qdsp6: flush and invalidate cahces in venc Signed-off-by: Erik Gilling [ARM] msm: qdsp6: Invalidate video encoder output buffers before encode When an output buffer is passed to the DSP, we have to invalidate it first to make sure no dirty cache lines are later written to the physical memory while the DSP is using it. Also fixes problems with cleaning the input buffer cache before the DSP. Userspace is not setting the size of the input buffer on each ioctl, so we have to pre-compute the size based on the encoder paramters. Signed-off-by: Colin Cross Change-Id: I7a858f0d833e82b296ac7e32eeaff820d52acba9 [ARM] msm: qdsp6: Invalidate encoder buffers before DSP initialization The DSP may write to the rlc_bufs during initialization. Invalidate them so that a later flush doesn't cause corruption. Change-Id: Ic482334526712c14e48c790dbeeb7c0f5e1d0cbc Signed-off-by: Colin Cross [ARM] msm: q6venc: Use flush_pmem_file to flush the input buffers to the DSP Change-Id: I37ca4ee3e85144cf1f0ccacceb3e2d7d5f0b334c Signed-off-by: Colin Cross [ARM] msm: q6_venc: detach the dal client before releasing the buffers Change-Id: Ib96c0fb6227c53b97a68d51d627f6fe2d45b5aee Signed-off-by: Dima Zavin qsd8k: audio: combined changes qsd8k: audio: handle transient errors during pcm stream open Sometimes we get an EUNSUPPORTED (?!) error while trying to open a pcm stream. If we retry in 1ms it succeeds. Add some debugging/tracing code handy for diagnosing issues like this (disabled by default). Signed-off-by: Brian Swetland [ARM] msm: qdsp: add wakelocks Signed-off-by: Mike Chan qsd8k: audio: move to new dsp protocol (3200.04+) Signed-off-by: Brian Swetland qsd8k: audio: fix q6audio_update_acdb(). Correctly indicate RX or TX device. Signed-off-by: Brian Swetland qsd8k: add receiver analog control Signed-off-by: Brian Swetland qsd8k: audio: support ACDB reinitialization Signed-off-by: Brian Swetland qsd8k: audio: add support for stream volume. Signed-off-by: Brian Swetland qsd8k: audio: fix recording fail issue when sampling rate higher than 8K. Signed-off-by: Brian Swetland qsd8k: audio: change the buffer size in pcm driver from 8192 to 4800. Userspace expects 4800 default. Easier to fix it on this side. Signed-off-by: Brian Swetland qsd8k: audio: tracing, and stuck dsp panic code If the dsp doesn't respond in 5s, it will probably never respond, leaving the device in a bad state -- panic in that case. Add some debug chatter on pcm in/out open and close as well. Signed-off-by: Brian Swetland qsd8k: audio: fix volume control. Per QCT's comments, volume control only works when there are active audio/voice sessions, or DSP will return status 20 (UNSUPPORTED). To solve this issue, QCT has introduced new voice device ID which is using for in-call volume control. It will directly apply the volume setting to next voice call. Also, for in-call uplink volume, remove the redundant volume setting and use the default setting in DSP (0dB as default). Signed-off-by: Brian Swetland qsd8k: audio: fix ordering of analog/digital power up sequencing for tx Avoids noise on audio input. Change-Id: Ib1baab87e99a09f9e1284d32cf1d6a5b5fc3a6c8 Signed-off-by: Brian Swetland qsd8k: dal: add tracing capabilities to DAL channels If requested, log the last 32 calls, replies, and/or events. Signed-off-by: Brian Swetland qsd8k: trace dal io and dump it on fatal error Signed-off-by: Brian Swetland qsd8k: audio: correctly release the firmware on acdb change Signed-off-by: Brian Swetland qsd8k: audio: fix bongus ID look up in q6audio_set_rx_volume(). Signed-off-by: Brian Swetland qsd8k: audio: enhance stuck dal debugging Dump the packet we were in the act of sending, if we timed out while waiting for a reply. This covers the situation of failing on a different channel than one being traced. Signed-off-by: Brian Swetland qsd8k: audio: pcm_out: default buffer size is now 3072 Signed-off-by: Brian Swetland [ARM] qsd8k: audio: fix typo in q6audio_devices.h Signed-off-by: Iliyan Malchev qsd8k: audio combined changes qsd8k: audio: clean up code for ACDB update. Signed-off-by: Brian Swetland qsd8k: audio: remove redundant ACDB updates for audio playback and recording. q6audio_open_*() now takes an acdb_id to allow the device to be changed as part of the channel open process. Signed-off-by: Brian Swetland qsd8k: audio: remove redundant ACDB updates during audio route changes. Audio HAL will pass the ACDB ID to audio driver when audio route changes. Signed-off-by: Brian Swetland qsd8k: audio: change the timing for ADIE enable/disable. Avoid pop noises. Signed-off-by: Brian Swetland qsd8k: audio: change the timing when ACDB updates to avoid tick sound during voice call. Signed-off-by: Brian Swetland qsd8k: audio: do not require acdb_ids on channel open This allows the simple case of using the default device to work. Signed-off-by: Brian Swetland qsd8k: dal: don't use dch before setting it Harmless on a UP, non-spinlock-debug build, but quite very wrong. Signed-off-by: Brian Swetland qsd8k: audio: reorder audio path setup around pcm open Some clicks and pops on stream start are avoided if the audio path setup is deferred until after the stream is opened but before the stream is started. The whole audio path management scheme wants some serious rewriting, but for now we'll stick with a minimal-risk change. Signed-off-by: Brian Swetland [ARM] qsd8k: initialize the spinlock in dal_client Signed-off-by: Iliyan Malchev qsd8k: audio: avoid incorrect sampling rate on first input pcm open Also avoid double calling audio_tx_analog_enable() Signed-off-by: Brian Swetland Signed-off-by: Paul Eastham [ARM] msm: q6audio: remove device gain control for pcm playback. Change-Id: Id243b6771a6a324931afa86c662eef8b907b213b Signed-off-by: Dima Zavin [ARM] qsd8k: audio: combined changes [ARM] qsd8k: audio: use default settings if ACDB-table query fails Signed-off-by: Iliyan Malchev [ARM] qsd8k: audio: remove device gain control for mp3 playback Fixes the problem where in-call downlink volume gets degraded after tone is played. Signed-off-by: Iliyan Malchev [ARM] qsd8k: audio: add HAC ACDB ID support -- q6_voice_start, q6voice_open take an ACDB-ID parameter -- q6_ioctl AUDIO_START_VOICE passes ACDB ID -- q6voice_open passes the ACDB ID to audio_rx/tx_path_enable Signed-off-by: Iliyan Malchev [ARM] qsdk8k: audio: remove in-call volume control from driver Will move to board file. Signed-off-by: Iliyan Malchev [ARM] qsd8k: audio: add function to override default ACDB file. Signed-off-by: Iliyan Malchev [ARM] qsd8k: audio: enable selection of input and output buffer size -- through AUDIO_SET_CONFIG ioctl -- lowers default buffer size from 4k to 256 bytes Signed-off-by: Eric Laurent commit d778f98d9571270c43466f1f1ab3dc6f1f97884f Author: Brian Swetland Date: Fri Jul 17 18:50:18 2009 -0700 qsd8k: pmic control Change-Id: I81d904080c7660b07b850348ee7eee212a2daa44 Signed-off-by: Brian Swetland commit 781d5e798c1a8ef8f33816786fac989c8f0f5496 Author: Arve Hj��nnev��g Date: Thu Aug 20 18:18:57 2009 -0700 [ARM] msm: pm: Fix apps sleep and modem initiated early exit from power collapse Add new apps sleep wait states. Wait for modem to set run or early-exit after returning from power collapse. Fix msm_pm_wait_state when waiting for any bit in a mask to get set. Signed-off-by: Arve Hj��nnev��g commit 8e2e32ce907c14e45a4b2737c05539d75407a2e2 Author: Arve Hj��nnev��g Date: Mon Sep 21 20:28:27 2009 -0700 [ARM] msm: Import new bootinit code from Qualcomm. New SET_SA code based on fuse registers plus some cache control register changes. Signed-off-by: Arve Hj��nnev��g commit e9ddba5912bfe675f1036219d3db2cbe58183128 Author: Arve Hj��nnev��g Date: Fri Jul 31 14:20:32 2009 -0700 [ARM] msm: pm: Run full cpu init code from bootloader on resume. Fixes random crashes after returning from power collapse. Signed-off-by: Arve Hj��nnev��g commit d41e299ef6892edad3034ef4649c3ac6bce25ef0 Author: Dima Zavin Date: Mon Aug 17 18:15:50 2009 -0700 [ARM] msm: Add debugfs interface to the clock rate control Signed-off-by: Dima Zavin commit 30ddf72455310e83102486f8c5b4a83c111d0fd8 Author: Dima Zavin Date: Mon Aug 24 00:06:17 2009 -0700 [ARM] msm: scorpion does speculative fetches Signed-off-by: Dima Zavin commit fe79fc554afbfaa2652542129fb7380f4f7c4934 Author: Steve Muckle Date: Sun Aug 23 23:58:47 2009 -0700 [ARM] add support for CPUs that do speculative fetches Some CPUs perform speculative fetches. This may occur while a region of memory is being written via DMA, so that region must be invalidated when it is brought under CPU control after the DMA transaction finishes, assuming the DMA was either bidirectional or from the device. Signed-off-by: Dima Zavin commit 89659559ae49dfae27360d34ddd48998db24aa9a Author: Dima Zavin Date: Tue Jul 21 15:00:49 2009 -0700 [ARM] msm: rpc: Match qsd8x50 rpc behavior to that of msm7k's 6350. This will be absoleted by putting AMSS features into the Kconfig. Signed-off-by: Dima Zavin commit f2bbaa0f49290d653521e3606ef1f55e0040be5b Author: Dima Zavin Date: Mon Oct 19 00:51:04 2009 -0700 [ARM] msm: Add SPI clock definition Change-Id: I1fa7a6a9ed8800a614df58cd46441ce8442ca01f Signed-off-by: Dima Zavin commit 13c7591cf58bd39b51ad0e89565e5f1d1f742740 Author: Dima Zavin Date: Mon Oct 19 00:50:22 2009 -0700 [ARM] msm: Update list of available clocks Change-Id: Iefa472939066d7b45c87a6dc2b716af9f2daf050 Signed-off-by: Dima Zavin commit ca96115ddbb802a449c9dda857197b241956124f Author: Dima Zavin Date: Tue Jul 14 13:31:19 2009 -0700 [ARM] msm: Add SPI device and resources definitions Change-Id: Ie611371512e1f721d8fb431f133266dac8bc49c5 Signed-off-by: Dima Zavin commit 96000bd934aac8d5eca6d6a55c8a5249719ec8ce Author: Arve Hj��nnev��g Date: Wed Jul 8 21:43:44 2009 -0700 [ARM] msm: Turn off unused UART clock. Signed-off-by: Arve Hj��nnev��g commit e265c4ffa7a2ad8cee7964549865e78d8a65de60 Author: Arve Hj��nnev��g Date: Mon Oct 19 16:37:17 2009 -0700 [ARM] msm: irq: Clear wakeup interrupt before sleep This works around a problem where the device fails to power wakeup at all if the modem tries to initiate an early exit when the wakeup interrupt is already pending. Another bug in the modem code causes triggers a spurious wakeup interrupt if the apps processor initiates an early exit by setting DEM_SLAVE_SMSM_WFPI. Change-Id: Id6db67f86a532a4c55cb19719d68329651dfca1e Signed-off-by: Arve Hj��nnev��g commit 2fec974b6a9257464b3b22762b0eeb7b1b3bb42e Author: Arve Hj��nnev��g Date: Sun Sep 27 19:10:31 2009 -0700 [ARM] msm: irq: Clear i2c interrupt after sleep. Signed-off-by: Arve Hj��nnev��g commit 82f7ac0e4c73a629a8c4aca4c70148494ae31669 Author: Arve Hj��nnev��g Date: Wed Aug 19 21:14:13 2009 -0700 [ARM] msm: irq: Add INT_ADSP_A11 to the list of fake wakeup interrupts Signed-off-by: Arve Hj��nnev��g commit 6fa72f62cf6f51ad7a23cebb0427825f911a4354 Author: Arve Hj��nnev��g Date: Sun Sep 20 17:42:34 2009 -0700 [ARM] msm: Remove i2c interrupt from wakeup list. The other core uses the i2c controller while we are in power-collapse which makes this interrupt unusable as a wakeup source. Signed-off-by: Arve Hj��nnev��g commit d480336e3dde7cd15c2ea8e8bf43a7a3bdc2353a 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. Change-Id: I49f807ae7ddce2f96a097f2f58b4cf963c3e9275 Signed-off-by: Dima Zavin commit f7981c5d2447137dc79dc9a488f217e3c509ffb9 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 commit 660d35c3005ed1496132b9a30ef0be67e7738be3 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. Change-Id: Ibe49fc416681d61dfc3c0df022dfdfa6010e74b1 Signed-off-by: Haley Teng Acked-by: Dima Zavin commit f9b353f04cff8b81e74d2a5af03a8b6117d68c78 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 commit 109c42487e2c791ba169895293c7c1976782f318 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 commit a3d6832056af1336474065b2824beeae9be7e434 Author: Arve Hj��nnev��g Date: Tue Jun 16 14:48:21 2009 -0700 [ARM] msm: Add 8k power collapse support Adds idle-v7.S from Qualcomm's tree, but with cpu init code from the bootloader added. Signed-off-by: Arve Hj��nnev��g commit 9191791b5477bf31e454ab966383d28d26ca2ed6 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 c2362663fad08db7bf9c5747583393a39893a665 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 0b7b82d5814957d935e53e82258993af15e2ca79 Author: Arve Hj��nnev��g Date: Fri Jan 8 16:35:17 2010 -0800 [ARM] msm: Fix time synchronization on 7k. The modem on 7k writes to the apps processor's state word during clock synchronization. This could cause the signal that we finished synchronizing to be lost. Change-Id: I0b46ff3198a7876d847af9963d71c6bd9cf786a1 Signed-off-by: Arve Hj��nnev��g commit 3c64e7883804fd3fb246a39b872b9f473d6f9177 Author: Arve Hj��nnev��g Date: Fri Nov 13 20:24:54 2009 -0800 [ARM] msm: timer: Add fast timer api to read debug timer Activating this timer disables low power idle modes, but the debug timer, as configured, has ~0.2us resolution instead of the gp timer's fixed ~30.5us resolution. Change-Id: I6ada25442454cfb380f8fe618fc507502b1a279e Signed-off-by: Arve Hj��nnev��g commit 9f02069bf439516dfd2285fefcf62f3404a81636 Author: Arve Hj��nnev��g Date: Sun Nov 15 20:00:22 2009 -0800 [ARM] msm: timer: Don't crash if we get an interrupt from the inactive timer Change-Id: I7ab048e0da9c15b3b89def5c6b0d342aa70f0b64 Signed-off-by: Arve Hj��nnev��g commit 0ce58944b25ef5b028b5f3d8c3b7e0ae197fa3cf Author: Arve Hj��nnev��g Date: Tue Nov 24 22:16:35 2009 -0800 [ARM] msm: timer: Fix debug timer rate on scorpion Change-Id: Ie707aa03c3484930f29b25ff653dbe92c3a2bfb4 Signed-off-by: Arve Hj��nnev��g commit 18cb49239743e266a8f29e6c716c658f33fa7be6 Author: Arve Hj��nnev��g Date: Wed May 20 17:08:52 2009 -0700 [ARM] msm: Add time synchronization for 8k. Signed-off-by: Arve Hj��nnev��g commit c890fef0546662219113e1cdaf95f498876c305c 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 commit ba2f6ec7e5548f02002c6d8fe92d2946d527c3c0 Author: Arve Hj��nnev��g Date: Wed Jun 24 19:43:05 2009 -0700 [ARM] msm: Add sirc fiq support Signed-off-by: Arve Hj��nnev��g commit fb2e02fc6fafdb2942b846c2921672c176d756f6 Author: Dima Zavin Date: Wed May 20 22:55:58 2009 -0700 [ARM] msm: Hack the RTC driver to match either msm7k AMSS version or arch_qsd8k Signed-off-by: Dima Zavin commit f3e311aa55616ad6d98685e4b5b5c79ff855d2b2 Author: Brian Swetland Date: Thu Jan 29 00:28:29 2009 -0800 [ARM] msm: swordfish: Add support for qsd8x50 surf board Also provides a swordfish_defconfig Change-Id: I478a15656d2ce3966ae980edd6a87c13464265ac Signed-off-by: Brian Swetland Signed-off-by: Dima Zavin commit c870eb5b8c1373eaf71b7cc3d7c04c561c93c67b Author: Brian Swetland Date: Wed Mar 18 12:41:05 2009 -0700 smc91x: ARCH_MSM configuration commit 9036d7e9f94624a469a484b1a47cbae9c37526bc Author: Dima Zavin Date: Mon Mar 30 18:36:59 2009 -0700 [ARM] msm: Add touchscreen device definition Signed-off-by: Dima Zavin commit a16889b17dc328e26d0f48ee4464d17721655667 Author: Dima Zavin Date: Mon Mar 30 18:35:36 2009 -0700 input: Add driver for Qualcomm MSM touchscreen controller Signed-off-by: Dima Zavin commit 3b4c91c268e5a81e1ecfa85699f98f3ebf1d22d7 Author: Dima Zavin Date: Mon Dec 14 01:13:05 2009 -0800 [ARM] msm: kgsl: Fix a typo when checking pmem region size Change-Id: Icab8179e15569c77762e24764380f8f97d0d43e2 Signed-off-by: Dima Zavin commit 550de72e6327ea160c517206202f0c7b0f6aeba5 Author: Dima Zavin Date: Fri Dec 4 20:26:50 2009 -0800 [ARM] msm: kgsl: allow the framebuffer to be mapped into the mmu The from_pmem ioctl can now accept an fd for the framebuffer, and create an mmu mapping so that the GPU can render straight into the fb. Change-Id: I8845eb9ee3ce793349e71785311655c8b096e6eb Signed-off-by: Dima Zavin commit 1b286c5268867444634476cd85cb4685f05f8b01 Author: Dima Zavin Date: Thu Dec 3 01:39:11 2009 -0800 [ARM] msm: kgsl: Disable shadow writes The use of this freature currently has some known instabilities and does not actually provide a measurable performance improvement. Change-Id: I2ef785e4894334c000fb97365eb676f25bee65e6 Signed-off-by: Dima Zavin commit 4654c84b3e693c8366120777136ac6008f1ee5f1 Author: Shubhraprakash Das Date: Wed Dec 2 22:08:20 2009 -0800 [ARM] msm: kgsl: flush the vmalloc range if we are mapping non-cached to user Change-Id: I38777fe2d6ffcf3173961558b77a9dc5b7f6ac5e Signed-off-by: Dima Zavin commit bf9679b9a945dea93048d0e9de2d01bb0de2ceeb Author: Shubhraprakash Das Date: Wed Dec 2 22:09:58 2009 -0800 [ARM] msm: kgsl: Add barriers and flush the tlb when changing MMU mappings Change-Id: Ia681b27c3a4bc074a535b20ac07404d10fda094e Signed-off-by: Dima Zavin commit fbf8e8050fdac34e86bdcb53962dab2dc45b0959 Author: Shubh Das Date: Mon Nov 30 17:26:17 2009 -0700 [ARM] msm: kgsl: Map all memory allocations through the MMU Map all memory allocations through the MMU and set it up to fault if an address does not lie within its virtual address range. The only allocations that are not mapped are the allocations for MMU page table and a dummyspace allocation whose address is written to the REG_MH_MMU_TRAN_ERROR register. Change-Id: I92f93d87a9d4d2551d58520d46d820f164b150dc Signed-off-by: Simon Wilson Signed-off-by: Dima Zavin commit 07bbf86b0d34723373bf79136ab3398a85ddc1e8 Author: Shubhraprakash Das Date: Mon Nov 23 18:03:55 2009 -0700 [ARM] msm: kgsl: save gmem based on correct use of flags Corrects the way we save gmem. Renderboy informs kgsl via a flag when the gmem should be saved by kgsl on a context switch and when it does not need to be saved. Change-Id: I36c55049188f335a3353c65fd0e4f7b2c672cc24 Signed-off-by: Shubhraprakash Das Acked-by: Dima Zavin commit 9debc8d3c354c752a04f4f67f8b14a336b15ea08 Author: Shubhraprakash Das Date: Mon Nov 16 20:22:27 2009 -0700 [ARM] msm: kgsl: Fixes multicontext screen corruption issue This change fixes an issue in multicontext environment where some part of texture of one apllication gets displayed on the screen surface of another application Change-Id: Ic5ff3655d2cf7ffad28f2483982f557236335369 Signed-off-by: Shubhraprakash Das Acked-by: Dima Zavin commit 48b615aa6122e8fc987780878b13985a5bf0704c Author: Dima Zavin Date: Tue Nov 17 02:09:14 2009 -0800 [ARM] msm: kgsl: don't print the reschedule warning from standby timer Change-Id: I04e55a193bfbda178716a348b7b1374adaf36558 Signed-off-by: Dima Zavin commit 6edb4ac62befe2caf4407648821019e307efc855 Author: Shubhraprakash Das Date: Wed Nov 11 19:11:49 2009 -0700 [ARM] video: msm: kgsl: Call kgsl_yamato_runpending before allocating memory. Calling kgsl_yamato_runpending before we allocate memory will cause the driver to free all pending buffers which will improve the chance of memory allocation on low memory conditions. Change-Id: I847dce494dcfa0e75ee43b6b0c544065d2301acf Signed-off-by: Shubhraprakash Signed-off-by: Dima Zavin commit 48701668f4645c9f2cf32dd666f274e28923ac10 Author: Shubhraprakash Das Date: Wed Nov 11 18:01:10 2009 -0700 [ARM] video: msm: kgsl: Do not wait for the REG_CP_RB_WPTR to be updated kgsl_yamato_regread can cause rbbm read errors and it is not nessasary to wait for REG_CP_RB_WPTR to be updated here anyway. Change-Id: I65b641074a05ee4217dfad81c255e06c49c45aa0 Signed-off-by: Shubhraprakash Das Signed-off-by: Dima Zavin commit 867d334da8ddc4e873083f77bce17f8a5aa51edc Author: Shubhraprakash Das Date: Wed Nov 11 17:55:19 2009 -0700 [ARM] video: msm: kgsl: Set the right values for PM4_DRAW_INDX_BIN and PM4_DRAW_INDX_2_BIN Change-Id: Ic57a4bfd512c13c09329ddde20064c78fca71a7f Signed-off-by: Shubhraprakash Das Signed-off-by: Dima Zavin commit 08f0845d6aa6cfc3406434bb676afd7eafd6eb22 Author: Shubhraprakash Das Date: Wed Nov 11 17:54:18 2009 -0700 [ARM] video: msm: kgsl: Properly restore the bin base offset on context switches The correct bin base offset is set for the context whenever it changes after the binning pass so that it can be restored on context switch. Change-Id: I688eb3daf94fa68fa4e1defd7c5ef0ac797b6c10 Signed-off-by: Shubhraprakash Das Signed-off-by: Dima Zavin commit 00b0ed705c22874f6f3ef2990cded0299748967f Author: Dima Zavin Date: Sun Nov 8 13:13:00 2009 -0800 [ARM] video: msm: kgsl: Set the GPU mappable virtual address space to 128MB. Change-Id: Ic0cf8b12e6e0b34a2dd60a313dd807ba3e25c874 Signed-off-by: Dima Zavin commit 9ab5579bb3063b9d6c461bd30b65d8c478369b28 Author: Omprakash Dhyade Date: Wed Nov 4 21:43:00 2009 -0800 [ARM] video: msm: kgsl: Bypass SQ RTR for host accesses. Host access are blocked based on status of SQ block this may cause 3ms delay on the bus to access a register. This delay can lock out GSM and cause fatal error in MDSP. So, bypass SQ RTR for host register access. Change-Id: Ia096d7c3a6a8f04c8ffdcbf0a9547bb281e6bc39 Signed-off-by: Dima Zavin commit abe3472d18a2eb72a786a2e5fbfb51d58635707f Author: Dima Zavin Date: Mon Feb 8 21:01:27 2010 -0800 [ARM] msm: Add the yamato GPU driver found on qsd8x50 This driver authored and provided by Qualcomm Inc. Signed-off-by: Dima Zavin msm_kgsl: report rev 2.1.1 instead of 2.1 due to hardware bug Hardware rev 2.1.1 is incorrectly reported as 2.1 when reading the chip ID register. This causes triangle strips to be made larger by the usermode driver and thus reduces triangle rate in applications such as Powerlift. The chip ID is changed back to 2.1.1 to avoid this. CRs-fixed: 187187 Signed-off-by: Simon Wilson msm_kgsl: Clean up memory when timestamps are freed Call yamato_runpending when a timestamp is freed to ensure that the memory actually gets cleaned. Signed-off-by: Jordan Crouse [ARM] video: msm: kgsl: Fix typo when tearing down contexts on file release Signed-off-by: Dima Zavin [ARM] video: msm: kgsl: Disable/enable clocks and irq at suspend/resume. Signed-off-by: Dima Zavin [ARM] msm: kgsl: Integrate latest driver from Qualcomm. Fixes several context and command stream management issues. Fix MMU support, and other fixups. Change-Id: I384694bd611213e7a14a729f55a35d4e7f921d15 Signed-off-by: Dima Zavin [ARM] msm: kgsl: check the right timestamp on drain Change-Id: I5932bf639ff33c31bdb5686dd63929df3a6b2868 Signed-off-by: Dima Zavin kgsl: request 128MHz EBI1 clock when active Signed-off-by: Brian Swetland [ARM] video: msm: kgsl: Add an idle status check function Add a function that checks if the ringbuffer is empty and all the blocks in the GPU are idle. Change-Id: I9d58a2f607f6f7f28d0fbef6d7104e2444f3ebab Signed-off-by: Dima Zavin [ARM] video: msm: kgsl: disable the GPU during periods of inactivity The GPU is only enabled when there are pending commands in the ringbuffer. Whenever the last user of the driver leaves the kernel, a timer is started which will check the emptyness of the ringbuffer and whether or not the GPU itself is idle. If the conditions are not met, the timer is restarted. We try aggressively turn off the GPU after slightly more than a frame of inactivity. Change-Id: I9a9be81d52431ef2defdc22a3df3af2b2b1ce817 Signed-off-by: Dima Zavin [ARM] video: msm: kgsl: Dump register state on timeout for waittimestamp. Also, if the user asks for no timeout, force it to be 10 seconds so we don't end up blocked forever if GPU hangs. Change-Id: Ieb3ed7c87904b0897997b0b55ba758030d388aed Signed-off-by: Dima Zavin [ARM] video: msm: kgsl: Write the error register on axi errors Change-Id: I0536874ddc5f9844b0fe5b6f32457a4470075b1d Signed-off-by: Dima Zavin [ARM] video: msm: kgsl: GPU is truly idle when rbbm_status is 0x110 Change-Id: I1066d8bab2b9fb8f06a89f120a7467241d64b78b Signed-off-by: Dima Zavin commit 52f8b5c712d02b6ac0fc26ce729f797c83f67a26 Author: Dima Zavin Date: Fri May 29 20:38:24 2009 -0700 [ARM] msm: msm_fb: Move config options into a separate Kconfig under video/msm Signed-off-by: Dima Zavin commit 9dca1178dfaab6e528e39db858f59e355cb55870 Author: Brian Swetland Date: Mon Feb 8 20:52:09 2010 -0800 [ARM] video: msm: Add support for MDP 3.1 (qsd8k) Includes support for the PPP which does scale, rotate, blend, color-convert, etc. Also adds support for the LCDC output. Signed-off-by: Dima Zavin [ARM] video: mdp: add support for pre-multiplied alpha for mdp 3.1 Signed-off-by: Dima Zavin HACK: [ARM] video: msm: lcdc: Set ebi1 clock rate to 128Mhz on resume MDP clock rate is tied to the AXI, and setting the MDP clock doesn't work. So, we request the ebi1 clock at the correct frequency whenever the screen is on, which will force the MDP clock higher. Signed-off-by: Dima Zavin [ARM] msm: mdp: cleanup in probe corectly on failure Change-Id: Ife63744371480048ae1523ec1185f9acd0e637bf Signed-off-by: Dima Zavin [ARM] video: msm: mdp: Set the ebi1 clock to 128mhz when performing blits Thsi makes sure that the MDP (locked to AXI) and the AXI/ABI1 run at the maximum frequency during blit operations. Change-Id: Ifec2f4258c00146f478fc9941a261b89254bac0f Signed-off-by: Dima Zavin [ARM] video: msm: mdp_lcdc: Do not force EBI1 to max whenever the screen is on Previously, when the frambuffer was located in the EBI, there would be visual artifacts if the EBI1/AXI frequency was not forced to 128mhz. This should no longer be required, and we should let the ARM9 scale EBI/AXI appropriately during idle or static screen refreshes. The MDP blits will force it higher when necessary. Change-Id: Iace4a056abbe50dc7d1ddb70fe3636873e5cfaf3 Signed-off-by: Dima Zavin [ARM] video: msm: Allow framebuffer to be configured in 32 bit mode For now only accept XRGB_8888, RBG_888 and RGB_565 Signed-off-by: Rebecca Schultz Zavin [ARM] video: msm: Allow users to request a larger x and yvirtual fb As long as the total size fits inside the memory allocated to the framebuffer users can request a larger size. This change allows users to request a triple buffered fb. Signed-off-by: Rebecca Schultz Zavin [ARM] video: msm: Correct use of resource in fb The resource end is the last byte, add one to get the actual size. Signed-off-by: Rebecca Schultz Zavin [ARM] video: msm: mdp_lcdc: Don't update the dma config at init Updating the dma config at init time leads to a race condition with the framebuffer which hasn't configured the format yet. Also if the dma config of the bootloader and the kernel don't match this will cause artifacts. Signed-off-by: Rebecca Schultz Zavin [ARM] video: msm: mdp_lcdc: Correct lcdc timings Signed-off-by: Rebecca Schultz Zavin video: msm: Add support for 32 bit framebuffer packed BGR instead of RGB This is the 32 bit format produced by the gpu. Signed-off-by: Rebecca Schultz Zavin ARM: msm: mdp: Catch blits that the mdp can't handle and return an error Adds checks for the following two conditions: 1. ROI extends outside the area of the source or destination image 2. Source width or height is greater than 2048 (MDP bug) Signed-off-by: Colin Cross Change-Id: I28d4dc46f5b157ebf7cacbbf5d00962fa2851c0e ARM: msm: mdp: Disable pixel-repeat mode for scaling Pixel-repeat mode was used for RGB->RGB blits, but it causes scaled text to look bad. Using the same FIR tables that we use for YUV blits looks better. Change-Id: I3041c9c42458da09b29489c5b2e8ac5b01f2c105 Signed-off-by: Colin Cross [ARM] msm: mdp: Disable SVI (sharpening) for RGB blits Leaves SVI enabled for YUV frames (generally video). Change-Id: If708e452896634c50ffa9026eb4f08c10819bc52 Signed-off-by: Colin Cross video: msm: Change the output to 565 instead of 888 Signed-off-by: Rebecca Schultz Zavin [ARM] msm: mdp: Mask out old DMA destination bits when setting new ones Change-Id: I3b9c15071bf30b93788a43ee931e5064cd337f78 Signed-off-by: Colin Cross [ARM] msm: mdp: Prevent framebuffer glitch during initialization Holds a reference to the mdp_clk until lateinit, and moves the framebuffer initialization to device_init. The framebuffer lcdc driver will grab a reference to mdp_clk, which prevents the clock from being disabled by clock_late_init Signed-off-by: Colin Cross Change-Id: I70d49b4c78b3cca8a52cf846b370d8ea7ffaa418 [ARM] msm: mdp: Prevent DMA lockups when switching bit depths Forces the lcdc off and waits a frame vsync period to prevent the MDP DMA engine crashing if the DMA bit depth is changed. A sleep cannot be used because lcdc_dma_start is called in irq context. Change-Id: Ibdceede494a6edd8f49878419f5410cabafe0253 Signed-off-by: Colin Cross [ARM] msm: mdp: Print useful messages and BUG when the MDP locks up Change-Id: Id930bc638ca86ae406c2714f5789d8f26363683a Signed-off-by: Colin Cross [ARM] msm: mdp: Add more debugging output on mdp crashes Signed-off-by: Colin Cross Change-Id: I4c188a702987a7a3baff6aab0eee77348e84a6ad [ARM] msm: mdp: Add additional debugging info when blits fail Change-Id: I5ddf43aef8b53d19c3a1cc160676ce2d0785914f commit 233b2a38d8df08ec4df7441bd446c691fc73ac72 Author: Dima Zavin Date: Wed Feb 18 09:13:15 2009 -0800 [ARM] msm: add qsd8k-only clocks for mdp lcdc Signed-off-by: Dima Zavin commit 79f59bcbe6b64bf3d9b225f26ee397538f685548 Author: Dima Zavin Date: Tue May 19 15:47:35 2009 -0700 [ARM] msm: qsd8k and msm7201 have swapped i2c primary/auxiliary pin configs. Signed-off-by: Dima Zavin commit 78de098454a16764684954475273b996cb8ed43e 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 e6f08c1b320cd20835da799158eb17e3559ddff0 Author: Brian Swetland Date: Tue Jan 27 19:48:19 2009 -0800 [ARM] msm: io.c setup support for scorpion Signed-off-by: Brian Swetland commit 7f30a4af493359bc689ce4e6277d71c5eddba4cf Author: Muckle, Steve Date: Fri Dec 5 18:10:28 2008 -0800 [ARM] msm: fix check on gpio smem allocation GPIO data is fully packed in SMEM, unlike on the SoC where there is empty space in some GPIO registers. Signed-off-by: Brian Swetland commit 8e5f51af6117b3ef4949364a3ba05e6f3623ac76 Author: Muckle, Steve Date: Fri Dec 5 18:09:52 2008 -0800 [ARM] msm: add gpio support for QSD QSD adds two more GPIO banks. Signed-off-by: Dima Zavin commit 2cb7cf51dbf286068fea3861566a445fe1918aa0 Author: Brian Swetland Date: Thu Jan 29 00:35:32 2009 -0800 [ARM] msm: secondary interrupt controller for scorpion Signed-off-by: Brian Swetland commit 6ede969b4418be5f8f2bd128d0cd4fbd3fd97e72 Author: Brian Swetland Date: Mon Feb 8 20:31:33 2010 -0800 [ARM] msm: acpuclock control for scorpion core (with dedicated pll) Signed-off-by: Brian Swetland [ARM] msm: Add cpufreq support for scorpion. Signed-off-by: Dima Zavin msm: acpuclock-scorpion: clean up scorpion acpu clock management - New init sequence is simpler and more tolerant of different clock configurations coming out of the bootloader - New clock switching logic is simplified - Leftovers from the msm7k/arm11 implementation removed - LPJ adjustment now applied on clock switch - make checkpatch happy - mutex -> spinlock Signed-off-by: Brian Swetland [ARM] msm: scorpion: wait for 100uS after changing pll freq According to low/high temperarute tests, the old value of 20 was not enough. Signed-off-by: Dima Zavin [ARM] msm: Take 256MHz out of the scorpion cpufreq table. Signed-off-by: Dima Zavin [ARM] msm: acpuclock-scorpion: various [ARM] msm: acpuclock-scorpion: add cpu voltage scaling when frequency changes Change-Id: I52822195fc086f527ed91295aa9b8f6b0771699b Signed-off-by: Haley Teng Signed-off-by: Arve Hj��nnev��g [ARM] msm: acpuclock-scorpion: Use regulator api to set voltage Looks for a supply named "acpu_vcore". Signed-off-by: Arve Hj��nnev��g [ARM] msm: acpuclock: Initalize cpufreq_table for all cpu speeds on scorpion Signed-off-by: Mike Chan [ARM] msm: acpuclock-scorpion: cleanup compiler warning Change-Id: I740e754fc92fef2351185eb0182708634fcaf90e Signed-off-by: Dima Zavin qsd8k: acpuclk: correctly set loops_per_jiffy at boot lpj was being initialized to 0 always... not at all good. Signed-off-by: Brian Swetland qsd8k: acpuclk: make sure we set lpj at the right time When switching to SCPLL, we must set the new LPJ before we select the new clock speed, otherwise our udelay() to let the scpll stabilize after selecting the new frequency may be too short when moving to a higher frequency. Signed-off-by: Brian Swetland [ARM] msm: scorpion: Do not force reconfiguring of the scpll at boot If we are already running at the target boot frequency (768Mhz), do not reconfigure the SCPLL. Should prevent us from loading the AXI bus during boot. Change-Id: I5939f65c89b4a28e36a673ebb225c469905be9b9 Signed-off-by: Dima Zavin [ARM] msm: scorpion: Use the TCXO instead of AXI as a standby clock When switching SCPLL speeds, we should not use the AXI clock for the intermediate step. Use the TCXO instead. Change-Id: Ic5809396a1cb8e371b4544e2c5aa138af2d51ab1 Signed-off-by: Dima Zavin [ARM] msm: scorpion: Ensure the MPLL is up before doing acpu clock init We want to make sure that the MPLL is up before we continue so that we can use it for the temporary step while frequency scaling. Change-Id: I2f5da0138b744e1f8f0b2bd5ac4f26c62eb80751 Signed-off-by: Dima Zavin [ARM] msm: scorpion: Use MPLL for intermediate steps while freq scaling Change-Id: I19e0a411472225330e2dc68c5ef6ebbe4d8d4561 Signed-off-by: Dima Zavin [ARM] msm: scorpion: Wait for 200uS more after enabling the SCPLL We should probably trim this down once we get confirmation from Qualcomm about the total necessary delay. Change-Id: Iba33027dc7685c848f2ab8720dc19d81df83cb8c Signed-off-by: Dima Zavin [ARM] msm: acpuclock: Do not ramp up when going to power collapse/wfi Apply these same changes to scorpion. Power collapse and wfi speeds specified in the board files are the fastest speeds one can go before entering the mode. If the acpu is running at a slower rate do not clock up, this can cause PLL depencency issues. Signed-off-by: Mike Chan [ARM] msm: acpuclock-scorpion: add get_wfi_rate() If the board file specifies 0 as the WFI speed do not busy spin or ramp the cpu down. WFI speed ramp and busy spin are only required for 8k and not 7k. Signed-off-by: Mike Chan [ARM] msm: acpuclock-scorpion: various [ARM] msm: scorpion: use correct units when setting acpu rate (khz -> hz) Change-Id: I71a47abf0fe7ac357372491b5d67b65304cccc49 Signed-off-by: Dima Zavin [ARM] msm: acpuclock: Adjust vol to 1.275 for 998mhz per spec Signed-off-by: Mike Chan [ARM] msm: scorpion: adjust the voltages for acpu frequency table Provides better margin for process variance. Change-Id: I0203797d4314618c20400e6f56c4731c6ce7e952 Signed-off-by: Haley Teng Acked-by: Dima Zavin msm: acpuclk: Limit cpu speeds available for cpufreq. Signed-off-by: Mike Chan qsd8k: scorpion: rework acpuclk code for more correctness - observe delay between standby and normal modes - always do a shot switch after exiting powerdown - always do a hop switch after the shot switch - remove obsolete/incorrect init code Signed-off-by: Brian Swetland qsd8k: acpuclk scorpion: reduce delay after scpll enable Stress testing has shown this code stable to delays as low as 10uS. Let's move from 100uS to 25uS and avoid excessive delays while still keeping plenty of margin. Signed-off-by: Brian Swetland [ARM] msm: scorpion: raise the voltage across the frequency range, 998 @ 1.3V This increases the margin across all the frequencies to be 50mV above QCT nominal up to 1.275V. Note that some values already account for some of this due to changes from HTC, so not al values in the table have been changed. Make 998Mhz run at 1.3V. These changes may be necessary to eliminate L2 cache parity errors. Change-Id: I517239bbb8ba39ab7f08a52e57f21f64e200d558 Signed-off-by: Dima Zavin [ARM] msm: scorpion: make 921Mhz and 960Mhz also run at 1.3V Change-Id: Ibdb29ad65b55a4e913537fbe6e8552e7da323dd3 Signed-off-by: Dima Zavin [ARM] msm: scorpion: properly check for requested rate == 0 The for loop check would have incorrectly chosen 0 as a valid frequency. Change-Id: I47ea2868ddcdf6d7a70db31248f32240307abcca Signed-off-by: Dima Zavin [ARM] msm: scorpion: do not use 1.3V for 900Mhz+ (back to 1.275) Qualcomm is not currently able to certify that 1.3V is safe for production due to timing concerns. Until that happens, we cannot use it for ship. Change-Id: Ibf03a5f6f6170f01ae82dd02ff442af806650f1e Signed-off-by: Dima Zavin commit 28fdad047ae320be33f56fbb17294bf6ff1c826c Author: Brian Swetland Date: Mon Jan 26 20:13:22 2009 -0800 [ARM] msm: add irq values and vic support for scorpion Signed-off-by: Brian Swetland commit 27a82d002146d231b97565b7401ba0d3af2fb737 Author: Brian Swetland Date: Mon Jan 26 20:12:07 2009 -0800 [ARM] msm: add io mapping information for qsd8x50 peripherals Signed-off-by: Brian Swetland commit 795334d6f379dd89a6c04f486aedbd07f2fb702f Author: Brian Swetland Date: Mon Jan 26 20:02:47 2009 -0800 [ARM] msm: support the scorpion version of the VIC (QSD8x50) Signed-off-by: Brian Swetland commit cce939764187703031246e93d29c2e9ce90ad0b6 Author: Dima Zavin Date: Thu Apr 2 17:57:54 2009 -0700 [ARM] msm: Cleanup duplicate clkctl struct definition in acpuclock-arm11 Signed-off-by: Dima Zavin commit e0cf6bf938b32a0402e1449419240edbaa2ab5dc Author: Brian Swetland Date: Mon Jan 26 17:23:00 2009 -0800 [ARM] msm: acpuclock.c is arm11 core specific, rename This also moves some private defines and structures into acpuclock-arm11.c to make acpuclock.h generic and make room for acpuclock-scorpion.c. Signed-off-by: Brian Swetland commit ae7a333263611be688df46ea9d3c27e9fd1e359a Author: Brian Swetland Date: Wed Mar 18 12:45:38 2009 -0700 [ARM] msm: qsd8k memory base is at 0x20000000 The memory layout is effective as of AMSS 3170+. Signed-off-by: Haley Teng Signed-off-by: Dima Zavin commit 16120cd5a6c0cbe7f4fb733b04a57c559c957968 Author: Brian Swetland Date: Mon Jan 26 16:56:46 2009 -0800 [ARM] msm: start providing per-SoC config This adds ARCH_MSM7X00A and ARCH_QSD8X50 under the overall ARCH_MSM umbrella. These allow for per-SoC configuration (currently selecting either ARCH_MSM_ARM11 or ARCH_MSM_SCORPION) to indicate which core and core peripherals are present in the SoC. Signed-off-by: Brian Swetland commit 6f14f052973259838b4a7712e46e9fbbae3549b4 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 Change-Id: I0a53fd544742191ebf6fd14c9b5feac154a11371 Signed-off-by: Dima Zavin commit 4d57cbf17e381f642301b95066569208f186c7d4 Author: Arve Hj��nnev��g Date: Fri Dec 11 21:16:18 2009 -0800 [ARM] msm: acpuclock: Fix cpu ramp down and up around power collapse. Change-Id: I2e43df297489ed5a4d533beb0a92713d21864df8 Signed-off-by: Arve Hj��nnev��g commit 5b752699a3affcce60a009a1988c2eacf4940698 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 de85be8138dc7e7da6c1b9931b6b79a56ab1e727 Author: Arve Hj��nnev��g Date: Thu Dec 10 00:03:36 2009 -0800 [ARM] msm: trout: Pass wakeup irq to serial debugger Change-Id: I695226bbd595d35ed6f9e29f09d13741c345de76 commit c106106e166b1d9e75df9bd14948f7cb23b0c72d Author: Arve Hj��nnev��g Date: Wed Jan 6 17:51:38 2010 -0800 [ARM] msm: sapphire: Don't use gpio_configure. Change-Id: I35958f865e5fad6b56e5a00648d5ea78ffc89f68 Signed-off-by: Arve Hj��nnev��g commit f22a91d71b0113eff5b0bc7b74c0fbae813a36d8 Author: Arve Hj��nnev��g Date: Fri Dec 18 16:30:07 2009 -0800 board-sapphire: Set mux to debug uart Change-Id: I934b9672958dab6805b54fba901fd59b34f12f72 commit 987329dacaa05a7c458db93aec69bdd395430229 Author: Arve Hj��nnev��g Date: Thu Dec 10 22:04:27 2009 -0800 serial debug fixes Change-Id: If15c0d0aedbf8ad443bb9c8d2dd47b109d593eb2 commit 49a4ea2fcb1243eec534afc9ebf296db5d746552 Author: Arve Hj��nnev��g Date: Wed Dec 9 23:26:59 2009 -0800 board-sapphire-mmc from 2.6.29 Change-Id: I74c9d09c243536856f88188d71bc5cd9b7917851 commit 588769a0e5b02c595228406d9b3fd7f8335c1239 Author: Arve Hj��nnev��g Date: Wed Dec 9 22:46:11 2009 -0800 board-sapphire-panel.c from 2.6.29 Change-Id: I28f707096722c744a2d6818b08eeb885e70a2452 commit 163838134154208244f6efa69aaef1a97390b46e Author: Arve Hj��nnev��g Date: Wed Dec 9 22:45:03 2009 -0800 hack: mmc files from 2.6.29 Change-Id: I5f1791108fb0577b6d520e2d357b32aef9498510 commit ae7b2f52934e37e94b3de04727f0aba931433228 Author: Arve Hj��nnev��g Date: Wed Dec 9 22:40:24 2009 -0800 board-trout-panel from android-2.6.29 Change-Id: I16c9290dfa3dd0bf7825d14445e7e7767c57756d commit d1f9f416d2f7d9763108316fe4e988bbc2d87cfd Author: Arve Hj��nnev��g Date: Mon Dec 14 22:20:03 2009 -0800 [ARM] msm_fb: Fix framebuffer console Don't allow non panning updates to bypass the wait for the panel to turn on. Change-Id: I32eedf37dd1b0d34cdcad782027b635e5c65f691 commit 678d53e52b25716eebaeabac1795360bf6da2d97 Author: Arve Hj��nnev��g Date: Wed Dec 9 21:49:16 2009 -0800 add msm_fb.h from android-msm-2.6.29 Change-Id: I2bfbd1b8b2157357fee2332333e5dfbe4b525fbf commit 5c3b91d895b8a856a81912649dc03888a0605abc Author: Rebecca Schultz Date: Wed Nov 19 16:24:43 2008 -0800 [ARM] msm: Adding display drivers. Adds mddi, mdp and msm_fb drivers. Change-Id: I6da4c81f2cbc2777f1c99808d07fdf4256e42c84 Signed-off-by: Rebecca Schultz commit c130b857d76601f47f1a234e839f12d32873fb6f Author: Arve Hj��nnev��g Date: Wed Dec 9 21:55:17 2009 -0800 asm/mach/mmc.h is gone Change-Id: Ieac3299a24db23afb2b4e5a3e5d904b585850931 commit 8cd1abcc56749a43da9d230d1b177b82e174d25b Author: Chia-chi Yeh Date: Tue Dec 8 02:32:59 2009 +0800 [ARM] msm: clock: initialize the hlist correctly. Signed-off-by: Chia-chi Yeh commit 33286e9cdf2f6ffb487694ebed643c58d81b4679 Author: Arve Hj��nnev��g Date: Tue Oct 20 17:29:24 2009 -0700 [ARM] msm: clock: Use hlist instead of list Change-Id: Id0bb9f2a6fe73ef05a818e7e5bd627c0052493b0 Signed-off-by: Arve Hj��nnev��g commit e9e34d7fb41e05569d4def489670e72110447f0f Author: Mike Chan Date: Mon Nov 16 13:23:40 2009 -0800 [ARM] msm: pm: msm_sleep() hooks for clock.c Signed-off-by: Mike Chan commit ca2c476a44e125af873137329e4fba65bddb0f4a Author: Kuma Chang Date: Thu Nov 12 16:41:01 2009 -0800 [ARM] msm: qdsp5: add a NULL-pointer check on module->ops->event Signed-off-by: Iliyan Malchev commit 6e96e920205f4a8f7f06040023ecafcb0606835d Author: Mike Chan Date: Fri Nov 13 17:15:22 2009 -0800 [ARM] msm: acpuclock: Do not ramp up when going to power collapse/wfi Power collapse and wfi speeds specified in the board files are the fastest speeds one can go before entering the mode. If the acpu is running at a slower rate do not clock up, this can cause PLL depencency issues. Signed-off-by: Mike Chan commit 19b0b061d05f61dd6b54cf89038ee3b6a9a28ea2 Author: San Mehat Date: Mon Nov 2 10:32:46 2009 -0800 [ARM] mach: htc_pwrsink: Remove stub printk Signed-off-by: San Mehat commit 300de51d2836e4e0f7eb77db4ea49476c3cc87cf Author: Arve Hj��nnev��g Date: Thu Dec 10 17:13:01 2009 -0800 msm_serial_hs: fix to build on 2.6.32 msm_serial_hs: fix lockup on 2.6.32 commit 426f2925f3f430fff2c02124734f060817d9578c Author: Nick Pelly Date: Fri Nov 20 13:31:36 2009 -0800 [ARM] msm: msm_serial_hs: Improve RX flush procedure during clock off sequence. Clock off is requested by msm_hs_request_clock_off. The new procedure is: 1) Immediately deassert RTS to prevent new RX data. 2) Wait for the TX pipeline to flush (TXLEV, TXEMT). 3) Issue a FORCE_STALE_EVENT command, and flush on RXSTALE. 5) After this flush completes, disable DLINK and flush one more time (discarding data). 6) Finally clock off the uart. The key changes are to disable DLINK - which fixes the datamover lockup, and the issuing of the FORCE_STALE_EVENT command - which prevents RX data loss during clock off sequence. Signed-off-by: Nick Pelly commit 91e2405742be7b92519d2e2345740079acbe380e Author: Nick Pelly Date: Wed Nov 4 20:30:42 2009 -0800 [ARM] msm: msm_serial_hs: Do not allow suspend while BT DMA could be active. Signed-off-by: Nick Pelly commit d4ba09dfe43c63f814e5586ebbabb0644c62b732 Author: Nick Pelly Date: Thu Oct 29 19:23:36 2009 -0700 [ARM] msm: msm_serial_hs: Wait for RX fifo to empty before clocking off. This is needed if we clock off quickly after RX. Signed-off-by: Nick Pelly commit f71fecced91e11916536c204dc9f816938448465 Author: Nick Pelly Date: Wed Oct 28 18:47:05 2009 -0700 [ARM] msm: msm_serial_hs: Improve low power mode support. Move the request_clock_off()/on() into the header. Add exit_lpm_cb callback to help exit low power mode. Clean up RTS / RFR handling. Deactivate RFR when clocking off the uart unless RX wakeup lpm is being used. Signed-off-by: Nick Pelly commit 8bd9ead71e5a51fca9af6e74431ba479a8795fc2 Author: Nick Pelly Date: Wed Oct 28 18:55:53 2009 -0700 [ARM] msm: trout: Update msm_serial_hs platform data for new wakeup irq API. Signed-off-by: Nick Pelly commit 2ded4d487fac25d0ef8afed9af38c5f1b5237563 Author: Nick Pelly Date: Wed Oct 28 18:55:15 2009 -0700 [ARM] msm: sapphire: Update msm_serial_hs platform data for new wakeup irq API. Signed-off-by: Nick Pelly commit c5c38f898746c7b45b7b897290f7a04a5edc2d08 Author: Nick Pelly Date: Tue Oct 27 16:19:49 2009 -0700 [ARM] msm: msm_serial_hs: Rename wakeup to rx_wakeup. Preparation for a new low power wakeup mode. Signed-off-by: Nick Pelly commit 9762311aecce3158c9cbeab3f7d827fe180313fc Author: Iliyan Malchev Date: Tue Jan 26 15:42:15 2010 -0800 [ARM] msm: mahimahi_defconfig: enable CONFIG_MEDIA_SUPPORT This config option is necessary to compile msm_camera. Signed-off-by: Iliyan Malchev commit 6a7b9e67e0e50d0811151feeca198a4f0c55fc22 Author: Mike Lockwood Date: Tue Jan 12 14:29:53 2010 -0800 [ARM] msm: defconfig: Switch from USB function to USB gadget drivers. Change-Id: I5c1974484224df3ec1951ed7ff9f5357c4fdcd58 Signed-off-by: Mike Lockwood commit 2a1c1cb2b02866060fd235466d07992df47911fc Author: Mike Chan Date: Thu Oct 29 12:25:39 2009 -0700 [ARM] msm: cpufreq: Kconfig cleanup, less msm specific options Signed-off-by: Mike Chan commit 7460f917c9f116183729984dfc6bdb10abd83dc2 Author: Mike Chan Date: Wed Oct 28 21:14:12 2009 -0700 msm: cpufreq: Do not call a cpu transition if selecting the same speed. Signed-off-by: Mike Chan commit 47f119e7c7407c6372ae76a5ced9581135419932 Author: Arve Hj��nnev��g Date: Sun Sep 20 16:58:47 2009 -0700 [ARM] msm: smd_rpcrouter: Fix a problem where the rtc read on suspend could trigger a wakeup. Add a suspend handler that delays suspend until the rpcrouter worker thread blocks. Signed-off-by: Arve Hj��nnev��g commit 3db9f8f4c57269e679ac8b0b97c9349b77640fc5 Author: Mike Chan Date: Fri Oct 16 14:30:13 2009 -0700 msm: cpufreq: Export scaling_available_frequencies attr in /sys Signed-off-by: Mike Chan commit dd21c86306f24087fd9f4a42e19f74657abc2ff1 Author: Brian Swetland Date: Tue Sep 15 13:50:31 2009 -0700 [ARM] msm: move fixed iomappings and VMALLOC_END to 0xF8000000 This increases the total virtual footprint available for the 1:1 physical map and the vmalloc space from 256MB to 896MB, which should much improve things for hardware with 256-512MB of ram, discontiguous ram banks, etc. Signed-off-by: Brian Swetland Signed-off-by: Dima Zavin commit fb2e00eb27f1ff8ebb380da2451ae81534e9d58a Author: Dima Zavin Date: Tue Sep 15 14:16:20 2009 -0700 [ARM] msm: Remove unused regions that were tagged as remapped in iomap.h These defines were marked as if iomem was being reserved for them at initialization, but they were not actually in the msm_io_desc list in io.c, and no users for these defines exist. Signed-off-by: Dima Zavin commit 0be857c1e55e312adcea1786a53e9c635f1775ee Author: Iliyan Malchev Date: Tue Feb 9 21:14:26 2010 -0800 [ARM] msm: update iomap for vfe commit 563e9eb0928a14d7a5ed7953abbcaa72133710c7 Author: Iliyan Malchev Date: Tue Feb 9 21:13:43 2010 -0800 [ARM] msm: board file updates for camera commit c405556901e711b2e9ab17ec8963a0609c4afebd Author: Brian Swetland Date: Tue Feb 9 20:59:48 2010 -0800 [ARM] msm: camera: 8k support and bugfixes [ARM] msm: camera: fix memory corruptions and add checks on copy_from_user Signed-off-by: Iliyan Malchev [ARM] msm: camera: do an AXI reset together with the VFE reset Signed-off-by: Iliyan Malchev [ARM] msm: camera: s5k3e2fx-sensor updates Signed-off-by: Iliyan Malchev [ARM] msm: camera: add lookup for AF buffers Signed-off-by: Iliyan Malchev [ARM] msm: camera: s5k3e2fx: add suspend/resume Signed-off-by: Iliyan Malchev [ARM] msm: camera: add Code-Aurora license and GPL boilerplate Signed-off-by: Iliyan Malchev [ARM] msm: camera: add more support for postprocessing Signed-off-by: Iliyan Malchev [ARM] msm: camera: replace flash_type with a flash function Replace the old flash_type with a pointer to a function that takes in a flash level from [0, num_flash_levels). Signed-off-by: Iliyan Malchev [ARM] msm: make msm_camera_legacy_device_platform_data always available Signed-off-by: Iliyan Malchev [ARM] msm: add a need_suspend flag to the camera-sensor info struct When this flag is set in the board file, then the sensor's suspend/resume code is allowed to run. Otherwise, suspend/resume is a no-op. Signed-off-by: Iliyan Malchev [ARM] msm: camera: s5k3e2fx: check suspend flag Signed-off-by: Iliyan Malchev [ARM] msm: camera: msm8k updates Signed-off-by: Iliyan Malchev [ARM] msm: camera: use the camera_flash function from the board file Also, remove CONFIG_MSM_CAMERA_FLASH. This is now configured automarically via the board file. Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix a memory leak in msm_vfe8x.c Signed-off-by: Iliyan Malchev [ARM] msm: camera: s5k3e2fx: color tuning update, AE flashing fix Signed-off-by: Iliyan Malchev [ARM] msm8k: camera: do not crash when frame skipping is disabled Signed-off-by: Iliyan Malchev [ARM] msm: camera: add GET_SENSOR_INFO to the control ioctl Signed-off-by: Iliyan Malchev [ARM] msm: camera: run through Lindent, make checkpatch happy Signed-off-by: Iliyan Malchev [ARM] qsq8k: camera: fix the return value of vfe_get_af_pingpong_status Signed-off-by: Iliyan Malchev [ARM] msm_camera: clean up msm_config_vfe Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: clean up of msm_vfe8x.c -- in vfe_config(), structures that can be local in scope were being allocated on the heap. -- added a pr_err() in vfe_release -- misc cleanup Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: cleanup of msm_vfe8x_proc.c -- change error-related CDBG to pr_err -- simplify vfe_get_awb_pingpong_status -- remove dead code -- rewrite the following functions to not return structs: vfe_parse_interrupt_status vfe_get_asf_frame_info vfe_get_demosaic_frame_info vfe_get_camif_status vfe_get_performance_monitor_data -- in vfe_send_output1_msg, replace memmove with memcpy -- removed unnecessary spinlocks Signed-off-by: Iliyan Malchev [ARM] msm: camera: clean up printks Signed-off-by: Iliyan Malchev [ARM] msm: camera: add vfe_free to complement vfe_alloc Signed-off-by: Iliyan Malchev [ARM] msm: s5k3e2fx: add retries for i2c transfers Signed-off-by: Iliyan Malchev [ARM] qsd8k: stub out msm_camio_vfe_blk_beset Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix crashes on interrupted syscalls Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: cleanup of msm_vfe8x and msm_vfe8x_proc -- remove unnecessary mutexes and spinlocks -- eliminate unnecessary allocations -- eliminated allocations made by the vfe interrupt in favor of a statically-allocated ring buffer. -- use vfe_alloc for all allocations made by the VFE tasklet -- combined extdata and ctrl in one kzalloc -- rewrite vfe_proc_ops to use a table of callbacks and event mappings Signed-off-by: Iliyan Malchev [ARM] msm: camera: add a gfp mask to vfe_alloc and vfe_resp Signed-off-by: Iliyan Malchev [ARM] msm: camera: add on_heap field to msm_queue_cmd Signed-off-by: Iliyan Malchev [ARM] msm: camera: more cleanup -- renamed msm_sync::{frame, stats} to pmem_frames & pmem_stats -- keep track of the max length of prev_frame_q and msg_event_q -- make pict_pp a uint32_t to reflect usage from userspace -- in vfe_sync, preview and snapshot frames were being duplicated on the heap and then sent to both the config thread and the frame/control thread; the config thread would in turn take its copy of the frame or snapshot frames and discard them -- simplified and cleaned up postprocessing -- no need for pp_sync_flag -- send frames and snapshots to the config thread ONLY when PP_PREV, PP_SNAP, or PP_RAW_SNAP are enabled. -- allow only one type of PP at a time: you can't have PP_PREV and PP_SNAP together for example; userspace does not use the more than one PP at a time -- added msm_divert_frame and msm_divert_snapshot to reduce indentation in msm_get_stats -- renamed MSM_CAM_IOCTL_PICT_PP and MSM_CAM_IOCTL_PICT_PP_DONE to just MSM_CAM_IOCTL_PP and MSM_CAM_IOCTL_PP_DONE, since they apply to post- processing for preview as well as snapshot -- added msm_deliver_frame and msm_deliver_snapshot, which are used from vfe_sync and msm_pp_release to deliver preview and snapshot frames respectively -- in msm_pp_release, added a check for length of user-space allocation request limiting it to PAGE_SIZE Signed-off-by: Iliyan Malchev [ARM] msm: camera: eliminate kmalloc for MSM_CAM_IOCTL_CTRL_COMMAND packets Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: enable vfe_process_error_irq Signed-off-by: Iliyan Malchev [ARM] msm: s5k3e2fx: fix for low-light VFE CAMIF errors, cleanup Replaced all mdelay()s over 10ms with msleep()s. Signed-off-by: Iliyan Malchev [ARM] msm8k: fix camera-driver Makefile qsd8k: camera: request min AXI bus frequency of 128MHz Signed-off-by: Iliyan Malchev [ARM] msm: camera: cleanup; send preview and snapshot notifications to config CLEANUP: -- renamed pict_pp to pp_mask in msm_sync -- simplified MSM_CAM_IOCTL_PP_DONE to just pass the PP mask of what it wants done: now we use pp_prev and pp_snap to remember the preview and snapshot frames being diverted for posprocessing. The old API required userspace to remember the frame and pass it back to the kernel. -- added functions and macros to handle msm_device_queue: msm_queue_init msm_queue_drain /* replaces MSM_DRAIN_QUEUE{,_NOSYNC} */ msm_enqueue msm_dequeue -- new structure msm_device_queue that combines: list of msm_queue_cmd spinlock max and len counters wait queue -- use the new structure to replace: msg_event_q, msg_event_q_{lock,max,len}, msg_event_wait prev_frame_q, prev_frame_q_{lock,max,len,wait} pict_frame_q, pict_frame_q_lock, pict_frame_wait msm_control_device_queue CLONING FRAME AND SNAPSHOT TO CONFIG: The changes below re-enable sending frame and snapshot qcmd instances to config in addition to the frame/snapshot threads. This was implemented previously but the implementation was wasteful of memory. -- since msm_queue_cmd can be on more than one queue at a time (e.g., frame and config or snapshot and config), msm_queue_cmd has different list_head entries for each queue. Each call to msm_queue(), msm_dequeue(), and msm_queue_drain() uses the right list_head. -- msm_queue_cmd::on_heap, when non-zero, is now a reference counter; we use it to make sure we do not prematurely kfree() a qcmd in those cases where it is on two or more msm_device_queues. -- Added config ioctl MSM_CAM_IOCTL_ENABLE_OUTPUT_IND, which enables routing of preview frames to the config thread; by default, the flag is disabled POSTPROCESSING: -- add parameter clear_active to msm_pmem_frame_ptov_lookup() to control whether it clears the active flag of a preview or snapshot frame. This helps with PP_PREV postprocessing by making sure we do not mark a region as inactive too early. FIXES: -- in msm_control, remove the qcmd packet from the event_q if wait_event_interruptible_timeout fails. Signed-off-by: Iliyan Malchev [ARM] msm: camera: remove _t from variable names Signed-off-by: Iliyan Malchev [ARM] msm: camera: add cache invalidation for snapshot -- change msm_pmem_frame_ptov_lookup() to take a msm_pmem_region** instead of a msm_pmem_info*; -- add a kvaddr member to msm_pmem_region so that we can keep track of the kernel addresses of pmem pools; -- make sure that pmem registrations start on a page boundary; -- in msm_get_pic(), invalidate the cache for the (cacheline-aligned) pmem subregion corresponding to the snapshot being passed to userspace. Signed-off-by: Iliyan Malchev [ARM] msm: rename msm_pmem_info::active to vfe_can_write The meaning of "active" is very confusing. vfe_can_write means that the VFE block is allowed to DMA into that region of pmem. Signed-off-by: Iliyan Malchev [ARM] qsd8k: apparent fix for spurious VFE resets Signed-off-by: Iliyan Malchev [ARM] msm: camera: s5k3e2fx sensor adjustments -- adjust pclk to 72Mhz to reduce noise -- AF fine tune: -- reduce fps to reduce lens damping -- increase delay for lens to become stable -- #define REG_ANALOGUE_GAIN_CODE_GLOBAL_LSB_VALUE to keep track more easily of registers necessary for initial-gain tuning -- #define REG_PLL_MULTIPLIER_LSB_VALUE to make PCLK configuration easier -- make video_config general set mode function call -- remove unnecessary flags -- remove redundant init AF -- remove unnecessary mutex -- make more readable Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: fix for spurious VFE resets The problem is that if we call clk_set_rate() on vfe_clk after we enable that clock, it becomes unstable. This overrides commit 372e0000e6e61be65e5809801fd396803502347f. Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: add pr_err() on failed copy_from_user Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: fix spinlocks Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix a memory leak on msm_open_control error Signed-off-by: Iliyan Malchev [ARM] msm: camera: replace the idle lock with a suspend lock. Since the camera driver does not implement suspend and resume, we need to prevent suspend while the camera is in use. Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: initialize irqs_lock Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix to build on 2.6.32 Change-Id: Ia4e5cd9d9f1e9d8faed943656cb8522bf9ad4408 [ARM] msm: camera: fix build on 2.6.32 Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix return value of ioctl MSM_CAM_IOCTL_ENABLE_OUTPUT_IND Signed-off-by: Iliyan Malchev [ARM] qsd8k: camera: use epoch1 interrupt to control the flash more precisely We use the epoch1 interrupt to control flash timing in the kernel. The purpose is to reduce flash duration as much as possible. Userspace has no way to control the exact timing, but the VFE can do it. Flash should cover the exposure period of each line. Currently we skip a frame during snapshot, so snapshot uses two frames. We want to fire the flash in the middle of the first frame when the exposure time is short. We are using rolling shutter. It means flash duration = readout time + exposure time. We have to fire the flash earlier to cover the exposure time of the first line of the second frame. The epoch1 interrupt allows us to set a line index and we will get an interrupt when VFE reaches the line. VFE will fire the flash in high mode when it gets the epoch1 interrupt. VFE will turn off the flash after snapshot is done. Signed-off-by: Iliyan Malchev commit 90692cd6c735f1403dde9439e1d9c2a1a633f4bd Author: Iliyan Malchev Date: Mon Sep 14 15:18:51 2009 -0700 [ARM] msm: hw3d: stub out functions when CONFIG_MSM_HW3D not defined Signed-off-by: Iliyan Malchev commit 7941175bd215f4e1ff04fbe496b2a74e5a3cf580 Author: Mike Lockwood Date: Fri Sep 11 11:46:08 2009 -0400 [ARM] msm: htc: Avoid usb_mass_storage_platform_data symbol collision. Signed-off-by: Mike Lockwood commit be36bc15f8ebf73096c00cb8ce44be32e3218dfe Author: Iliyan Malchev Date: Mon Jun 1 17:04:02 2009 -0700 [ARM] msm: defconfig: Regenerate defconfig [ARM] msm: enable new camera implementation Signed-off-by: Iliyan Malchev [ARM] msm: Disable some debug options. Signed-off-by: Arve Hj��nnev��g [ARM] configs: Update msm_defconfig to enable ppp related options. -- enabled PPPOLAC for L2TP VPN connection. -- enabled PPP_MPPE for PPTP VPN connection. Signed-off-by: Chung-yih Wang config: Enable PPPoPNS for VPN and remove unused IPsec options. msm: defconfig: Enable CONFIG_MMC_BLOCK_DEFERRED_RESUME Signed-off-by: San Mehat [ARM] msm: defconfig: Enable IPV6 in defconfig Signed-off-by: San Mehat [ARM] defconfig: msm_defconfig: Enable various debug options + disable swap Signed-off-by: San Mehat [ARM] defconfig: msm_defconfig: Enable cpu_freq_stat Signed-off-by: Mike Chan commit da29adda978bcdfcf5b44604c8e809ccfcfe3ed4 Author: San Mehat Date: Tue Sep 1 14:01:11 2009 -0700 [ARM] mach-msm: nand: Add Virtual kpanic mtd partition support. Adds an option to snag a portion of a specified partition into a virtual partition named 'kpanic' Useful for platforms which do not have a kpanic partition but want to take advantage of CONFIG_APANIC logging. As this is not a real nand partition, both the snagged and new partitions should be erased when switching to/from a kernel with this option enabled/disabled. **** WARNING **** DO NOT enable if you are using a Recovery/OTA scheme in which the recovery kernel needs to access the partition you are snagging from. If you do not heed this warning, you may end up with a corrupted OTA image and there be dragons. Just don't do it. **** WARNING **** Signed-off-by: San Mehat commit 54075869c37fce2d78219763752897e9eaf491e3 Author: Mike Chan Date: Fri Aug 21 16:28:17 2009 -0700 [ARM] msm: smd_rpc: Fix wakelock leak for interrupted rpc call/reply. Discard incoming packets when rpc_call_reply is not expecting a reply. Always process for server. Signed-off-by: Mike Chan commit ef6c34d85244d8f0237a35258ad90f87009f174a Author: Dima Zavin Date: Sat Sep 19 02:39:33 2009 -0700 [ARM] video: mdp: add flag for fg-premultiplied alpha blend Signed-off-by: Dima Zavin commit c7a2ed82909a9240f0e5f1e34fd3ca3a07cc31bf Author: Arve Hj��nnev��g Date: Fri Apr 17 18:26:51 2009 -0700 [ARM] msm: mdp: fix for 2.6.32 Signed-off-by: Arve Hj��nnev��g commit 437fb257d952c0d71aa8904c9b2e0fc224152447 Author: Dima Zavin Date: Fri Aug 14 18:10:06 2009 -0700 [ARM] msm: mdp: Set the correct pack pattern for XRGB/ARGB Signed-off-by: Dima Zavin commit 8b2f9b14ef727741a074099a40e2914e0c73a659 Author: Dima Zavin Date: Fri Aug 14 16:51:59 2009 -0700 [ARM] msm: mdp: Add support for RGBX 8888 image format. Signed-off-by: Dima Zavin commit a9eecf8dbbc243b9e5d368267fb3fa8ade272c50 Author: Dima Zavin Date: Wed Aug 12 23:15:05 2009 -0700 [ARM] msm: hw3d: Don't reset client_file until release time This addresses a potential problem where the current client started an MDP blit operation, and then got revoked before the blit has finished. The new client should have to wait until the MDP is done, which will fput the current client file. Signed-off-by: Dima Zavin commit 15c0583db80e527ba0cb4455e4f52ed19977174b Author: Dima Zavin Date: Wed Aug 12 17:17:45 2009 -0700 [ARM] msm: hw3d: Clean up the interface to get file from fd Signed-off-by: Dima Zavin commit f59883f8f96558bcb4a0578bc7696054b5636bed Author: Dima Zavin Date: Wed Aug 12 16:41:43 2009 -0700 [ARM] video: msm: mdp: Make put_img operate on one file at a time Signed-off-by: Dima Zavin commit 441abbf71b3f850f281d843be8894a03238dc029 Author: Dima Zavin Date: Tue Aug 4 23:48:12 2009 -0700 [ARM] video: msmfb: Add support for using msm_hw3d fds for blits Signed-off-by: Dima Zavin commit 19ed1966109fecfa3c73458279155db03b5d509f Author: Dima Zavin Date: Thu Jul 9 16:32:01 2009 -0700 video: msmfb: Put the partial update magic value into the fix_screen struct. This can then be tested by userspace to see if the capability is supported. Userspace cannot rely on that value being left in var_screen, since userspace itself can change it. Signed-off-by: Dima Zavin commit 4e4f824a5920680af74450fba84d9a085c0583f0 Author: Dima Zavin Date: Mon Jul 6 16:29:18 2009 -0700 [ARM] msm: change the hw3d driver to let appications directly map the gpu If another user has control of the device, open() will attempt to revoke the gpu by releasing a blocked "wait for revoke" ioctl, if any. If a grace period expires and the gpu is still not relased, the application is SIGKILLed. On suspend, the same approach is applied to make the application release the gpu so that hw can be put into low power mode. Signed-off-by: Dima Zavin commit bb98e87f5bd5ede3255c78cd264e9f54441bfe7b Author: Dima Zavin Date: Fri Aug 7 10:53:18 2009 -0700 [ARM] msm: Remove hw3d config option. Signed-off-by: Dima Zavin commit 665a7ccf0036068fac78eeb26edeff51f68a7f3a Author: solomon Date: Wed Jul 15 04:06:24 2009 +0800 [ARM] msm: sapphire: Update Novatek client detect and Sharp panel init. This patch does the following: 1. Add retrial method for panel ID detection with nt35399 MDDI client and treat as a Sharp is still fails. 2. Remove the test mode of sharp panel with Novatek MDDI client 3. To avoid blink of sharp panel after resume. 4. Change FTE postion of sharp panel to 0x80. (Tearing issue) Signed-off-by: Eric Olsen commit 89a247802f934470d0ff67bf1c2abef150d5fee7 Author: Thomas Tsai Date: Fri Jul 10 00:17:55 2009 +0800 [ARM] msm: sapphire: Add pull down to sharp panel mddi power sequence Without this patch, leakage current occurs when the mddi panel is turned off Signed-off-by: Thomas Tsai Signed-off-by: Rebecca Schultz Zavin Signed-off-by: Eric Olsen commit 38ca8ff5b04090783cc3cd009312343b8780f325 Author: Nita Huang Date: Mon May 4 21:58:09 2009 +0800 msm: sapphire: add sharp panel Noveteck NT35399 driver ic setting Signed-off-by: San Mehat Signed-off-by: Eric Olsen commit e2821c8a7925c1e2ca18444f7ad9ead47c592821 Author: Iliyan Malchev Date: Wed Jul 15 19:53:32 2009 -0700 [ARM] msm: adsp: audio drivers: fix out-of-bounds array references Signed-off-by: Iliyan Malchev commit 78bc5366795a8d7b31f9d6978c2f981646548f78 Author: stevel Date: Tue Jun 16 15:27:45 2009 -0400 [ARM] msm: usb: gadget: Configure endpoints properly in msm72k_enable Fixes a problem with full-speed USB support. Signed-off-by: Mike Lockwood commit 3660462941d0008b19add5b376374732c3825add Author: Mike Lockwood Date: Tue Jun 16 11:03:51 2009 -0400 [ARM] msm: htc: Remove HTC specific connect notification from msm_hsusb driver Use a callback function in the msm_hsusb platform data instead. Add USB connect notification to msm72k_udc gadget driver. Signed-off-by: Mike Lockwood commit 3f53e14eca904b59251cb0c6b442eff11567c522 Author: Brian Swetland Date: Fri Jun 12 13:44:24 2009 -0700 msm: docs: adjust board descriptions in android.txt Signed-off-by: Brian Swetland commit 6db187f7cd8b33b7d42472034bc25c64408155d7 Author: Pavel Machek Date: Fri Jun 12 17:05:04 2009 +0200 msm: update docs for HTC Dream aka. t-mobile g1 support Improve documentation, add machine description to Kconfig, remove misleading comment. Signed-off-by: Pavel Machek commit d2e5a9383be97bd52ce5ebe22ae1f3679d12fa45 Author: Arve Hj��nnev��g Date: Thu Jun 11 18:32:43 2009 -0700 [ARM] msm: adsp: Fix heap corruption. For amss versions before 6350 the adsp driver created a lookup table from module id to module index, but used the max index instead of the max id when allocating the table. Signed-off-by: Arve Hj��nnev��g commit e9b8489b06254610b2374b3e86caae7e385e9eb3 Author: Arve Hj��nnev��g Date: Wed Jun 10 15:02:03 2009 -0700 [ARM] msm: Enable CACHE_FLUSH_RANGE_LIMIT With the default value v6_dma_flush_range will flush the entire cache if the requested range is more than 256k. Signed-off-by: Arve Hj��nnev��g commit b0edd2c8297cc22619dbf1d24798076b3dc48680 Author: Iliyan Malchev Date: Fri Jun 5 18:10:08 2009 -0700 [ARM] msm: adsp: combine old and new adsp implementation adsp.[ch] and adsp_new.[ch] are close enough, and it makes sense to combine them. The differences are featurized under CONFIG_MSM_AMSS_VERSION >= 6350 for the new adsp implementation. Signed-off-by: Iliyan Malchev commit 6c75e5c2af783b963263585485720d1fe2c1dc94 Author: Iliyan Malchev Date: Fri Jun 5 15:29:54 2009 -0700 [ARM] msm: adsp: retry msm_adsp_write() when a queue is full. Commit fee2df57284bcca209ad9cf9ab5f7cf895592b3f replaced an mdelay(1) with a udelay(1) in two places, which sped up msm_adsp_write() considerably in those cases where we did not have to wait for the DSP to get ready for a command. This had the side effect that back-to-back DSP commands can be rejected by the DSP for a given DSP module and queue number when the DSP is still busy processing the last command for that queue. This patch retries sending the command 100 times (for up to ~1ms) in such situations. Signed-off-by: Iliyan Malchev commit 5e61a5304d13325369f1e13bfb01394952320896 Author: Arve Hj��nnev��g Date: Thu Jun 4 14:57:45 2009 -0700 [ARM] msm: adsp: Fix msm_adsp_write to not call mdelay(1) Signed-off-by: Arve Hj��nnev��g commit da125b93fa1d41c5a20714e8773db93cdc932e36 Author: Brian Swetland Date: Tue Feb 9 19:10:04 2010 -0800 [ARM] mt9t013: camera support changes Signed-off-by: Iliyan Malchev commit a78dad7335a05bd3a71cc93b557673dcc60576e4 Author: Brian Swetland Date: Tue Feb 9 19:10:04 2010 -0800 [ARM] msm: board file changes for camera support Signed-off-by: Iliyan Malchev commit fdcf41e6c306335b2e27e140a1232bee0310f652 Author: Iliyan Malchev Date: Tue Feb 9 21:19:35 2010 -0800 msm: defconfig change commit 344b33120a24bc5b51eafaef473399095dbb85ea Author: Brian Swetland Date: Tue Feb 9 19:10:04 2010 -0800 [ARM] msm: camera: initial commit Signed-off-by: Iliyan Malchev [ARM] msm: add an idle wakelock to the camera driver Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix a DSP-queue reference in msm_vfe7x.c Signed-off-by: Iliyan Malchev [ARM] msm: remove unnecessary mutex from camera driver Signed-off-by: Iliyan Malchev [ARM] msm: camera: conditionalize CDBG under CONFIG_MSM_CAMERA_DEBUG -- replaced those CDBG that report errors with pr_err -- added macros to report errors when copy_{from,to}_user fails -- simplified msm_pmem_table_add()'s prototype Signed-off-by: Iliyan Malchev [ARM] msm: camera: return the correct value from __msm_get_pic Signed-off-by: Iliyan Malchev [ARM] msm: camera: simplify MSM_CAM_IOCTL_ENABLE_VFE, hook up DISABLE_VFE -- simplified camera_enable_cmd_t to include a fixed-size name field (32 chars) -- enable ioctl MSM_CAM_IOCTL_DISABLE_VFE Signed-off-by: Iliyan Malchev [ARM] msm: camera: add more checks to the pmem-lookup functions -- Added checks for failure for the following functions: msm_pmem_region_lookup, msm_pmem_frame_ptov_lookup, msm_pmem_stats_ptov_lookup, msm_pmem_frame_vtop_lookup, msm_pmem_stats_vtop_lookup -- Added explicit checks for CMD_GENERAL in several cases where vfe_config() is called -- With the exception of msm_config_vfe(), where both CMD_GENERAL and CMD_STATS_DISABLE are accepted, all other non-CMD_GENERAL are rejected as errors. Signed-off-by: Iliyan Malchev [ARM] msm: camera: add support for flash (disabled) + more fixes -- msm_camera.c: -- check for overlap in msm_pmem_table_add() -- fix a copy_to_user bug -- add MSM_CAM_IOCTL_FLASH_LED_CFG -- msm_vfe7x.c: implement vfe_7x_stop() -- renames mt9p012.c --> mt9p012_fox.c -- mt9t013 register update -- v4l2 updates Signed-off-by: Iliyan Malchev [ARM] msm: camera: split device nodes This splits /dev/msm_camera{0,1,...} into /dev/{frame,control,config}{0,1,...}, which allows us to handle the camera separately in user space from a proprietary configuration daemon, and a separate daemon for control (for snapshot, effects, etc) and receiving frames. Signed-off-by: Iliyan Malchev [ARM] msm: camera: unify mutex handling, clean up code Signed-off-by: Iliyan Malchev [ARM] msm: camera: clean up locking of queues in msm_device_t->sync Signed-off-by: Iliyan Malchev [ARM] msm: camera: reduce the number of kmallocs in frame callback -- in msm_vfe_sync(), remove one kmalloc() in the frame callback -- get rid of msm_camvfe_init() -- rename msm_vfe_phy_info --> msm_vfe_phy_info_t Signed-off-by: Iliyan Malchev [ARM] msm: camera: major cleanup -- add MSM_DRAIN_QUEUE macros and use them -- remove all enumerations from msm_camera.h -- add an ioctl to unblock the frame thread -- drain queues selectively for frame and control threads -- add sensor_cfg_data_t::max_steps, which is not used at all right now -- NOTE: sensor_cfg_data_t->max_steps is not currently used Signed-off-by: Iliyan Malchev [ARM] msm: camera: CFG_GET_AF_MAX_STEPS + mt9t013 autofocus support + cleanup -- replaced incorrect EFAULT codes with EIO and EINVAL where appropriate -- fixed some indentation -- added power-on and power-off for autofocus module on mt9t013 sensor -- this needs to be improved: power on and off only when we do AF -- removed superfluous debug from samsung sensor driver (s5k3e2fx) -- in msm_camera.c, commented out error-recovery code in __msm_control -- added CFG_GET_AF_MAX_STEPS support for all camera sensors Signed-off-by: Iliyan Malchev [ARM] msm: camera: ignore timeout from control thread -- ioctl()s from the control thread may time out before the config thread has a chance to react, which will bring the config thread out of sync with the control thread; the best solution for now is to ignore the timeout values. This will have the side effect that bugs in userspace in the config and control threads will cause the control thread to block forever on an ioctl(), unless interrupted by a signal. -- Remove an unnecessary copy from user space for zero-length user buffers. -- Disable msm_camera debug. Signed-off-by: Iliyan Malchev [ARM] msm: camera: allow the control node to be opened multiple times -- created new msm_control_device_t structure for control nodes -- msm_control_device points to an msm_device_t -- moved ctrl_status_q from sync_t into msm_control_device_t -- restored the timeout in msm_control -- moved MSM_CAM_IOCTL_CTRL_CMD_DONE to msm_ioctl_control -- FIXME: the v4l2 frontend -- added a resp_fd to msm_ctrl_cmd_t which the control thread sets so that the config thread knows to which control device to send a MSM_CAM_IOCTL_CTRL_CMD_DONE. Signed-off-by: Iliyan Malchev [ARM] msm: camera: add non-blocking control ioctl Signed-off-by: Iliyan Malchev [ARM] msm: sapphire: camera: fix sensor orientation Signed-off-by: Iliyan Malchev [ARM] msm: camera: move msm_camera.c and msm_v4l2.c under msm/ Signed-off-by: Iliyan Malchev [ARM] msm: camera: rename all instances of struct _t to struct -- There were a number of instances where a (non-typedef'ed) struct or enum was named foo_t instead of foo. -- There were variables that ended on _t. This patch removes the trailing _t from these names. -- Renamed the old struct mm_vfe_resp_t to struct msm_vfe_callback. This is more descriptive and avoids a name clash with the already-extant struct msm_vfe_resp. Signed-off-by: Iliyan Malchev [ARM] msm: mt9t013: fix check for maximum autoexposure value Signed-off-by: Iliyan Malchev [ARM] msm: camera: mt9t013: correct for overexposure on snapshots Signed-off-by: Iliyan Malchev [ARM] msm: camera: replace fields from msm_pmem_region with a msm_pmem_info Signed-off-by: Iliyan Malchev [ARM] msm: camera: allow MSM_CAM_IOCTL_REGISTER_PMEM to work with subranges Allow the user to register a sub-range of a pmem buffer with the camera framework. Signed-off-by: Iliyan Malchev [ARM] msm: camera: MSM_PMEM_THUMBAIL -> MSM_PMEM_THUMBNAIL Signed-off-by: Iliyan Malchev [ARM] msm: camera: fix cropping-buffer length verification Signed-off-by: Iliyan Malchev [ARM] msm: camera: msm_get_stats: return immediately on error Signed-off-by: Iliyan Malchev [ARM] msm: mt9t013: reduce frame rate to 21fps Having the frame rate fixed at ~28fps causes a lot of noise, stripping, and color issues on the 3.2M mt9t013 camera sensor. Signed-off-by: Iliyan Malchev commit 2fc4246d39e36a4e476c1682e82d62a0c7166356 Author: Iliyan Malchev Date: Wed Apr 8 13:19:18 2009 -0700 [ARM] msm: sapphire: add support for 5M camera sensor Signed-off-by: Iliyan Malchev commit e7f2948f41068e0378068cf2518f7cd718c414f3 Author: Iliyan Malchev Date: Mon Jun 1 13:02:20 2009 -0700 [ARM] msm: update defconfig commit b3dad9341b26ce6f50ca419b34a987aecf6db078 Author: Iliyan Malchev Date: Mon Jun 1 13:02:20 2009 -0700 [ARM] msm: report ADSP events #ifdef CONFIG_MSM_ADSP_REPORT_EVENTS Signed-off-by: Iliyan Malchev commit d2b59a44d3c6f52945b1a83d31681d452a98506b Author: Iliyan Malchev Date: Wed Apr 1 17:29:08 2009 -0700 [ARM] msm: AMSS >= 6350 swaps VFE_CLK and VFE_MDC_CLK Signed-off-by: Iliyan Malchev commit d050b87750135c3efc6674d836bfcebe3458cc5e Author: Iliyan Malchev Date: Mon Jun 1 13:06:05 2009 -0700 [ARM] msm: camera: defconfig change Signed-off-by: Iliyan Malchev commit 232a35ca8faaacf0eb50097cbb2dd232c4a76f06 Author: Iliyan Malchev Date: Mon Jun 1 13:06:05 2009 -0700 [ARM] msm: board file changes for camera support Signed-off-by: Iliyan Malchev commit 6b99ad155dd5524f157b54f75a5d0bfcbe2e9eb0 Author: Iliyan Malchev Date: Tue Jun 2 12:21:56 2009 -0700 [ARM] halibut: support for 6350 -- enable msm_fb -- add mt9t013 device -- add simple power supply driver -- enable fake battery device Signed-off-by: Iliyan Malchev commit 9773b0af8675ea37e96beb1f7535070ec79f012a Author: Iliyan Malchev Date: Wed Apr 22 16:26:47 2009 -0700 [ARM] msm: adsp: move struct adsp_pmem_info to msm_adsp.h Signed-off-by: Iliyan Malchev commit 2902384d89779b638a6effa56f62047d5f16270a Author: Iliyan Malchev Date: Wed May 27 19:29:13 2009 -0700 [ARM] msm: move the adsp queues into mach/msm_adsp.h Allows access to the adsp queues to code outside of arch/arm/mach-msm. Signed-off-by: Iliyan Malchev commit 1f249682875f08e6c36833525edca61ed1fd53ff Author: Iliyan Malchev Date: Wed May 27 19:34:28 2009 -0700 [ARM] msm: support for AMSS 6350 Signed-off-by: Iliyan Malchev commit 9147a19f18e5f2a56050013c8817991ce6fab118 Author: Iliyan Malchev Date: Wed May 27 22:01:38 2009 -0700 [ARM] msm: rpc_router: add support for backwards compatibility Signed-off-by: Iliyan Malchev commit 94cc75dcec52674f88590a05fa5f9ab2b3665603 Author: Mike Lockwood Date: Mon Mar 30 09:43:17 2009 -0400 [ARM] msm: htc: Fix USB serial number support with hboot 0.95.0000 Only use default USB serial number if androidboot.mode is "factory2" Signed-off-by: Mike Lockwood commit b141e0afd6f7d862de2fc91deadeef58dd0dac14 Author: Dima Zavin Date: Thu Mar 26 01:07:10 2009 -0700 [ARM] msm: sapphire: Clean up debug messages Signed-off-by: Dima Zavin commit ed26f85b234dfae0e09e16b9a3d3fc9b548f6f55 Author: Arve Hj��nnev��g Date: Thu Dec 10 16:46:29 2009 -0800 htc_pwrsink: Fix to build on 2.6.32 Change-Id: I80f71adde17b3a1a99e91055c947a419ab71ba1f commit 84231593add6d1fbacac7fb96e82860abd6a5f43 Author: Pavel Machek Date: Fri Jun 12 22:47:44 2009 +0200 msm: HTC Dream compile fixes Fix compilation of pwrsink with CONFIG_WAKELOCK disabled. Signed-off-by: Pavel Machek commit 6697e317313b22ec033ffc74fbc68954371ca533 Author: Dmitry Shmidt Date: Thu Mar 19 09:15:05 2009 -0700 [ARM] msm: sapphire: dream: pwrsink adjustments commit e7ec4fbddeaee9dfbb1a1423fe0fe9eba4e7df43 Author: Mike Lockwood Date: Tue Mar 17 21:42:33 2009 -0400 [ARM] msm: sapphire: Fix race conditions in vibrator driver. Signed-off-by: Mike Lockwood commit d88a154e9045504238bf425fd25379a2e1ef60d5 Author: Dima Zavin Date: Fri Mar 13 15:05:15 2009 -0700 [ARM] msm: Only include HTC devices for HTC specific boards. Signed-off-by: Dima Zavin commit 6ff95f06c664e3e8eb3da92ece575ce7463993c1 Author: San Mehat Date: Wed Mar 11 10:39:26 2009 -0700 [ARM] msm: sapphire: Add non-linear transform for panel brightness differences Signed-off-by: San Mehat commit 4cc7243f6f65b33374a8fe309db261b187e0cbca Author: Thomas Tsai Date: Tue Mar 10 12:34:29 2009 +0800 [ARM] msm: sapphire: Set search key to be a wakeup source. Signed-off-by: San Mehat commit a87314001ba9a6eb54fbf912f33fdf60661b9404 Author: allen_ou Date: Fri Mar 6 12:28:21 2009 +0800 [ARM] msm: sapphire: Wifi and BT share the same external osc at sapphire_wifi_power() Signed-off-by: San Mehat commit bceb6437600a36edd35a0592096dab7380a7f8f0 Author: Thomas Tsai Date: Tue Mar 3 21:03:48 2009 +0800 [ARM] msm: sapphire: new button layout : [home menu back search] for new system_rev 0x80. commit 7e6fc78c3e03c2431ceec1fe133b6eeb4de0bc7d Author: Mike Lockwood Date: Wed Feb 25 14:29:01 2009 -0500 [ARM] msm: sapphire: Fix overflow when setting LCD brightness to max value. Signed-off-by: Mike Lockwood commit f9e0c507cd87b966f9790fb54e8ef052aec0cc2d Author: Farmer Tseng Date: Tue Feb 24 12:19:54 2009 -0800 [ARM] msm: sapphire: Add 3.5mm headset mic data to h2w_data Signed-off-by: San Mehat commit b6906f295a265aa5f601a5831721edebb2129fec Author: Farmer Tseng Date: Tue Feb 24 12:18:43 2009 -0800 [ARM] msm: htc_headset: Add support for multi-function cable with 3.5mm headset Signed-off-by: San Mehat commit 1c93e6bb4b799fef072f37654a81b67d8cd1cf81 Author: Nick Pelly Date: Thu Apr 23 18:18:11 2009 -0700 [ARM] msm: Clean up trout and sapphire rfkill drivers. Use rfkill_set_default() instead of private rfkill_switch_all(). Add remove path. Misc cleanup. Build on 2.6.32 Don't use gpio_configure. Signed-off-by: Arve Hj��nnev��g commit cfbc3bd4ac1f9ba7c586feb185ddc0e35ab7f14f Author: Arve Hj��nnev��g Date: Mon Mar 23 19:27:45 2009 -0700 [ARM] msm: smd_rpcrouter: Hold a wakelock while while reading a packet, and while packets are queued. Signed-off-by: Arve Hj��nnev��g commit 4a01be1f435ca26f83700d590737ae92f5405bd5 Author: Arve Hj��nnev��g Date: Mon Mar 23 19:24:56 2009 -0700 [ARM] msm: smd_rpcrouter_servers: Hold a wakelock while calling rpc_call. Signed-off-by: Arve Hj��nnev��g commit 0cb42416ed3d179c685a6ab57f83d895671a3321 Author: Arve Hj��nnev��g Date: Mon Mar 23 19:17:14 2009 -0700 [ARM] msm: smd_tty: Lock a wakelock for half a second when receiving data. Signed-off-by: Arve Hj��nnev��g commit 13979744d759443bd748c2564c1d1eebf93ce9aa Author: San Mehat Date: Mon Mar 2 09:25:58 2009 -0800 rtc: msm_rtc: Conditionalize some debugging Signed-off-by: San Mehat commit 27f4873f50a28b548c864442fc06cf36ceff9934 Author: San Mehat Date: Thu Feb 26 11:01:58 2009 -0800 [ARM] msm: snd: Checking the device number is no longer required Signed-off-by: San Mehat commit fab10b8f7485c4ce2fbd7ff3b519848032d4dd34 Author: Mike Chan Date: Mon Jan 5 23:00:02 2009 -0800 [ARM] msm: acpuclock: Enable PLLs of stepping freqs when necessary. Signed-off-by: Mike Chan commit f70f2561101111b2e99bf0769f4b608f603c6709 Author: Mike Chan Date: Tue Jan 6 17:09:30 2009 -0700 [ARM] msm: Move cpufreq code from acpuclk.c to cpufreq.c The acpuclk.c has function calls used to notify the cpufreq framework when the acpuclk frequency is changed. These notifications are cpufreq specific and independent of acpu clk. Signed-off-by: Mike Chan commit 21946e8bde16ffa7e42fe32f50a848ea84785e81 Author: Saravana Kannan Date: Mon Dec 22 20:24:17 2008 -0800 [ARM] msm: acpuclock: Couple minimum AXI freq to the current CPU freq. This patch comes from qualcomm with some minor changes by mike@android.com. Signed-off-by: Mike Chan commit 631c95f01a0d13ee2d27ca67b8be1d174fe3479c Author: Thomas Tsai Date: Wed Feb 18 16:16:17 2009 +0800 [ARM] msm: sapphire: Add support for button backlight. Signed-off-by: San Mehat commit e08d9ccb15627096063bb1aa2f3aa1840694f159 Author: Farmer Tseng Date: Mon Feb 23 17:55:30 2009 +0800 [ARM] msm: sapphire: Fix touchscreen power on/off sequence. Signed-off-by: Farmer Tseng Signed-off-by: San Mehat commit 3749af01cd7189f7099f68f206e7acd856c276eb Author: Mike Lockwood Date: Sat Feb 21 16:24:31 2009 -0500 [ARM] asm: trout: remove duplicate code from board-trout.c pmem, adsp, camera, gpu0, gpu1 and ram_console platform devices are now initialized in devices_htc.c Signed-off-by: Mike Lockwood commit 3793fe597d64d04f3abe3edee56aa8253dda130a Author: Steve Muckle Date: Fri Dec 5 17:03:15 2008 -0500 [ARM] msm: make clkctl speed struct internal The clkctl_acpu_speed structure is not used outside the acpuclock implementation. commit 60adc08970e51ffbe4cabe100debde2b9b7d5c24 Author: Mike Lockwood Date: Fri Feb 20 15:56:06 2009 -0500 [ARM] msm: htc: Clean up USB support in trout and sapphire board files Signed-off-by: Mike Lockwood commit 1b0f376017e7dce64d060c950b8954e11620ad6a Author: Mike Lockwood Date: Tue Feb 17 21:58:54 2009 -0500 [ARM] msm: sapphire: Fix rounding in sapphire_set_backlight_level Previously all values less 22 turned the backlight completely off Now 0 is off and values 1 - 21 are the lowest dim value Signed-off-by: Mike Lockwood commit 4c1dd167534dee78472165e531169c8238af9199 Author: San Mehat Date: Wed Feb 18 09:16:50 2009 -0800 [ARM] sapphire: Initial import of Sapphire board support Signed-off-by: Thomas Tsai Signed-off-by: San Mehat [ARM] msm: sapphire: gpio: Initialization should be postcore_init, not arch_init Signed-off-by: San Mehat commit e74ece933266f68f789a0b55dccdccc33da0ad4b Author: Thomas Tsai Date: Wed Feb 18 09:11:04 2009 -0800 leds: Add CPLD driver for LEDS Signed-off-by: San Mehat leds: leds-cpld: Remove unused brightness setting Signed-off-by: San Mehat leds: cpld: Make state change debugging conditional Signed-off-by: Dima Zavin commit 3f7564fcca3d77e0a1d6f48b2814c29c5ea84db1 Author: Thomas Tsai Date: Wed Feb 18 09:03:23 2009 -0800 [ARM] msm: iomap: Add entries for HSUSB_BASE, SSBI, and TSSC Signed-off-by: San Mehat commit 2b7ce0e9573984c5d721edc7cd86bce23b278485 Author: Iliyan Malchev Date: Thu Mar 12 15:08:42 2009 -0700 [ARM] msm: mt9t013: add mode field to exposure gain ioctl Signed-off-by: Iliyan Malchev commit 590cc558de0921c77546c1e567b183396382c8b2 Author: horng chuang Date: Wed Feb 18 18:09:08 2009 +0800 mt9t013: Fix the call sequence in function mt9t013_release(),3M camera sensor. mt9t013_i2c_power_down() should be called before closing MCLK, otherwise I2C_WRITE will always fail. Signed-off-by: San Mehat commit 1c1dd29127d9109e551090a0362f696311871681 Author: Iliyan Malchev Date: Wed Feb 18 08:59:28 2009 -0800 [ARM] msm: Camera: clean up and fix camera sensor driver Signed-off-by: San Mehat commit 022c3e7fd1d036e5973dd1d3ff11c70b41a1e095 Author: Farmer Tseng Date: Tue Feb 17 15:26:25 2009 -0800 [ARM] elan8232: Enhance ELAN touch support for multiple panels Signed-off-by: San Mehat commit 9d34450053d5f6a90409835c3863ce7fc742382c Author: Thomas Tsai Date: Tue Feb 17 15:16:30 2009 -0800 [ARM] msm: vibrator: Initial support for MSM PMIC vibrator Signed-off-by: San Mehat commit 46eb06a9cf6af0201b59d8d19b71eec58a7b2d0b Author: Thomas Tsai Date: Tue Feb 17 15:14:34 2009 -0800 [ARM] msm: board: Add new camera sensor and camera platform device interface headers Signed-off-by: San Mehat commit b87b3d15ba384dc0d8dfe9d451948b127ca34c4f Author: Dmitry Shmidt Date: Tue Feb 17 14:42:56 2009 -0800 [ARM]: trout: Switch from trout_pwrsink -> htc_pwrsink Signed-off-by: San Mehat commit 73708f0e65f57e1099c38cbf8090ee19353a3aa7 Author: San Mehat Date: Wed Feb 18 10:45:48 2009 -0800 [ARM] msm: audio: Switch driver to new htc_pwrsink reporting Signed-off-by: San Mehat commit 5e112b409cfe06d5a02e21267e76cef3203af157 Author: Dmitry Shmidt Date: Tue Feb 17 14:35:27 2009 -0800 [ARM] msm: htc_pwrsink: Generify driver Signed-off-by: San Mehat commit 0e3e37ec7bbc6f9d7e395f54c1db8ad969248f48 Author: Saravana Kannan Date: Fri Nov 14 19:33:36 2008 -0800 [ARM] msm: acpuclock: Remove VDD check during init. The VDD register reflects the status of the PMIC only after the application processor has written to it. This is not the case after a reset or power collapse since it is the modem processor that sets up the PMIC. Hence, the VDD register is no longer used to verify the current VDD level during init (boot up). Acked-by: Steve Muckle commit 40fdf150de9f34c66470d038fcb9498dff4ed231 Author: Iliyan Malchev Date: Sat Feb 14 13:33:24 2009 -0800 [ARM] msm: htc_acoustic: use smem and rpc to write acoustic table Signed-off-by: Iliyan Malchev commit fc3ccc27142c4d0c6129b9c157446ac13c887e9c Author: Laurence Chen Date: Wed Feb 11 13:29:46 2009 -0800 [ARM] msm: audio_in: add audpre parameters Signed-off-by: Iliyan Malchev commit 2bea28d9f539d0c0a8d70de00c52a96f34b670d9 Author: Dima Zavin Date: Fri Feb 6 16:43:24 2009 -0800 [ARM] msm: move clock definitions to devices.c Also, add the begininngs for having a master list of clocks, and a bitmask for which sub-arch's they are used by. Signed-off-by: Dima Zavin commit 1c9c4fd8066d554e811eae1f15db43cd58df726e Author: San Mehat Date: Tue Feb 17 14:03:22 2009 -0800 [ARM] msm: trout: Switch to new headset driver in trout Signed-off-by: San Mehat commit d74c4494330c2a8c7906e9ecdbc214b9656846d0 Author: Thomas Tsai Date: Tue Feb 17 14:00:09 2009 -0800 [ARM] msm: htc_headset: Import new headset driver from HTC Signed-off-by: San Mehat commit eb3b450bda695829dac538fb5339f0f95dd92615 Author: HK Chen Date: Mon Feb 9 19:22:21 2009 -0800 [ARM] msm: audmgr: avoid leaking audio manager handles A race condition would allow audio manager handles to be leaked in situations where the driver was rapidly closed and reopened, eventually leading to the baseband being incapable of creating a new handle, and then a panic and reboot. Signed-off-by: Brian Swetland commit 3e073bdcc49625543d42f0d939f90edca0020ff8 Author: Mike Chan Date: Thu Feb 12 18:24:11 2009 -0800 [ARM] msm: trout: Fix touchscreen power on/off sequence. Level shifter gpio was not set to be an output. Signed-off-by: Mike Chan commit 4732de36ed19ba9c9986f57e44aacddc0eb513b4 Author: Ben Cheng Date: Fri Feb 6 16:10:34 2009 -0800 [ARM] msm: oprofile: Enable OProfile and preserve performance counters. Signed-off-by: Ben Cheng commit 3ee8f157ec814e9fac32c6a3563c637460b2110c Author: Saravana Kannan Date: Thu Jan 29 19:22:50 2009 -0800 [ARM] msm: acpuclock: Fix conditional compile symbol in acpuclock.h. commit 1056c1f9c65af8c62fab2964acad81676f40c144 Author: Rebecca Schultz Zavin Date: Fri Jan 23 14:00:46 2009 -0800 [ARM] msm: trout: Add panel width and height to board file for dpi calculation Signed-off-by: Rebecca Schultz Zavin commit ae65054cf3a50a62980dc79956f1d4fc1f0bfb15 Author: Arve Hj��nnev��g Date: Fri Jan 16 15:55:29 2009 -0800 [ARM] msm: qdsp5: Fix 2.6.29 build. commit af095b8738949467e0d6dab95d0fc566e1e81b0f Author: Laurence Chen Date: Thu Jan 8 11:22:27 2009 +0800 [ARM] msm: qdsp: Fix no in call voice after video record This is due to QDSP Module definitions that are not correct commit 802e4e0e30cd27233178bb97d497a1360fb7c496 Author: Iliyan Malchev Date: Tue Dec 23 16:05:31 2008 -0800 [ARM] msm: trout: amend the names of Bluetooth devices Signed-off-by: Iliyan Malchev commit 1818cbecd6f311fb3f17ce8cd28616f4f707fec6 Author: Iliyan Malchev Date: Fri Dec 19 13:35:06 2008 -0800 [ARM] msm: trout: add list of SND endpoints Signed-off-by: Iliyan Malchev commit a3973a39819a32374b865a1ab62a15eaa6fdb431 Author: Iliyan Malchev Date: Fri Dec 19 13:30:47 2008 -0800 [ARM] msm: halibut: add list of SND endpoints Signed-off-by: Iliyan Malchev commit 7dd8e6f184e1636dcc166c8177f8fa251df100e4 Author: Iliyan Malchev Date: Fri Dec 19 13:04:31 2008 -0800 [ARM] msm: audio: add a driver for the SND interface Signed-off-by: Iliyan Malchev commit ea56d4151c2026330db057af9796e675b311d5eb Author: San Mehat Date: Wed Dec 17 13:45:12 2008 -0800 [ARM] msm: audio: Move allocation of DMA buffer to driver init Signed-off-by: San Mehat commit 9253234e71dcd4d2bbd0809e4322535d52708789 Author: Dmitry Shmidt Date: Thu Dec 18 12:40:04 2008 -0800 [ARM] trout: Add abstract wifi control functions support commit e8680c0e3c98a4f483873d197334c0ecd0f54c57 Author: Nick Pelly Date: Tue Jun 9 13:28:50 2009 -0700 [ARM] msm: msm_serial_hs: Update comments for 8k support Signed-off-by: Nick Pelly commit 5f45930a20abe994ba33e22607f28b1b0d6cf48f Author: Nick Pelly Date: Fri Mar 20 13:53:00 2009 -0700 [ARM] msm: msm_serial_hs: Disable datamover when clocking off uart. Signed-off-by: Nick Pelly commit a09b93e6b12bf294ce6a9c18a96903250ec7a230 Author: Nick Pelly Date: Wed Dec 17 10:43:57 2008 -0800 [ARM] msm: msm_serial_hs: Hold wakelock while rx dma in progress. Use RXLEV with watermark level of 0 to acquire wakelock. Signed-off-by: Nick Pelly commit 21f8aa6af1740f1a90a648cc5f54de609cf510a9 Author: Nick Pelly Date: Tue Dec 16 15:49:48 2008 -0800 [ARM] msm: msm_serial_hs: Add (unused) UARTDM_RX irqs to devices.c. Signed-off-by: Nick Pelly commit 31dddd70f0f57705b7ec58b10069fed40408401b Author: Mike Chan Date: Wed Dec 10 13:22:14 2008 -0800 [ARM]: msm: clock: Adding PLL2 clocks for 528 power collapse stepping. Signed-off-by: Mike Chan commit f6acd2ad70589aa3925a1c8cfe0d4128c5eff27d Author: Nick Pelly Date: Thu Dec 11 16:22:52 2008 -0800 [ARM] msm: trout: Use low power wakeup on the bluetooth uart. Wakeup on GPIO 45 (UART 1 RX). Send character 0x32 (HCILL wake up indicator). Signed-off-by: Nick Pelly commit 981189b12054ab8e3325847f1b65b6b22c68673f Author: Nick Pelly Date: Thu Dec 11 17:53:10 2008 -0800 [bluetooth] Use msm_serial_hs clock controls during bt chip low power Signed-off-by: Nick Pelly commit 6d122c54bb3db1cadf15d48009df608c8e1ba699 Author: Nick Pelly Date: Thu Dec 11 15:22:57 2008 -0800 [ARM] msm: msm_serial_hs: Add optional low power wakeup. Low power wakeup is configured using msm_serial_hs_platform_data. This allows us to clk_enable() the uart on another interrupt (for example a gpio rx line). It also allows us to inject an char into the rx tty layer when this occurs. This is useful for uart attached devices that have low power modes independant of the linux CPU, for example bluetooth chip. Currently the interface to control low power mode is through msm_hs_request_clock_on() msm_hs_request_clock_off() Ideally we want to use the tty/serial layer but we do not have a good solution to this yet. A few other misc changes in here - Use _locked convention for functions that hold spinlock - request_irq() and free_irq() in startup/shutdown not probe/release - Use BIT(x) helper in the hw_reg header. Add missing bitmasks. Signed-off-by: Nick Pelly commit cff9207b6a8d5204e547a0459bd16202b663b6b4 Author: Nick Pelly Date: Tue Dec 9 09:38:21 2008 -0800 [ARM] msm: msm_serial_hs: Wakeup on uart1dm irq Other minor fixes: disable_irq in the isr is redundant because of spinlock, removed. Removed a stray debug comment. Signed-off-by: Nick Pelly commit d86094f0317cf5c016a770094293b9d3f52dafd0 Author: Arve Hj��nnev��g Date: Wed Dec 10 19:51:50 2008 -0800 [ARM] msm: gpio: Don't call generic_handle_irq with interrupts enabled Signed-off-by: Arve Hj��nnev��g commit 6952e69bbc7ceddb6ed7a3ecd201f24760340f09 Author: Arve Hj��nnev��g Date: Wed Dec 10 19:48:05 2008 -0800 [ARM] msm: generic_gpio: Don't pass GFP_KERNEL to kmalloc when holding a spinlock Signed-off-by: Arve Hj��nnev��g commit d4386d15e87d01068bc6fed559d771ce30665575 Author: Arve Hj��nnev��g Date: Wed Dec 10 19:45:39 2008 -0800 [ARM] msm: trout-h2w: Don't call request_irq with interrupts disabled. Signed-off-by: Arve Hj��nnev��g commit 082717be98497234149fc0421073da9899906b42 Author: Iliyan Malchev Date: Mon Dec 8 15:23:46 2008 -0800 [ARM] msm: adsp: fix an off-by-one bug Signed-off-by: Iliyan Malchev commit 43d6bae9dda6845b75739de76cdd35c44a1d8f5d Author: Iliyan Malchev Date: Mon Dec 8 15:17:13 2008 -0800 [ARM] msm: adsp: verify VIDEOENCTASK commands Signed-off-by: Iliyan Malchev commit a09d6cce703319e134f30d47ba9e5f1dd18d7d17 Author: Iliyan Malchev Date: Mon Dec 8 14:48:32 2008 -0800 [ARM] msm: adsp: verify VIDEOTASK MPEG-4 commands Signed-off-by: Iliyan Malchev commit a52c9eb3d019402dc5c1287af50ba2504e64bf5c Author: Mike Chan Date: Fri Dec 5 15:56:40 2008 -0800 [ARM] msm: clock: Fix cpu speed ramping down from 528mhz. Should not jump from 528mhz -> 245mhz this is greater than 256mhz spec. Signed-off-by: Mike Chan commit 49ff366e6c6837a901f8da8675b6eb44d89c3c8c Author: Mike Lockwood Date: Fri Nov 28 22:15:05 2008 -0500 [ARM] msm: trout: Support for android_usb composite USB gadget driver. Signed-off-by: Mike Lockwood commit cadc55b2b8ad0a17aa228165ade9c99b919d2269 Author: Mike Lockwood Date: Mon Nov 24 19:27:15 2008 -0500 [ARM] msm: trout: Refactor msm_hsusb platform data for msm72k_udc driver. Signed-off-by: Mike Lockwood [ARM] msm: hsusb: Properly initialize the internal phy This procedure is necessary for internal USB PHY on qsd8x50. Change-Id: I979f38596c980ca5d5440bb4045da664d8e8f328 Signed-off-by: Dima Zavin commit a2b0b60b00b84a41fbe9bbda163b63f97dc363bb Author: Mike Lockwood Date: Sat Mar 14 15:04:14 2009 +0530 [ARM] msm: usb: gadget: Do not suspend the phy when VBUS is off When vbus is off driver tries to put the phy in suspend mode. As we dont have complete infrastructure for LPM yet; Dont put phy in LPM LPM as we will not be able to wakeup from the same. LPM support will be implemented in a separate patch Patch provided by Qualcomm Signed-off-by: Mike Lockwood commit 9460a67bc955e127af18166066bced45c8909179 Author: Mike Lockwood Date: Sat Mar 14 15:04:13 2009 +0530 [ARM] msm: usb: gadget: Move udc header file to platform folder As the same header file will be used by OTG, Host and gadget device Move header file to a shared location(platform-folder) Patch provided by Qualcomm Signed-off-by: Mike Lockwood commit 5a3be91c32a76cb40b7f9aacd223be75a276d78a Author: Mike Lockwood Date: Sat Mar 14 15:04:12 2009 +0530 [ARM] msm: usb: gadget: Call _pullup function to enable pullup after reset Pullup needs to enabled only when vbus is valid and gadget driver is registered. Reset function was enabling pullup directly w/o any checks. Call enable pullup function which performs the required checks before enabling the pullup. Patch provided by Qualcomm Signed-off-by: Mike Lockwood commit dc2da9c29844a382b9076823b06182dc4bd6fa22 Author: Mike Lockwood Date: Sat Mar 14 15:04:11 2009 +0530 [ARM] msm: usb: gadget: Disable pullup when vbus is off Patch provided by Qualcomm Signed-off-by: Mike Lockwood commit 9728a5d6b6a368c4e1d0007a8b18f23b45cdfca7 Author: Mike Lockwood Date: Sat Mar 14 15:04:10 2009 +0530 [ARM] msm: usb: gadget: Add check to enable pullup if gadget and VBUS are valid Pullup on D+ should be enabled when both vbus and gadget are valid. Patch provided by Qualcomm Signed-off-by: Mike Lockwood commit 26e61b56a5b86f9967046a001b9d27eb69033359 Author: Mike Lockwood Date: Sat Mar 14 15:04:09 2009 +0530 [ARM] msm: usb: gadget: Save and restore otgsc register at h/w reset As otgsc register is used by transceiver to read the ID pin status and for interrupts like ID pin change and vbus(B session valid) changes. The state of this register is cleared once the link is reset and has to be restored to the previous state the transceiver is aware of. Hence save the state before the reset and restore the same after reset. Patch provided by Qualcomm Signed-off-by: Mike Lockwood commit 8af394c31f5275e797b73ea75b8566e5fdea02ea Author: Krishna, Vamsi Date: Tue Feb 10 21:17:07 2009 +0530 [ARM] msm: usb: gadget: Add support to initiate Remote Wakeup through Sysfs Add support to initiate Remote Wakeup through sysfs interface. Writing data to this file results in Remote Wakeup Signed-off-by: Mike Lockwood commit 14de095f38c6cc96f95cc13666a48f0ea2136de2 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:41 2009 +0530 [ARM] msm: usb: gadget: support remote wakeup GET/SET/CLEAR features Support GET/SET/CLEAR features on remote wakeup so that host can read, enable or disable remote wakeup support Acked-by: Allam, Suresh Reddy commit 0c4c11ced1baf0b3aa7f91c842a1a87f2b8d3d61 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:40 2009 +0530 [ARM] msm: usb: gadget: usb electrical test modes support Add support for TEST_SE0_NAK, TEST_J, TEST_K, TEST_PKT electrical test modes. To facilitate compliance testing, high-speed capable usb devices must support above mentioned test modes. Acked-by: Allam, Suresh Reddy commit 08771d030cc3ad655c6d4073093725d8eac5f38d Author: Krishna, Vamsi Date: Fri Feb 6 19:28:39 2009 +0530 [ARM] msm: usb: gadget: support usb protocol GET STATUS cmd USBCV-CH9 requires support for GET STATUS command which can be used to get status of device, endpoint or interface. It is used by USBCV to verify if previous SET command was successful or not. Acked-by: Allam, Suresh Reddy commit 7b8bc9a70f576219f68ea6e1dd512df2b2f06042 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:38 2009 +0530 [ARM] msm: usb: gadget: support usb protocol SET FEATURE cmd USBCV-CH9 requires to support SET FEATURE command to be supported. SET FEATURE command can be used to set the HALT on an endpoint and to enable/disbale remote wakeup. Currently we are supporting only SET FETURE on endpoint only. Acked-by: Allam, Suresh Reddy commit 5c07354f5ccef6197cd88c25a92cc5e79404a9be Author: Krishna, Vamsi Date: Fri Feb 6 19:28:37 2009 +0530 [ARM] msm: usb: gadget: add support for interrupt endpoint type Add support for interrupt endpoint. CDC/ACM requires interrupt endpoint support to work as modem. Acked-by: Allam, Suresh Reddy commit 9e2cffb9a61452ecd4f1a89773324cbad2327c35 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:36 2009 +0530 [ARM] msm: usb: gadget: clear the stall bit on CLEAR FEATURE cmd CLEAR FEATURE command on an endpoint was enabling endpoint instead of clearing the stall bit. Acked-by: Allam, Suresh Reddy commit 0837750f88e6782b2127c414f0e25bf5cee962f6 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:35 2009 +0530 [ARM] msm: usb: gadget: STALL support for endpoint If device does not support any control request or non-control endpoint requests, device can stall that particular endpoint. Add support to stall endpoint. Acked-by: Allam, Suresh Reddy commit 48fa1af3c29285a12212233c9e7e3bbd8d3a7ec1 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:34 2009 +0530 [ARM] msm: usb: gadget: Send ACK handshake to CLEAR_FEATURE req for EP0 When device STALL's control endpoint, host sends CLEAR_FEATURE request to clear STALL on endpoint-0. For Endpoint-0, hardware clears STALL immediately after receiving SETUP token on EP0, hence software does not need to explicitly clear the STALL for EP0 in hardware, but, software must need to configure Hardware to send ACK handshake to CLEAR_FEATURE request." Acked-by: Allam, Suresh Reddy commit aaa7649e74a9b748f724d55e33677c242a32add8 Author: Krishna, Vamsi Date: Fri Feb 6 19:28:33 2009 +0530 [ARM] msm: usb: gadget: support for ep0 out requests Support for transfer on ep0-out endpoint. CDC/ACM requries this feature to process set line coding commands. Acked-by: Allam, Suresh Reddy commit 4661d9e61060bc3e430929e9c5b102d28e382bf4 Author: Mike Lockwood Date: Mon Dec 1 13:01:03 2008 -0500 [ARM] msm: msm72k_udc: gadget driver for msm7k Signed-off-by: Mike Lockwood commit 50df45a89ac95c4a0bf31ed791abed1cdd01aee5 Author: Nick Pelly Date: Wed Dec 3 20:08:31 2008 -0800 [ARM] msm: trout: Remove uart2dm from board file (its not in use). Signed-off-by: Nick Pelly commit 0de5d4ec68771a4040ba0c95ce251f4ac64f11db Author: Mike Chan Date: Wed Dec 3 11:06:41 2008 -0800 [ARM] msm: clock: Support for freq table in speed selection. Change/disable full range of frequencies from /sys in userspace. Signed-off-by: Mike Chan commit 60c928567922e84e44b85084aeda5ec7f0a16ec4 Author: Dmitry Shmidt Date: Thu Dec 4 10:17:50 2008 -0800 [ARM] msm: Turn ON DMA support for SDC1 Signed-off-by: Brian Swetland commit 39f82673bf4ce20fba749a54e1cd8a59835ac6ac Author: Nick Pelly Date: Mon Dec 1 22:22:13 2008 -0800 [ARM] msm: Fix bugs preventing modular build Signed-off-by: Nick Pelly commit d386f835f4cd3a5daecc31b0c5cb9159f646d1da Author: Arve Hj��nnev��g Date: Tue Dec 2 19:39:51 2008 -0800 [ARM] msm: Setup default cpld values before writing them. This fixes a bug where low level serial debug on uart3 did not work between trout_init_gpio and trout_init. Signed-off-by: Arve Hj��nnev��g commit 561eb4c976d168420c7d36390249d898f45c3b64 Author: Arve Hj��nnev��g Date: Tue Dec 2 19:25:19 2008 -0800 [ARM] msm: lldebug: Fix waituart Signed-off-by: Arve Hj��nnev��g commit 25c4070eb9f000a8440295e8f2867958712cada8 Author: Arve Hj��nnev��g Date: Fri Nov 21 21:40:42 2008 -0800 [ARM] msm: trout: Add reset key combo. Reset on SEND-MENU-END if the trackball is not pressed. commit 68b1c965b36f864dd2310f2b151ebff9f8d6870b Author: Mike Lockwood Date: Tue Nov 18 20:48:17 2008 -0500 trout: Support for msm_serial_hs driver. Signed-off-by: Mike Lockwood commit f34693180f1b6c7e32037f030126afc9dfdc2062 Author: Nick Pelly Date: Mon Dec 1 22:41:17 2008 -0800 [ARM] msm_serial_hs: Redo hs uart driver for MSM7k - Do not use workqueues - Use dma_sync instead of dma_map in rx and tx callbacks - Fix bug where last RX is repeated into tty on shutdown - Fix membase / mapbase mix-up - Fix shutdown and remove paths. Tested as module - UART2 now works - Use container_of and correct types instead of casts - Use msm_hs_ prefix for local functions and structs - Remove the non-static pm interface - Acquire uart spinlock in irq handler, dma callback and set_termios - Use waitqueue instead of completion - Use get_resource helpers - Remove orphanned Kconfig options - Use new clockname/device node key for clocks - Plenty more misc cleanup Signed-off-by: Nick Pelly commit 13542091427858532111a088a39f604b4ea68411 Author: Mike Lockwood Date: Fri Nov 14 12:19:45 2008 -0500 msm_serial_hs: HSUART driver from Qualcomm Signed-off-by: Mike Lockwood commit cb598f1c2bc563629c6579c0b5c5c2634e0ac70f 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 b8eed99d9817b82af7dfd3745f58839da91f22ed Author: Dmitry Shmidt Date: Mon Nov 17 20:08:23 2008 -0800 [ARM] msm: trout: Temporarily Disable DMA for SDC1 commit 5e68e14fa5433299747082843b16298c8e76a56e Author: Nick Pelly Date: Mon Nov 17 19:16:13 2008 -0800 [ARM] msm: trout: bluetooth: Use rfkill API to turn bluetooth chipset on/off. commit f108ee3e4127536326b7ce311b3e8f10bbbf7ddd Author: Rebecca Schultz Date: Wed Oct 1 10:43:10 2008 -0700 [ARM] msm: trout: Adds trout Power Sink Driver Signed-off-by: Rebecca Schultz commit 1e7168197860476639308d493dc7e956d0dbbfc7 Author: San Mehat Date: Mon Nov 10 17:57:27 2008 -0800 [ARM] trout_mmc: Initial MMC support for Trout on 2.6.27 Signed-off-by: San Mehat trout: mmc: Re-enable WIFI SDIO code Signed-off-by: San Mehat trout: mmc: Re-enable wifi debugfs code Signed-off-by: San Mehat trout: mmc: Add maxblksize specifier to embedded data for wifi Signed-off-by: San Mehat commit ffc3a0eef1d46e389a3be6cc1795913077977e19 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 commit eaf55d34633d6e2f9fc312a24543b3e9e92b5d35 Author: Mike A. Chan Date: Fri Nov 7 12:39:29 2008 -0800 [ARM] msm: clock: Adding ondemand cpufreq scaling. Signed-off-by: Mike Chan commit c661142ca9ede23c782988a5bca145d0c492eeb7 Author: Brian Swetland Date: Wed Apr 29 17:13:41 2009 -0700 msm_serial: detect uart clock and deal with tcxo or tcxo/4 Signed-off-by: Brian Swetland commit 122a54ae84501a48bf4379dd2fce2235537f1e38 Author: Nick Pelly Date: Mon Jun 30 17:26:45 2008 -0700 [ARM] msm: msm_serial: option to wakeup uart on GPIO RX traffic. Signed-off-by: Brian Swetland msm_serial: fix to build on 2.6.32 Change-Id: Ib97cd6d7e127573ebf4eae7f2a4a215e03dcb74f commit 52220ecce85dda6e0dd71ab4bf8097d62cea061e Author: Nick Pelly Date: Mon Jun 30 17:22:43 2008 -0700 [ARM] msm: msm_serial: add uart clock control interface This interface allows tty clients to request uart clock on/off to reduce power usage. Signed-off-by: Brian Swetland commit 7a1fe1fcceb072ab5c0917c5e3baa6e14d6bd55e Author: Rebecca Schultz Date: Wed Sep 10 16:45:02 2008 -0700 [ARM] msm: Add software pte bits to allow userspace mapping of device memory Memory between 0x88000000 and 0xD0000000 must be accessed with PTE_EXT_TEX(2) These bits have to be reset when mapping to userspace or these io regions can't be mapped to userspace. The new L_PTE_DEVICE setting indicates that the memroy in question is MT_DEVICE_NONSHARED. Signed-off-by: Rebecca Schultz Signed-off-by: Rebecca Schultz commit 163c8d4f73e2ddd479a694afc9d7dcb990a11355 Author: Rebecca Schultz Date: Wed Oct 29 16:57:59 2008 -0700 [ARM] msm: trout: Add msm_fb support to trout architecture Signed-off-by: Rebecca Schultz commit f234e720d935a9b51adee91536216fd02c12625b Author: Mike Chan Date: Tue Mar 10 19:15:11 2009 -0700 [ARM] msm: battery: Enable BATT_TRACE. BATT logging macro now pretty prints wall time timestamps. Signed-off-by: Mike Chan [ARM] msm: battery: Disable BATT_TRACE. Signed-off-by: Mike Chan commit 950dca674a0afd8ebd044bb8aae76401a1847d4a Author: San Mehat Date: Thu Feb 26 11:43:14 2009 -0800 [ARM] htc_battery: Remove some #if 0s Signed-off-by: San Mehat commit 76459179660945ab4c0cecd1bbacf571e63e5d2a Author: Thomas Tsai Date: Thu Feb 26 11:41:54 2009 -0800 [ARM] htc_battery: Add support for Sapphire charging + China Mobile AC adapter Signed-off-by: San Mehat commit ee79a3a99851d5731e78ac9dc1a97de75ea23c2d Author: Rebecca Schultz Date: Mon Sep 29 18:24:57 2008 -0700 [ARM] trout: htc platform battery driver Uses rpc to communicate with battery state/charging service on the baseband processor. Signed-off-by: Rebecca Schultz commit 1a3b5577fc43800fec40db6c2f33e29d1444f7ee Author: Brian Swetland Date: Thu Mar 27 18:18:01 2008 -0700 [ARM] msm: add hook for vbus state notification The msm_hsusb_set_vbus_state() function allows the board file, battery/charger/power code, etc to inform the USB driver about the presence of VBUS. The driver now puts the USB client controller online when VBUS is present and suspends the PHY when it goes away. Signed-off-by: Brian Swetland commit d1f5516093b9a4a078e98431579aec4c8be7acf4 Author: Rebecca Schultz Date: Tue Sep 30 13:01:17 2008 -0700 elan_8232_i2c: Adding Elan 8232 I2C touchscreen driver Signed-off-by: Rebecca Schultz commit 2f4c681ec2a12e7325085a291947d472d6feda3d Author: Rebecca Schultz Date: Tue Sep 30 10:26:07 2008 -0700 mt9t013: MT9T013 HTC camera sensor driver Signed-off-by: Iliyan Malchev commit fd799bb63adfed45be7f6d7d918915532e2cccc3 Author: Nick Pelly Date: Mon Sep 29 18:19:37 2008 -0700 [ARM] msm: trout: htc2wire driver to support htc headsets Signed-off-by: Rebecca Schultz commit 78ecf555331cbbd9dbf040463336035d70468770 Author: Rebecca Schultz Date: Mon Sep 29 17:58:03 2008 -0700 [ARM] msm: trout: htc acoustic driver Allows userspace to set acoustic settings via memory mapped region Signed-off-by: Rebecca Schultz commit 677298dbb55e4c312ce53185ec3d036e77c687ab Author: Dmitry Shmidt Date: Mon Sep 29 17:55:10 2008 -0700 [ARM] msm: trout: Code to extract wifi calibration data from ATAGs Signed-off-by: Rebecca Schultz commit 64985cc55dc99b250a6c93eac36bd639d7b9e61e Author: Rebecca Schultz Date: Mon Sep 29 17:51:38 2008 -0700 [ARM] msm: trout: obtain calibration data for the compass sensor Extracts compass calibraton from the ATAGs set up by the bootloader Signed-off-by: Rebecca Schultz commit b89a3e9c17c444963d1ba3b288eecac08277aeb3 Author: Arve Hj��nnev��g Date: Mon Sep 29 17:44:12 2008 -0700 [ARM] msm: trout: platform specific keypad driver Signed-off-by: Rebecca Schultz commit 0edcee95e21d2112be97059570e14dcd423add17 Author: Arve Hj��nnev��g Date: Mon Sep 29 11:16:12 2008 -0700 [ARM] msm: trout: CPLD GPIO driver Signed-off-by: Rebecca Schultz Signed-off-by: Arve Hj��nnev��g commit 5dcd0c2450c5e2eb6d00bc38f819880b2a7e0f18 Author: Arve Hj��nnev��g Date: Mon Apr 6 20:38:22 2009 -0700 [ARM] msm: Update defconfig defconfig cleanup also disable VT Enable MMC and FAT filesystems in config Add NLS codepage to defconfig for FAT filesystems Enable MMC_PARANOID_SD_INIT in defconfig Enable CONFIG_MMC_EMBEDDED_SDIO Enable USB mass storage. bluetooth: Compile Bluetooth support. Enable ondemand cpufreq scaling. trout: Add CONFIG_PACKET for proper DHCP client work enable CONFIG_SERIAL_MSM_HS and CONFIG_SERIAL_MSM_HS_UART1 Add DEBUG_FS, DEBUG_VM, and DEBUG_SG to defconfig Disable SYSFS_DEPRECATED. Add devmapper and crypto support with AES/Twofish ciphers Add EXT2 / EXT3 support to defconfig Compile uinput support. Add LED triggers. Add printk timestamps. Add timer debug. Remove mousedev. Remove rtc interface. Turn off CONFIG_RFKILL_PM We do not want to power down the bluetooth chip in suspend. Disable MMC_BLOCK_BOUNCE in defconfig Enable CONFIG_INPUT_KEYCHORD Enable uid_stat in defconfig. Enable CONFIG_TIMED_OUTPUT Enable EXT2/EXT3/devmapper/crypto/aes/twofish support in defconfig Add LOOP support to defconfig Replace CONFIG_TROUT_H2W -> CONFIG_HTC_HEADSET in defconfig Adjust governor polling frequency. Add HTC_PWRSINK to defconfig Enable MACH_SAPPHIRE, TOUCHSCREEN_ELAN_I2C_8232, LEDS_CPLD in defconfig Disable OPROFILE in defconfig Regenerate 2.6.29 defconfig Enable cgroups in defconfig Update msm_defconfig to enable ipsec related options. Add CONFIG_TUN to defconfig Signed-off-by: San Mehat Signed-off-by: Mike Chan Signed-off-by: Mike Lockwood Signed-off-by: Nick Pelly Signed-off-by: Arve Hj��nnev��g Signed-off-by: Chung-yih Wang commit 4045ad9f8b4836b195253b9406d8174159fecb42 Author: Hou-Kun Chen Date: Mon Sep 29 18:54:46 2008 -0700 amk8976: Adding support for AKM8976 compass driver Signed-off-by: Rebecca Schultz i2c: akm8976: Add proper probe function + provide hardware information Signed-off-by: Farmer Tseng Signed-off-by: San Mehat akm8976: Fix for 2.6.32 Signed-off-by: Arve Hj��nnev��g commit 37d29cc32fe98dff8f26539f39684406b1b8e978 Author: Rebecca Schultz Date: Mon Sep 29 17:32:13 2008 -0700 [ARM] msm: trout: Add trout (aka Dream/G1) machine target and some defines Signed-off-by: Rebecca Schultz Signed-off-by: Mike Chan Signed-off-by: Mike Lockwood commit 26fc0720be05535bca80c0153fe9ce57ad1bdc95 Author: Arve Hj��nnev��g Date: Mon Feb 4 17:14:40 2008 -0800 [ARM] msm: Add FFA keymap to halibut. Add board_halibut.ffa=1 to the kernel command line to use it. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 3ea1fcba1ea3fd6f66e16c04c66d3326b8f2de2b Author: Arve Hj��nnev��g Date: Sat Dec 1 19:01:30 2007 -0800 [ARM] msm: add keypad for halibut board Signed-off-by: Brian Swetland commit b90343e3e3995db4974a31e01396c3af2707cef3 Author: Brian Swetland Date: Mon Apr 7 17:59:14 2008 -0700 [ARM] msm: halibut: support fiq mode kernel debugger if configured Signed-off-by: Brian Swetland commit 6820e4e50f38ece8281e468ba8309fb003c64e06 Author: Brian Swetland Date: Tue Feb 9 21:36:00 2010 -0800 [ARM] msm_serial_debugger: fiq-mode serial debugger support This provides the ability to handle simple debug commands from an fiq-context uart based debugger. kmsg - dump printk log pc - show current PC and mode regs - show current registers Other commands are handed off to an IRQ handler which calls the kernel_debugger() routine provided by KERNEL_DEBUGGER_CORE. Signed-off-by: Brian Swetland [ARM] msm_serial_debugger: Better interoperability with shared serial pins. Introduce debug_enable, debugger will not echo back RX characters until a CR is received. Other modules can turn off debug_enable via msm_serial_debug_enable() interface. Flush when doing TX in FIQ context. Turn off interrupts and flush when doing TX in IRQ context. Send a \r with every \n sent by the kernel debugger when processing console messages. Signed-off-by: Brian Swetland [ARM] msm_serial_debugger: irqs command to dump irq count Signed-off-by: Brian Swetland [ARM] msm: msm_serial_debugger: Add irq status to 'irqs' fiq debug command. Also clean up some alignment Signed-off-by: Nick Pelly [ARM] msm: fiq_debugger: Add ability to enable / disable debugger at runtime Signed-off-by: San Mehat [ARM] msm_serial_debugger: Support 19.2MHz clock on scorpion. Signed-off-by: Arve Hj��nnev��g [ARM] msm_serial_debugger: Add wakeup irq and disable uart clock when idle The serial debugger is now inactive by default so we can enter low power modes. Hit enter twice to activate it for 5 seconds. Signed-off-by: Arve Hj��nnev��g [ARM] msm_serial_debugger: Keep uart clock on when CONFIG_MSM_SERIAL_DEBUGGER_CONSOLE is enabled Change-Id: I8c4e3c77d429a8f6fde068672d51e750e0f14c1b Signed-off-by: Arve Hj��nnev��g msm_serial_debugger: fix to build without CONFIG_PREEMPT Change-Id: I71e115a26142cccd809aa979dfa9541f842ae680 [ARM] msm: serial_debugger: move the clock disable to after we enable the fiq If the uart fifo is not empty when we enable the fiq, the handler will try to empty it and hang since the clock disabled prior to enabling the fiq. Signed-off-by: Dima Zavin [ARM] msm_serial_debugger: Add option to keep serial debugger active from boot. If msm_serial_debugger.no_sleep=1 is added to the kernel command line, or MSM_SERIAL_DEBUGGER_NO_SLEEP is selected in the config, the serial debugger is activated on boot and stays active until it receives a sleep command. Change-Id: Ibf84435af8203360ee808fd903dd6322cf5d9d17 Signed-off-by: Arve Hj��nnev��g [ARM] msm_serial_debugger: Fix startup when no_sleep is set Change-Id: I7e55567d723e30d3e998d625aa7a53f896b55d61 [ARM] msm_serial_debugger: Add option to never disable wakeup IRQ. This works better if the radio ignores the uart clock request while power collapsed. Change-Id: Ib0989e714e883b3667c9ecc4cfd1ebfe014a35df Signed-off-by: Arve Hj��nnev��g [ARM] msm: Fix register dump in fiq debugger Change-Id: Iff5cd48291c9b09aace30220c4229c157a7db1d0 Signed-off-by: Arve Hj��nnev��g [ARM] msm_serial_debugger: Add some debugger commands Add allregs to dump registers for all modes. Add bt to get a stackstrace. Change-Id: Ia85e72b6c8243eba38a04cf4f6cc9cba5342a6de Signed-off-by: Arve Hj��nnev��g commit 94d8a63498404b4202307c1d3c25966fd0cdb5df Author: Brian Swetland Date: Tue Feb 9 21:35:33 2010 -0800 [ARM] msm: enable installation of an FIQ handler Also add 8k fiq stack. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 031f7a7031a797a564bde2914f0d00bf9493690c Author: Iliyan Malchev Date: Wed Dec 19 18:42:50 2007 -0800 [ARM] msm: add ADSP driver Provide necessary access to aDSP memory from userspace. Signed-off-by: Iliyan Malchev Signed-off-by: Brian Swetland commit 9869cfe7eb575f3cc9ca8c380cd04f2e7f5b8931 Author: Brian Swetland Date: Sat Dec 1 19:56:52 2007 -0800 [ARM] msm: hw3d register access driver Needed by the userspace OpenGL|ES library. Signed-off-by: Brian Swetland Signed-off-by: Rebecca Schultz commit 2d864b93fdd4e23713157606910094ccfa4c9fc6 Author: Mike A. Chan Date: Wed Oct 29 13:18:57 2008 -0700 [ARM] msm: clock: Simple cpufreq scaling based on screen ON/OFF Signed-off-by: Mike A. Chan commit ac3ec1979896d90911a7a9ce7a9b1b474c4caf26 Author: San Mehat Date: Mon Mar 31 20:38:24 2008 -0700 [ARM] msm: RTC driver for Qualcomm MSM7K chipsets Create a virtual RTC alarm which restricts max suspend sleep time. Since the QCT RTC alarm doesn't work properly (yet), we need to clamp the max suspend sleep time if there is an alarm set for the future. This ensures that the device will be awake when the virtual RTC alarm needs to be triggered. Signed-off-by: San Mehat commit b9b8f3797f9416b650f965d467f01a1abd2db710 Author: Brian Swetland Date: Tue Feb 9 22:46:19 2010 -0800 [ARM] msm: driver for rmnet virtual ethernet interface The MSM7X00A baseband makes up to 3 "virtual ethernet" channels available, which allow ethernet packets to be exchanged with the cellular network, once an appropriate data connection is established. Signed-off-by: Brian Swetland Signed-off-by: San Mehat [ARM] msm_rmnet: HACK: do not count ARP packets The android network traffic watchdog is tricked into thinking that data traffic is working at times when it isn't, due to ARP traffic between the apps and modem processor. Don't count ARP packets in link statistics to avoid this problem. [ARM] msm: rmnet: Add stat tracking for number of radio wakeups occur. There are two paramaters that appear for all rmnet devices. rmnet0 for example: /sys/devices/virtual/net/rmnet0/timeout (RW) /sys/devices/virtual/net/rmnet0/wakeups (RO) timeout is configured by userspace for the proper network timeout values wakeups is the number of radio wakeups that occured. By default timeout is zero which means the stats are disabled. MSM_RMNET_DEBUG must be set. Signed-off-by: Mike Chan [ARM] msm: rmnet: Track wakeups due to xmit/rcv instead of globally. Signed-off-by: Mike Chan [ARM] msm: rmnet: Different stat timeouts when screen is on/off. Timeout for modem powerdown can differ when the screen is on/off. Allow timeout to change via early suspend/resume hooks. Signed-off-by: Mike Chan [ARM] msm: rmnet: Lock a wakelock for half a second when receiving data. Signed-off-by: Arve Hj��nnev��g [ARM] msm: rmnet: Tracks total awake time when the rmnet is active. Exports data in /sys/devices/virtual/net/rmnet0/awake_time_ms in time expressed as ms awake. Signed-off-by: Mike Chan [ARM] msm: rmnet: Fix compilation issue when MSM_RMNET_DEBUG is not set. Signed-off-by: Dima Zavin msm_rmnet: fix to build on 2.6.32 Change-Id: Ic6a4903dd12ea83723354d00f639ae2f9375167f msm_rmnet: ensure packet writes are atomic Use the smd_write_atomic() function to prevent concurrent packet writes to the transport from stepping on each other. Signed-off-by: Brian Swetland commit 45a6c7f36c2610e1628040a1767922ae31121b23 Author: Brian Swetland Date: Tue Feb 9 21:41:24 2010 -0800 [ARM] msm: driver for MSM7X00A on-chip I2C controller. San: Re-write driver to write/read to/from buffer in IRQ context Signed-off-by: Arve Hj��nnev��g Signed-off-by: San Mehat [ARM] msm: I2C: Send stop command to finish i2c transfer on timeout Signed-off-by: San Mehat [ARM] msm: i2c: Try to read the requested number of bytes. If the requested read length is two or greater, this should always work. It the read length is one, an extra byte may be read if the interrupt handler is not called in time. The previous version always read an extra byte. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Try to recover if the i2c bus is busy after a failed transfer. If the bus is busy, switch the i2c pins to gpio mode and drive the bus manually. This will clear the busy condition with some clients. This adds a function, msm_set_i2c_mux, to change i2c mux settings since we do not have mux api. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Perform entire i2c transfer at interrupt context. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Prevent infinite reads. The contoller sometimes ignores our stop request. Send a new stop request before flushing every other byte. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Improve error recovery - Reduce bus busy timeout. - Call recovery function if the bus is busy at the start of a transaction. - Wait for bus busy to clear after a transaction. - Move read stop on timeout to recover function. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Always read at least two bytes If we tell the controller to stop at the same time as it finished reading the first byte, it may ignore the stop request, loose bus access or fail to start the next read or write. We now always read an extra byte if a single byte read was requested. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Only send STOP for last for the last write message in the group. This allows drivers to perform a write followed by a read with a repeated start. A repeated start after a read is still not possible. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Send another byte if we are still the bus master in msm_i2c_recover_bus_busy. If a transfer timed out before we told the controller to stop writing the controller may be waiting for more data to write. Write 0xff as the last byte, after switching the lines to gpio mode, to trigger a failure. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Work around i2c controller bug. When writing I2C_WRITE_DATA right before the i2c clock line is scheduled to go high again, the controller does not stretch the clock so the data setup time is within the i2c spec. Change-Id: Ibfa35a036454ac39a8bb94b0d1fc220976ace88f Signed-off-by: Arve Hj��nnev��g msm: i2c: only complain if the bus is busy at the start of a transaction Signed-off-by: Brian Swetland [ARM] msm: i2c: do the pin mux config at initialization time. Signed-off-by: Dima Zavin [ARM] msm: i2c: dump the values of scl/sda at the start of recover_bus_busy Signed-off-by: Dima Zavin [ARM] msm: i2c: Only enable clock during transfer. The arm9 no longer ignores our clock requests when we enter sleep mode. Always leaving the i2c clock on will prevent entering low power mode. Signed-off-by: Arve Hj��nnev��g [ARM] msm: i2c: Don't depend on i2c interrupt wakeup. The other core may use the i2c controller while we are power collpased which makes the i2c interrupt unusable as a wakeup source. Hold a wakelock while i2c is active and disable the interrupt when it is idle. Signed-off-by: Arve Hj��nnev��g commit 8f104e81f0160759d4763c09c3c1f5dbfef92f84 Author: Arve Hj��nnev��g Date: Wed Oct 29 21:45:46 2008 -0700 [ARM] msm: halibut: Add memory configuration. commit 563fbdc048b6710f01ee28e7f0f434a67114971d Author: Brian Swetland Date: Sat Dec 1 19:54:04 2007 -0800 [ARM] msm: pick up partition table from bootloader via private ATAG It's the wrong way to do this (according to rmk), but we've got bootloader code that's working this way, so here's support for it. Signed-off-by: Brian Swetland commit ee69815d120a000c36716cac9f9c79b9e5a723ee Author: Arve Hj��nnev��g Date: Wed Oct 22 20:46:57 2008 -0700 [ARM] msm: power management - add wakeup support and implement suspend to ram as wait for interrupt Enter low power states from idle. Add idle statistics. If enabled /proc/msm_pm_stats reports time spent in different idle states. Spin waiting for interrupts for a while before entering a lower power state. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 423d0d89bbd2267842255fbd10cd15f7d2ac174e Author: Mike A. Chan Date: Wed Jul 23 18:55:01 2008 -0700 [ARM] msm: clock: Cpu clk stepping. Jump in 256mhz increments, acpu_freq_tbl has up/down fields to specify next target freq if greater than 256mhz. Less loop spinning. Signed-off-by: Mike A. Chan Signed-off-by: San Mehat commit 8d82eea9ed8acb197efa38be7bf99d4ee7845e46 Author: Arve Hj��nnev��g Date: Wed Oct 22 21:32:21 2008 -0700 [ARM] msm: irq: Add sleep support. Add shadow registers for type and polarity and restore them in resume. Add wakeup support to main interrupt controller. Mask interrupt as soon as disable_irq is called. This is needed in some cases to allow power collapse from idle. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 9e783f30abf47bccbd5dafa2460286e88efee478 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 27e2b3ca529971a06cbe394a93c165be1c735baf Author: Arve Hj��nnev��g Date: Wed Jun 24 17:30:34 2009 -0700 [ARM] msm: timer: wait for timer reset to take effect Change-Id: I45a4c51144bdad8d2a5cc51fbe4a24f175080d49 Signed-off-by: Arve Hj��nnev��g commit 9c1164f691f1ebc7fa74fb20d4b5bcca8a7209a6 Author: Arve Hj��nnev��g Date: Fri Dec 4 22:53:27 2009 -0800 [ARM] msm: timer: Fix sleep duration from idle. Don't read TIMER_MATCH_VAL. This register may return an old value which would cause the calculated sleep duration to be wrong. Change-Id: Iaf079b28b47a677d485135912aa8b66b183cacf4 Signed-off-by: Arve Hj��nnev��g commit edf38bb413629fb4d712c42e644628dd6fdc313e Author: Arve Hj��nnev��g Date: Wed Dec 10 16:01:22 2008 -0800 [ARM] msm: Don't call ktime_get from sched_clock With some kernel debug options sched_clock gets called with xtime_lock locked for write resulting in a deadlock. Signed-off-by: Arve Hj��nnev��g [ARM] msm: timer: Build on 2.6.32. Change-Id: I265f985487ed08329a5c675be57c74c472f8b158 Signed-off-by: Arve Hj��nnev��g commit 45e476bf50d8d732bb14f07291dbeb2348e30901 Author: Arve Hj��nnev��g Date: Thu Dec 11 19:34:10 2008 -0800 [ARM] msm: Prevent clocksource read from jumping back after power collapse. If the clock events device is shut down or we are idle, don't read from the hardware, but return a cached value. It would be better to trigger this from the clocksource api, but there is no hook to enable or disable a clocksource. Signed-off-by: Arve Hj��nnev��g commit d422e118431f211be95df50f3e99f22105b3f045 Author: Arve Hj��nnev��g Date: Thu Dec 11 20:10:39 2008 -0800 [ARM] msm: timer: Don't call ktime_get from msm_timer_sync_smem_clock Signed-off-by: Arve Hj��nnev��g commit 49962ff95a2389e31a3be173a9866e985e7241c6 Author: Arve Hj��nnev��g Date: Fri May 2 15:30:32 2008 -0700 [ARM] msm: Timer fixes. Restart timer when entering idle if it appears to have missed. If the timer should have fired more than a millisecond ago, we assume that the interrupt was lost and reprogram the timer. Sync the GP timer with the other core. Get the time from the other core after low power idle. Return time until next alarm when entering idle. Add config option to select default timer. Fix shift value so multiplier does not overflow. Add workarounds for some hardware bugs. Add sched_clock. Increase min_delta_ns so that we don't get stuck if running at low speed. Limit number of alarm-already-expired messages. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 82844a2ce69a9660ae72c087e008f04250449b45 Author: Iliyan Malchev Date: Mon Dec 31 13:11:28 2007 -0800 [ARM] msm_rpc: support rpc servers - time_remote_mtoa server receives notification of time bases - dog_keepalive server to handle watchdog events Signed-off-by: Iliyan Malchev Signed-off-by: San Mehat Signed-off-by: Brian Swetland commit c7bf14ac4968c613e79d5ab599a719d7650ef4e1 Author: Brian Swetland Date: Sun May 25 22:05:07 2008 -0700 [ARM] msm: provide AMSS version selection mechanism Some drivers have dependencies on AMSS versions that are not easily resolved at runtime. Provide a mechanism for selecting the AMSS version so they can be compiled appropriately. Signed-off-by: Brian Swetland commit 30215ac358a6198f349f6441c023b55f7d48af5b Author: San Mehat Date: Sat Dec 1 19:14:34 2007 -0800 [ARM] msm: shared memory rpc router The RPC router provides access to RPC services running on the baseband core from kernel and userspace. Signed-off-by: Brian Swetland Signed-off-by: San Mehat Signed-off-by: Iliyan Malchev commit 0b59e9a48573072c4d66c7876874f3454fbee098 Author: Brian Swetland Date: Tue Feb 9 22:52:45 2010 -0800 [ARM] msm: shared memory qmi interface The QMI control stream is used to configure the virtual ethernet network interface to the baseband processor / cellular network. Publish qmi0, qmi1, and qmi2 (which control the rmnet0, rmnet1, and rmnet2 interfaces). Signed-off-by: Brian Swetland [ARM] msm: smd_qmi: Add a wakelock with a timeout to prevent sleep after receiving a qmi notification. Signed-off-by: Arve Hj��nnev��g [ARM] msm: smd_qmi: Get auth_type from apn parameter to qmi_network_up function. auth_type was hardcoded as 3. Parse this from the "apn" parameter. commit b60cbae952c9bd0abbe3b359a046f328fcafe2f6 Author: Brian Swetland Date: Sat Dec 1 19:10:02 2007 -0800 [ARM] msm: shared memory tty interface Provides a simple tty interface to the shared memory "virtual serial" streams. Signed-off-by: Brian Swetland commit 3026c76d1092a9c9ef814b81799609a2ec4f21e4 Author: Arve Hj��nnev��g Date: Sat Dec 1 18:47:49 2007 -0800 [ARM] msm: gpio support Provide an implementation of the generic gpio API for the MSM family. An extended API provides single-step configuration and access to edge detect status. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 6b01ef6b5379c984aa5cf35744fbd1925c115886 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 commit c5c6503f14a8db8f3af3df3ecaebbf23608861ab 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 commit da5d68376febe3882b30b1e312459d85f18a1cd8 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 eda9362df0ae9f80fb63411db23ac7ac77b095b7 Author: Arve Hj��nnev��g Date: Tue Jan 26 17:24:08 2010 -0800 [ARM] mtd: msm_nand: Use dma_map_page instead of dma_map_single. dma_map_single does not work for highmem or vmalloced memory. Also fix the unmap length if writing more then one nand page. Change-Id: I29501b6e01415bb0497a24e1b1fe8d426d338bb1 Signed-off-by: Arve Hj��nnev��g commit f94a596466ab6a75526ac7b842e0d04343eaed1f Author: Dima Zavin Date: Mon Dec 7 19:44:20 2009 -0800 [ARM] mtd: msm_nand: Clear the flash_status register after write/erase The OP_ERR bit gets set in the status register after an error. There's a HW bug where it's possible for this bit to not get cleared after the subsequent successful operations, and cause the software to incorrectly flag them as failures. Change-Id: I60abc4a7b7a4c3a26fa1abf81c1688ca9d3fc380 Signed-off-by: Dima Zavin commit 5360da1c7047390223d134a53afaa25f5f78b5fd Author: Brent DeGraaf Date: Tue Aug 11 16:53:46 2009 -0400 msm-nand: Add dma_sync_single* calls in msm_nand_read_oob. When empty pages are read, certain bytes in the buffer that is read are set 0x54 instead of 0xFF. This is due to the ECC error correction logic of the nand controller. CPU needs to correct these bytes back to 0xFF and it needs to access these bytes while the buffer is still owned by the device. This can be achieved if dma_sync_single_for_cpu and dma_sync_single_for_device are called before & after the CPU access to the buffer owned by the device. Signed-off-by: Brent DeGraaf commit 11e492c339d2a1ef2a38d55482de17c6c01e3f16 Author: Murali Palnati Date: Wed Mar 25 20:04:37 2009 +0530 msm-nand: Add bad block marking/checking support. Add support to check if a block is bad by reading the bad block marker. For marking a block as bad, write all 0's to the first page of the block which results in the bad block marker being set to 0 as well. Acked-by: David Brown Removed config option since some factory badblocks are marked in a way that does not prevent erase. Signed-off-by: Arve Hj��nnev��g commit 25db6ab277d868a82a244dd41cb8d9e31c5f5c1e Author: Murali Palnati Date: Wed Mar 25 20:04:02 2009 +0530 msm-nand: Add raw mode support Add support for reading and writing a raw page (Data + ECC bytes) from the flash. Acked-by: David Brown Signed-off-by: Arve Hj��nnev��g commit 696f01beb8845c63b7e778c1e17c0944852f3f78 Author: San Mehat Date: Thu Feb 19 14:13:20 2009 -0800 [ARM] msm: nand: Add support for 2Gbit Micron parts Signed-off-by: San Mehat commit 87932d598c8d6213a49cb1ce62476d1eac2389a6 Author: Thomas Tsai Date: Wed Feb 18 08:30:54 2009 -0800 [ARM] msm: nand: Add support for 4 Gbit Hynix / Samsung parts Signed-off-by: San Mehat [ARM] msm: nand: Fix style violations Signed-off-by: San Mehat mtd: msm_nand: Remove HTC debug code. Signed-off-by: Dima Zavin commit 60701f4d86d51c040ce4c38f44e2e1535c164a9f Author: Mike Lockwood Date: Wed Feb 10 15:26:58 2010 -0500 USB: gadget: android: Specify USB_CLASS_COMM in device descriptor if using RNDIS Signed-off-by: Mike Lockwood commit 18b0e5819831422831da4fa80541348748f4b9f0 Author: Arve Hj��nnev��g Date: Mon Sep 15 16:45:23 2008 -0700 [ARM] mtd: msm nand driver Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit cb7536857381c2eb10ecb4c1d14d2ef274baa75c Author: Mike Lockwood Date: Mon Feb 8 05:33:54 2010 -0500 USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set Signed-off-by: Mike Lockwood commit 65eb4c8d6eecf6f3637efed5be8ab31adf1452ff Author: Mike Lockwood Date: Sat Feb 6 21:54:31 2010 -0500 USB: android: Use composite class driver for enabling and disabling functions Signed-off-by: Mike Lockwood commit f8cf7f90ac799df1f9a34bd7cd6fb0dce063c8c5 Author: Mike Lockwood Date: Sat Feb 6 21:53:51 2010 -0500 USB: composite: Add class driver for enabling and disabling USB functions. Signed-off-by: Mike Lockwood commit 1d69bc989dc640d17e966818936e30698f243790 Author: Arve Hj��nnev��g Date: Wed Dec 9 23:29:56 2009 -0800 disable staging/dream Change-Id: I8f2fdae60761ba773fd0ee5b49a624f3d1798fd6 commit e4adc653748af0499f30809e47764bee6563e53f Author: San Mehat Date: Tue Feb 9 12:08:48 2010 -0800 mmc: core: Release delayed mmc work wakelock after deep disable Signed-off-by: San Mehat commit b0e43706172ebfee90c82337dfae49119a4e722e Author: Greg Kroah-Hartman Date: Tue Feb 9 04:57:19 2010 -0800 Linux 2.6.32.8 commit 6117db7678e1175d482ce4a2a31203d39f050319 Author: jamal Date: Thu Feb 4 14:50:56 2010 -0500 NET: fix oops at bootime in sysctl code This fixes the boot time oops on the 2.6.32-stable tree. It is needed only in this tree due to the divergance from upstream. From: jamal Acked-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit e4a6a351099037e7d20ec8b21907f38f3e35d483 Author: Andreas Schwab Date: Sat Jan 30 10:20:59 2010 +0000 powerpc: TIF_ABI_PENDING bit removal commit 94f28da8409c6059135e89ac64a0839993124155 upstream. Here are the powerpc bits to remove TIF_ABI_PENDING now that set_personality() is called at the appropriate place in exec. Signed-off-by: Andreas Schwab Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit a420e9f34f545968efdf414de17c374445ef2589 Author: Felix Fietkau Date: Tue Jan 19 20:51:32 2010 +0100 ath9k: fix beacon slot/buffer leak commit 74401773f80b6d42f7a4c6994ca0cca883b03745 upstream. When cleaning up beacon buffers and slots, ath9k currently checks if sc->ah->opmode is set to a beacon related mode before cleaning up buffers. An unfortunate ordering of interface up/down commands can lead to sc->ah->opmode being set to monitor mode, while there are AP interfaces present on the same wiphy. Always cleaning up beacon buffers if present fixes this issue. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 1c97637c37d73d0afa0759468eec8132b442452f Author: Felix Fietkau Date: Sat Jan 23 20:04:18 2010 +0100 ath9k: fix eeprom INI values override for 2GHz-only cards commit aa8bc9ef18a2c5b2b97e1f36ee9604cf15743f96 upstream. Among other changes, this commit: commit 06d0f0663e11cab4ec5f2c143a118d71a12fbbe9 Author: Sujith Date: Thu Feb 12 10:06:45 2009 +0530 ath9k: Enable Fractional N mode changed the hw attach code to fix up initialization values only for dual band devices, however the commit message did not give a reason as to why this would be useful or necessary. According to tests by Jorge Boncompte, this breaks at least some 2GHz-only cards, so the code should be changed back to the unconditional INI fixup. Signed-off-by: Felix Fietkau Reported-by: Jorge Boncompte Tested-by: Pavel Roskin Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 2c7f87e9dc8167999d4169b58f4be04fd357e9eb Author: Thadeu Lima de Souza Cascardo Date: Tue Feb 2 13:44:17 2010 -0800 pktcdvd: removing device does not remove its sysfs dir commit ca0bf64d99f6e3f6e2fe2585e52a0ac57354beac upstream. This is the counterpart to cba767175becadc5c4016cceb7bfdd2c7fe722f4 ("pktcdvd: remove broken dev_t export of class devices"). Device is not registered using dev_t, so it should not be destroyed using device_destroy which looks up the device by dev_t. This will fail and adding the device again will fail with the "duplicate name" error. This is fixed using device_unregister instead of device_destroy. Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Kay Sievers Cc: Peter Osterlund Cc: Al Viro Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit b31aa5cccb9b5850135c07d8a0cb22984a5fe0f2 Author: Richard R��jfors Date: Tue Feb 2 13:44:12 2010 -0800 uartlite: fix crash when using as console commit 03eac7bb882a75e6ee5705288f7ec36ad2e7d0d5 upstream. Move the ulite_console_setup to the .devinit section since it might be called on probe, which is in devinit. Fixes the crash below where the uartlite hw is probed after the .init section is freed from the kernel. uartlite: ttyUL0 at MMIO 0xc8000100 (irq = 30) is a uartlite BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] ulite_console_setup+0x6f/0xa8 *pdpt = 0000000036fb0001 *pde = 0000000000000000 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/devices/pci0000:00/0000:00:1f.1/host0/uevent Modules linked in: puffin(+) serio_raw Pid: 151, comm: modprobe Not tainted (2.6.31.5-1.0.b1-b1 #1) POULSBO EIP: 0060:[] EFLAGS: 00010246 CPU: 0 EIP is at ulite_console_setup+0x6f/0xa8 EAX: c16ec824 EBX: c16ec824 ECX: c176719f EDX: 00000000 ESI: 00000000 EDI: c17b42c4 EBP: f6fd1cf0 ESP: f6fd1cd8 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 Process modprobe (pid: 151, ti=f6fd0000 task=f6fa1020 task.ti=f6fd0000) Stack: c1031f51 00000000 00000000 00000246 c182237c f7742000 f6fd1d5c c11fd316 <0> c16ec85c f77420d4 0000001e 00000000 00000000 c1633e78 4f494d4d 63783020 <0> 30303038 00303031 f6fd1d3c c10e0786 f6fd1d48 00000000 f6fd1d48 00000000 Call Trace: [] ? register_console+0xf6/0x1fc [] ? uart_add_one_port+0x237/0x2bb [] ? sysfs_add_one+0x13/0xd3 [] ? sysfs_do_create_link+0xba/0xfc [] ? ulite_probe+0x198/0x1eb [] ? platform_drv_probe+0xc/0xe [] ? driver_probe_device+0x79/0x105 [] ? __device_attach+0x28/0x30 [] ? bus_for_each_drv+0x3d/0x67 [] ? device_attach+0x44/0x58 [] ? __device_attach+0x0/0x30 [] ? bus_probe_device+0x1f/0x34 [] ? device_add+0x385/0x4c0 [] ? _write_unlock+0x8/0x1f [] ? platform_device_add+0xd9/0x11c [] ? mfd_add_devices+0x165/0x1bc [] ? puffin_probe+0x2d0/0x390 [puffin] [] ? pci_match_device+0xa0/0xa7 [] ? local_pci_probe+0xe/0x10 [] ? pci_device_probe+0x43/0x66 [] ? driver_probe_device+0x79/0x105 [] ? __driver_attach+0x43/0x5f [] ? bus_for_each_dev+0x3d/0x67 [] ? driver_attach+0x14/0x16 [] ? __driver_attach+0x0/0x5f [] ? bus_add_driver+0xf9/0x220 [] ? driver_register+0x8b/0xeb [] ? __pci_register_driver+0x43/0x9f [] ? __blocking_notifier_call_chain+0x40/0x4c [] ? puffin_init+0x0/0x48 [puffin] [] ? puffin_init+0x17/0x48 [puffin] [] ? do_one_initcall+0x4c/0x131 [] ? sys_init_module+0xa7/0x1b7 [] ? syscall_call+0x7/0xb Code: 6e 74 00 00 00 92 33 00 00 18 00 0e 01 73 79 6e 63 65 2d 72 65 67 69 73 74 72 79 0c 00 49 32 00 00 14 00 09 01 61 6c 73 61 2d 69 <6e> 66 6f 00 00 00 42 37 00 00 10 00 07 01 6b 69 6c 6c 61 6c 6c EIP: [] ulite_console_setup+0x6f/0xa8 SS:ESP 0068:f6fd1cd8 CR2: 0000000000000000 Signed-off-by: Richard R��jfors Acked-by: Peter Korsgaard Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit e06fbe9a4092960a1db1fa973c9ec13a3ddce3f9 Author: Julia Lawall Date: Wed Feb 3 09:31:36 2010 +1100 kernel/cred.c: use kmem_cache_free commit b8a1d37c5f981cdd2e83c9fd98198832324cd57a upstream. Free memory allocated using kmem_cache_zalloc using kmem_cache_free rather than kfree. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,E,c; @@ x = \(kmem_cache_alloc\|kmem_cache_zalloc\|kmem_cache_alloc_node\)(c,...) ... when != x = E when != &x ?-kfree(x) +kmem_cache_free(c,x) // Signed-off-by: Julia Lawall Acked-by: David Howells Cc: James Morris Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: James Morris Signed-off-by: Greg Kroah-Hartman commit 35cfb03de1dcd87f405db30a9da65bd63bfa59fe Author: Ben Hutchings Date: Tue Jan 26 18:27:09 2010 +0000 starfire: clean up properly if firmware loading fails commit c928febf4bc703ea542340e5a208e0445d998839 upstream. netdev_open() will return without cleaning up net device or hardware state if firmware loading fails. This results in a BUG() on a second attempt to bring the interface up, reported in , and probably has even worse effects if the driver is removed afterwards. Call netdev_close() to clean up on failure. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15091 Signed-off-by: Ben Hutchings Reported-by: Michael Moffatt Tested-by: Michael Moffatt Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 906f68dd91cc512036909a10350d479dfc56d378 Author: Alberto Panizzo Date: Tue Feb 2 13:43:59 2010 -0800 mx3fb: some debug and initialisation fixes commit b3cb53721890879d7bde31f5f9eefd4edf41ab64 upstream. Fix the kernel oops when dev_dbg is called with mx3_fbi->txd == NULL Fix the late initialisation of mx3fb->backlight_level. If not, in the chain of function started by init_fb_chan(), in __blank() call sdc_set_brightness(mx3fb, mx3fb->backlight_level) that will shut down the CONTRAST PWM output. Signed-off-by: Alberto Panizzo Acked-by: Guennadi Liakhovetski Cc: Sascha Hauer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 682efb8384326571bb180214a5d4661cc6befa41 Author: Uwe Kleine-K��nig Date: Tue Feb 2 13:44:10 2010 -0800 imxfb: correct location of callbacks in suspend and resume commit 1ec562035ba64e724652cb12b8a770b3906e9bf5 upstream. The probe function passes a pointer to a struct fb_info to platform_set_drvdata(), so don't interpret the return value of platform_get_drvdata() as a pointer to struct imxfb_info. The original imxfb_info *fbi backlight_power was NULL but in imxfb_suspend it was 4 resulting in an oops as imxfb_suspend calls imxfb_disable_controller(fbi) which in turn has if (fbi->backlight_power) fbi->backlight_power(0); Signed-off-by: Uwe Kleine-K��nig Acked-by: Sascha Hauer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit b260729c8a49452ae9491e3cb94750687f221d2b Author: Zhu Yi Date: Tue Jan 26 15:58:57 2010 +0800 mac80211: fix NULL pointer dereference when ftrace is enabled commit 3092ad054406f069991ca561adc74f2d9fbb6867 upstream. I got below kernel oops when I try to bring down the network interface if ftrace is enabled. The root cause is drv_ampdu_action() is passed with a NULL ssn pointer in the BA session tear down case. We need to check and avoid dereferencing it in trace entry assignment. BUG: unable to handle kernel NULL pointer dereference Modules linked in: at (null) IP: [] ftrace_raw_event_drv_ampdu_action+0x10a/0x160 [mac80211] *pde = 00000000 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC [...] Call Trace: [] ? ftrace_raw_event_drv_ampdu_action+0x0/0x160 [mac80211] [] ? __ieee80211_stop_rx_ba_session+0xfc/0x220 [mac80211] [] ? ieee80211_sta_tear_down_BA_sessions+0x3b/0x50 [mac80211] [] ? ieee80211_set_disassoc+0xe6/0x230 [mac80211] [] ? ieee80211_set_disassoc+0x9c/0x230 [mac80211] [] ? ieee80211_mgd_deauth+0x158/0x170 [mac80211] [] ? ieee80211_deauth+0x1b/0x20 [mac80211] [] ? __cfg80211_mlme_deauth+0xe9/0x120 [cfg80211] [] ? __cfg80211_disconnect+0x170/0x1d0 [cfg80211] Cc: Johannes Berg Signed-off-by: Zhu Yi Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 3a9353f232812dc9057cbee39c618f400a8c5f60 Author: anfei zhou Date: Tue Feb 2 13:44:02 2010 -0800 mm: flush dcache before writing into page to avoid alias commit 931e80e4b3263db75c8e34f078d22f11bbabd3a3 upstream. The cache alias problem will happen if the changes of user shared mapping is not flushed before copying, then user and kernel mapping may be mapped into two different cache line, it is impossible to guarantee the coherence after iov_iter_copy_from_user_atomic. So the right steps should be: flush_dcache_page(page); kmap_atomic(page); write to page; kunmap_atomic(page); flush_dcache_page(page); More precisely, we might create two new APIs flush_dcache_user_page and flush_dcache_kern_page to replace the two flush_dcache_page accordingly. Here is a snippet tested on omap2430 with VIPT cache, and I think it is not ARM-specific: int val = 0x11111111; fd = open("abc", O_RDWR); addr = mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); *(addr+0) = 0x44444444; tmp = *(addr+0); *(addr+1) = 0x77777777; write(fd, &val, sizeof(int)); close(fd); The results are not always 0x11111111 0x77777777 at the beginning as expected. Sometimes we see 0x44444444 0x77777777. Signed-off-by: Anfei Cc: Russell King Cc: Miklos Szeredi Cc: Nick Piggin Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 78da404b13afa162e9da0384f553db5f19bc94b0 Author: David S. Miller Date: Thu Jan 28 21:36:21 2010 -0800 be2net: Fix memset() arg ordering. commit d291b9af1a1a12f59a464494900c6e0db26e2ec3 upstream. Noticed by Ben Hutchings. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit e38d76ea394dd90a78c002e8298d47390b858334 Author: Ajit Khaparde Date: Wed Jan 27 21:56:44 2010 +0000 be2net: Bug fix to support newer generation of BE ASIC commit 7b139c83c590d4965259aad8889cbb08104b2891 upstream. Bug fix in be2net for newer generation of BladeEngine ASIC. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 43d7ff26361d05f9f97a92726bd2acc9652ce65c Author: Evgeniy Polyakov Date: Tue Feb 2 15:58:48 2010 -0800 connector: Delete buggy notification code. commit f98bfbd78c37c5946cc53089da32a5f741efdeb7 upstream. On Tue, Feb 02, 2010 at 02:57:14PM -0800, Greg KH (gregkh@suse.de) wrote: > > There are at least two ways to fix it: using a big cannon and a small > > one. The former way is to disable notification registration, since it is > > not used by anyone at all. Second way is to check whether calling > > process is root and its destination group is -1 (kind of priveledged > > one) before command is dispatched to workqueue. > > Well if no one is using it, removing it makes the most sense, right? > > No objection from me, care to make up a patch either way for this? Getting it is not used, let's drop support for notifications about (un)registered events from connector. Another option was to check credentials on receiving, but we can always restore it without bugs if needed, but genetlink has a wider code base and none complained, that userspace can not get notification when some other clients were (un)registered. Kudos for Sebastian Krahmer , who found a bug in the code. Signed-off-by: Evgeniy Polyakov Acked-by: Greg Kroah-Hartman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit f06f00e00cbf497623fda3c1c317f28cf5d9a770 Author: Magnus Damm Date: Wed Jan 27 07:41:19 2010 +0000 usb: r8a66597-hdc disable interrupts fix commit e5ff15bec96ba18698dae5de0bbf7e6a0653ca65 upstream. This patch improves disable_controller() in the r8a66597-hdc driver to disable all interrupts and clear status flags. It also makes sure that disable_controller() is called during probe(). This fixes the relatively rare case of unexpected pending interrupts after kexec reboot. Signed-off-by: Magnus Damm Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt Signed-off-by: Greg Kroah-Hartman commit 0ae2b7de3957a477ec0f332c4da5633499b4d3aa Author: Chuck Ebbert Date: Sat Jan 30 20:28:19 2010 +0100 block: fix bugs in bio-integrity mempool usage commit 9e9432c267e4047db98b9d4fba95099c6effcef9 upstream. Fix two bugs in the bio integrity code: use_bip_pool() always returns 0 because it checks against the wrong limit, causing the mempool to be used only when regular allocation fails. When the mempool is used as a fallback we don't free the data properly. Signed-Off-By: Chuck Ebbert Acked-by: Martin K. Petersen Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 964814800330216ded04e5a9a21f95d7998dfd62 Author: Herbert Xu Date: Mon Feb 1 21:48:28 2010 +1100 random: Remove unused inode variable commit cd1510cb5f892907fe1a662f90b41fb3a42954e0 upstream. The previous changeset left behind an unused inode variable. This patch removes it. Reported-by: Stephen Rothwell Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman commit 8857a1abeb4572aa5237d0461165e983e01da707 Author: Matt Mackall Date: Fri Jan 29 21:50:36 2010 +1300 random: drop weird m_time/a_time manipulation commit a996996dd75a9086b12d1cb4010f26e1748993f0 upstream. No other driver does anything remotely like this that I know of except for the tty drivers, and I can't see any reason for random/urandom to do it. In fact, it's a (trivial, harmless) timing information leak. And obviously, it generates power- and flash-cycle wasting I/O, especially if combined with something like hwrngd. Also, it breaks ubifs's expectations. Signed-off-by: Matt Mackall Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman commit 94af44b66b66bf9c848f11dc12fcd1558e55f995 Author: Linus Torvalds Date: Tue Feb 2 12:37:44 2010 -0800 Fix 'flush_old_exec()/setup_new_exec()' split commit 7ab02af428c2d312c0cf8fb0b01cc1eb21131a3d upstream. Commit 221af7f87b9 ("Split 'flush_old_exec' into two functions") split the function at the point of no return - ie right where there were no more error cases to check. That made sense from a technical standpoint, but when we then also combined it with the actual personality setting going in between flush_old_exec() and setup_new_exec(), it needs to be a bit more careful. In particular, we need to make sure that we really flush the old personality bits in the 'flush' stage, rather than later in the 'setup' stage, since otherwise we might be flushing the _new_ personality state that we're just setting up. So this moves the flags and personality flushing (and 'flush_thread()', which is the arch-specific function that generally resets lazy FP state etc) of the old process into flush_old_exec(), so that it doesn't affect any state that execve() is setting up for the new process environment. This was reported by Michal Simek as breaking his Microblaze qemu environment. Reported-and-tested-by: Michal Simek Cc: Peter Anvin Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit cb723ba5d03bf719dbc7409b4d67572d4472ef8b Author: Dmitry Monakhov Date: Wed Jan 27 22:44:36 2010 +0300 block: fix bio_add_page for non trivial merge_bvec_fn case commit 1d6165851cd8e3f919d446cd6da35dee44e8837e upstream. We have to properly decrease bi_size in order to merge_bvec_fn return right result. Otherwise this result in false merge rejects for two absolutely valid bio_vecs. This may cause significant performance penalty for example fs_block_size == 1k and block device is raid0 with small chunk_size = 8k. Then it is impossible to merge 7-th fs-block in to bio which already has 6 fs-blocks. Signed-off-by: Dmitry Monakhov Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit e52299d0b100ab8d92fe6e980b4d7ee24dd1398c Author: Nick Piggin Date: Mon Feb 1 22:25:57 2010 +1100 mm: purge fragmented percpu vmap blocks commit 02b709df817c0db174f249cc59e5f7fd01b64d92 upstream. Improve handling of fragmented per-CPU vmaps. We previously don't free up per-CPU maps until all its addresses have been used and freed. So fragmented blocks could fill up vmalloc space even if they actually had no active vmap regions within them. Add some logic to allow all CPUs to have these blocks purged in the case of failure to allocate a new vm area, and also put some logic to trim such blocks of a current CPU if we hit them in the allocation path (so as to avoid a large build up of them). Christoph reported some vmap allocation failures when using the per CPU vmap APIs in XFS, which cannot be reproduced after this patch and the previous bug fix. Cc: linux-mm@kvack.org Tested-by: Christoph Hellwig Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 56d4b77f0492eb137fd950e48a7b2364f380d33d Author: Nick Piggin Date: Mon Feb 1 22:24:18 2010 +1100 mm: percpu-vmap fix RCU list walking commit de5604231ce4bc8db1bc1dcd27d8540cbedf1518 upstream. RCU list walking of the per-cpu vmap cache was broken. It did not use RCU primitives, and also the union of free_list and rcu_head is obviously wrong (because free_list is indeed the list we are RCU walking). While we are there, remove a couple of unused fields from an earlier iteration. These APIs aren't actually used anywhere, because of problems with the XFS conversion. Christoph has now verified that the problems are solved with these patches. Also it is an exported interface, so I think it will be good to be merged now (and Christoph wants to get the XFS changes into their local tree). Cc: linux-mm@kvack.org Tested-by: Christoph Hellwig Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit dce6a09aaf62aff73b8123e9bb8ad2247b355848 Author: Tejun Heo Date: Mon Jan 11 11:14:44 2010 +0900 libata: retry link resume if necessary commit 5040ab67a2c6d5710ba497dc52a8f7035729d7b0 upstream. Interestingly, when SIDPR is used in ata_piix, writes to DET in SControl sometimes get ignored leading to detection failure. Update sata_link_resume() such that it reads back SControl after clearing DET and retry if it's not clear. Signed-off-by: Tejun Heo Reported-by: fengxiangjun Reported-by: Jim Faulkner Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit 42f7e233e4afae9d327f24c73379920adc905f95 Author: Suravee Suthikulpanit Date: Mon Jan 18 11:25:36 2010 -0600 oprofile/x86: fix crash when profiling more than 28 events commit d8cc108f4fab42b380c6b3f3356f99e8dd5372e2 upstream. With multiplexing enabled oprofile crashs when profiling more than 28 events. This patch fixes this. Signed-off-by: Suravee Suthikulpanit Signed-off-by: Robert Richter Signed-off-by: Greg Kroah-Hartman commit 9c66557324ea4879abe8c9dde769a0061c81e1ac Author: Andi Kleen Date: Thu Jan 21 23:26:27 2010 +0100 oprofile/x86: add Xeon 7500 series support commit e83e452b0692c9c13372540deb88a77d4ae2553d upstream. Add Xeon 7500 series support to oprofile. Straight forward: it's the same as Core i7, so just detect the model number. No user space changes needed. Signed-off-by: Andi Kleen Signed-off-by: Robert Richter Signed-off-by: Greg Kroah-Hartman commit 4f7d6662c57dbaa6be09cc0bad2c01d005638a4d Author: Glauber Costa Date: Mon Feb 1 16:54:05 2010 -0200 KVM: allow userspace to adjust kvmclock offset (cherry picked from afbcf7ab8d1bc8c2d04792f6d9e786e0adeb328d) When we migrate a kvm guest that uses pvclock between two hosts, we may suffer a large skew. This is because there can be significant differences between the monotonic clock of the hosts involved. When a new host with a much larger monotonic time starts running the guest, the view of time will be significantly impacted. Situation is much worse when we do the opposite, and migrate to a host with a smaller monotonic clock. This proposed ioctl will allow userspace to inform us what is the monotonic clock value in the source host, so we can keep the time skew short, and more importantly, never goes backwards. Userspace may also need to trigger the current data, since from the first migration onwards, it won't be reflected by a simple call to clock_gettime() anymore. [marcelo: future-proof abi with a flags field] [jan: fix KVM_GET_CLOCK by clearing flags field instead of checking it] Signed-off-by: Glauber Costa Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit a74e62c2ef1fda92ad697556261b0e00fee5d581 Author: Jarek Poplawski Date: Sat Jan 16 01:04:04 2010 -0800 ax25: netrom: rose: Fix timer oopses [ Upstream commit d00c362f1b0ff54161e0a42b4554ac621a9ef92d ] Wrong ax25_cb refcounting in ax25_send_frame() and by its callers can cause timer oopses (first reported with 2.6.29.6 kernel). Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14905 Reported-by: Bernard Pidoux Tested-by: Bernard Pidoux Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 3125258f78ae4930916d8c569a10dfd621db77ba Author: Jarek Poplawski Date: Sun Jan 10 22:04:19 2010 +0000 af_packet: Don't use skb after dev_queue_xmit() [ Upstream commit eb70df13ee52dbc0f2c0ffd8ed34a8cd27440baf ] tpacket_snd() can change and kfree an skb after dev_queue_xmit(), which is illegal. With debugging by: Stephen Hemminger Reported-by: Michael Breuer With help from: David S. Miller Signed-off-by: Jarek Poplawski Tested-by: Michael Breuer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit ecb7287c5f53747767efa0f0e844da69a6ec3a51 Author: Jamal Hadi Salim Date: Fri Dec 25 17:30:22 2009 -0800 net: restore ip source validation [ Upstream commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ] when using policy routing and the skb mark: there are cases where a back path validation requires us to use a different routing table for src ip validation than the one used for mapping ingress dst ip. One such a case is transparent proxying where we pretend to be the destination system and therefore the local table is used for incoming packets but possibly a main table would be used on outbound. Make the default behavior to allow the above and if users need to turn on the symmetry via sysctl src_valid_mark Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 16813330e739634925b347804d1e6a99b71c6399 Author: Jarek Poplawski Date: Mon Jan 4 08:48:41 2010 +0000 sky2: Fix oops in sky2_xmit_frame() after TX timeout [ Upstream commit 9db2f1bec36805e57a003f7bb90e003815d96de8 ] During TX timeout procedure dev could be awoken too early, e.g. by sky2_complete_tx() called from sky2_down(). Then sky2_xmit_frame() can run while buffers are freed causing an oops. This patch fixes it by adding netif_device_present() test in sky2_tx_complete(). Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14925 With debugging by: Mike McCormack Reported-by: Berck E. Nash Tested-by: Berck E. Nash Signed-off-by: Jarek Poplawski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 16b8efad28d99afaf50b2a2116bf8edf605a0912 Author: Octavian Purdila Date: Fri Jan 8 00:00:09 2010 -0800 tcp: update the netstamp_needed counter when cloning sockets [ Upstream commit 704da560c0a0120d8869187f511491a00951a1d3 ] This fixes a netstamp_needed accounting issue when the listen socket has SO_TIMESTAMP set: s = socket(AF_INET, SOCK_STREAM, 0); setsockopt(s, SOL_SOCKET, SO_TIMESTAMP, 1); -> netstamp_needed = 1 bind(s, ...); listen(s, ...); s2 = accept(s, ...); -> netstamp_needed = 1 close(s2); -> netstamp_needed = 0 close(s); -> netstamp_needed = -1 Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 359e2f2722ef7b5d5b3d1472409a5daf8a6954d5 Author: Aaro Koskinen Date: Mon Feb 1 18:24:58 2010 +0200 clocksource: fix compilation if no GENERIC_TIME commit a362c638bdf052bf424bce7645d39b101090f6ba upstream Commit a9238ce3bb0fda6e760780b702c6cbd3793087d3 broke compilation on platforms that do not implement GENERIC_TIME (e.g. iop32x): kernel/time/clocksource.c: In function 'clocksource_register': kernel/time/clocksource.c:556: error: implicit declaration of function 'clocksource_max_deferment' Provide the implementation of clocksource_max_deferment() also for such platforms. Signed-off-by: Aaro Koskinen Cc: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit 253f887cc8d719087f8de403cfe1a60b5e56b454 Author: Joerg Roedel Date: Fri Jan 22 16:40:20 2010 +0100 x86/amd-iommu: Fix possible integer overflow commit d91afd15b041f27d34859c79afa9e172018a86f4 upstream. The variable i in this function could be increased to over 2**32 which would result in an integer overflow when using int. Fix it by changing i to unsigned long. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit d1a31038aadf0fb13befb444e60d96f3618766d0 Author: David H��rdeman Date: Thu Jan 28 21:02:54 2010 +0100 x86: Add quirk for Intel DG45FC board to avoid low memory corruption commit 7c099ce1575126395f186ecf58b51a60d5c3be7d upstream. Commit 6aa542a694dc9ea4344a8a590d2628c33d1b9431 added a quirk for the Intel DG45ID board due to low memory corruption. The Intel DG45FC shares the same BIOS (and the same bug) as noted in: http://bugzilla.kernel.org/show_bug.cgi?id=13736 Signed-off-by: David H��rdeman LKML-Reference: <20100128200254.GA9134@hardeman.nu> Cc: Alexey Fisher Cc: ykzhao Cc: Tony Bones Cc: Ingo Molnar Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 81590709e68af85629f969a305abab5e39649ad2 Author: Leann Ogasawara Date: Wed Jan 27 15:29:18 2010 -0800 x86: Add Dell OptiPlex 760 reboot quirk commit 35ea63d70f827a26c150993b4b940925bb02b03f upstream. Dell OptiPlex 760 hangs on reboot unless reboot=bios is used. Add quirk to reboot through the BIOS. BugLink: https://bugs.launchpad.net/bugs/488319 Signed-off-by: Leann Ogasawara LKML-Reference: <1264634958.27335.1091.camel@emiko> Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 00362b9adebdca260ae03717665a16f6948a6a4a Author: Mark Brown Date: Mon Jan 4 15:30:54 2010 +0000 regulator: Specify REGULATOR_CHANGE_STATUS for WM835x LED constraints commit a2fad9bf26a1d44a8d31a5c4528108a2b9f468ab upstream. The WM8350 LED driver needs to be able to enable and disable the regulators it is using. Previously the core wasn't properly enforcing status change constraints so the driver was able to function but this has always been intended to be required. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood Signed-off-by: Greg Kroah-Hartman commit 6db6aced4d9eb83872d6b63dfd95e3c9d2de37c2 Author: Jiri Slaby Date: Fri Aug 28 10:47:16 2009 +0200 SECURITY: selinux, fix update_rlimit_cpu parameter commit 17740d89785aeb4143770923d67c293849414710 upstream. Don't pass current RLIMIT_RTTIME to update_rlimit_cpu() in selinux_bprm_committing_creds, since update_rlimit_cpu expects RLIMIT_CPU limit. Use proper rlim[RLIMIT_CPU].rlim_cur instead to fix that. Signed-off-by: Jiri Slaby Acked-by: James Morris Cc: Stephen Smalley Cc: Eric Paris Cc: David Howells Signed-off-by: Greg Kroah-Hartman commit 80569f607b59fb59d0e7d86ae6467fefcab8e89b Author: Stefan Richter Date: Fri Jan 29 21:25:46 2010 +0100 firewire: core: add_descriptor size check Backport of commit e300839da40e99581581c5d053a95a172651fec8 upstream. Presently, firewire-core only checks whether descriptors that are to be added by userspace drivers to the local node's config ROM do not exceed a size of 256 quadlets. However, the sum of the bare minimum ROM plus all descriptors (from firewire-core, from firewire-net, from userspace) must not exceed 256 quadlets. Otherwise, the bounds of a statically allocated buffer will be overwritten. If the kernel survives that, firewire-core will subsequently be unable to parse the local node's config ROM. (Note, userspace drivers can add descriptors only through device files of local nodes. These are usually only accessible by root, unlike device files of remote nodes which may be accessible to lesser privileged users.) Therefore add a test which takes the actual present and required ROM size into account for all descriptors of kernelspace and userspace drivers. Signed-off-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman commit 612e99b2d1ba8839896c6ea78d4329782d4e16b8 Author: Jesse Barnes Date: Fri Dec 11 11:07:17 2009 -0800 drm/i915: only enable hotplug for detected outputs commit b01f2c3a4a37d09a47ad73ccbb46d554d21cfeb0 upstream. This patch changes around our hotplug enable code a bit to only enable it for ports we actually detect and initialize. This prevents problems with stuck or spurious interrupts on outputs that aren't actually wired up, and is generally more correct. Fixes FDO bug #23183. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 69bf9a60ba1577e437c36a260bb02e7e79ed7ccc Author: Wey-Yi Guy Date: Fri Oct 2 13:44:01 2009 -0700 iwlwifi: set default aggregation frame count limit to 31 commit 4d80d7210bb5a36a18978d1305b44375ecb857d9 upstream. Multiple MPDUs can be aggregated, transmitted, and finally acknowledged together using a single BA frame. Block ACK (BA) contains bitmap size of 64*16 bits so the maximum frame count is 64. The default value of aggregation frame count suggested by uCode is 31 to achieve best performance. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 3492bbb3afd5fd9fa873015691004797371ec373 Author: Venkatesh Pallipadi Date: Fri Jan 29 11:27:31 2010 -0800 x86: Disable HPET MSI on ATI SB700/SB800 commit 73472a46b5b28116b145fb5fc05242c1aa8e1461 upstream HPET MSI on platforms with ATI SB700/SB800 as they seem to have some side-effects on floppy DMA. Do not use HPET MSI on such platforms. Original problem report from Mark Hounschell http://lkml.indiana.edu/hypermail/linux/kernel/0912.2/01118.html Tested-by: Mark Hounschell Signed-off-by: Venkatesh Pallipadi Cc: LKML-Reference: <20100121190952.GA32523@linux-os.sc.intel.com> Signed-off-by: H. Peter Anvin commit cf135e5571317539a44bf3022f4f2c14a64edaa1 Author: David H��rdeman Date: Thu Jan 28 22:28:27 2010 -0800 Input: winbond-cir - remove dmesg spam commit 93fb84b50fe03aabca8d9dea5d3ba521a07e8571 upstream. I missed converting one dev_info call to deb_dbg before submitting the driver. Without this change, a message will be printed to dmesg for each button press if a RC6 remote is used. Signed-off-by: David H��rdeman Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 5e806e1c71412081bdc0058c43595eb63d06a606 Author: H. Peter Anvin Date: Thu Jan 28 22:14:43 2010 -0800 x86: get rid of the insane TIF_ABI_PENDING bit commit 05d43ed8a89c159ff641d472f970e3f1baa66318 upstream. Now that the previous commit made it possible to do the personality setting at the point of no return, we do just that for ELF binaries. And suddenly all the reasons for that insane TIF_ABI_PENDING bit go away, and we can just make SET_PERSONALITY() just do the obvious thing for a 32-bit compat process. Everything becomes much more straightforward this way. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit c2e245dff59d14f94d2befddcbfa4c667ac23eb0 Author: David Miller Date: Thu Jan 28 21:42:02 2010 -0800 sparc: TIF_ABI_PENDING bit removal commit 94673e968cbcce07fa78dac4b0ae05d24b5816e1 upstream. Here are the sparc bits to remove TIF_ABI_PENDING now that set_personality() is called at the appropriate place in exec. Signed-off-by: David S. Miller Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 336ca4cc1f9d14edbb5d155b41aa301aaeb731c4 Author: Linus Torvalds Date: Thu Jan 28 22:14:42 2010 -0800 Split 'flush_old_exec' into two functions commit 221af7f87b97431e3ee21ce4b0e77d5411cf1549 upstream. 'flush_old_exec()' is the point of no return when doing an execve(), and it is pretty badly misnamed. It doesn't just flush the old executable environment, it also starts up the new one. Which is very inconvenient for things like setting up the new personality, because we want the new personality to affect the starting of the new environment, but at the same time we do _not_ want the new personality to take effect if flushing the old one fails. As a result, the x86-64 '32-bit' personality is actually done using this insane "I'm going to change the ABI, but I haven't done it yet" bit (TIF_ABI_PENDING), with SET_PERSONALITY() not actually setting the personality, but just the "pending" bit, so that "flush_thread()" can do the actual personality magic. This patch in no way changes any of that insanity, but it does split the 'flush_old_exec()' function up into a preparatory part that can fail (still called flush_old_exec()), and a new part that will actually set up the new exec environment (setup_new_exec()). All callers are changed to trivially comply with the new world order. Signed-off-by: H. Peter Anvin Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 944a638b7bb07f3ef9a33af60e5ea8465b7adfd1 Author: Mike Frysinger Date: Wed Jan 6 17:23:17 2010 +0000 FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stack commit 04e4f2b18c8de1389d1e00fef0f42a8099910daf upstream. The current code will load the stack size and protection markings, but then only use the markings in the MMU code path. The NOMMU code path always passes PROT_EXEC to the mmap() call. While this doesn't matter to most people whilst the code is running, it will cause a pointless icache flush when starting every FDPIC application. Typically this icache flush will be of a region on the order of 128KB in size, or may be the entire icache, depending on the facilities available on the CPU. In the case where the arch default behaviour seems to be desired (EXSTACK_DEFAULT), we probe VM_STACK_FLAGS for VM_EXEC to determine whether we should be setting PROT_EXEC or not. For arches that support an MPU (Memory Protection Unit - an MMU without the virtual mapping capability), setting PROT_EXEC or not will make an important difference. It should be noted that this change also affects the executability of the brk region, since ELF-FDPIC has that share with the stack. However, this is probably irrelevant as NOMMU programs aren't likely to use the brk region, preferring instead allocation via mmap(). Signed-off-by: Mike Frysinger Signed-off-by: David Howells Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 0b3bf81197f05e1bf0ed93c5f2525030b127faaa Author: Hugh Dickins Date: Fri Jan 29 17:46:34 2010 +0000 mm: fix migratetype bug which slowed swapping commit a7016235a61d520e6806f38129001d935c4b6661 upstream. After memory pressure has forced it to dip into the reserves, 2.6.32's 5f8dcc21211a3d4e3a7a5ca366b469fb88117f61 "page-allocator: split per-cpu list into one-list-per-migrate-type" has been returning MIGRATE_RESERVE pages to the MIGRATE_MOVABLE free_list: in some sense depleting reserves. Fix that in the most straightforward way (which, considering the overheads of alternative approaches, is Mel's preference): the right migratetype is already in page_private(page), but free_pcppages_bulk() wasn't using it. How did this bug show up? As a 20% slowdown in my tmpfs loop kbuild swapping tests, on PowerMac G5 with SLUB allocator. Bisecting to that commit was easy, but explaining the magnitude of the slowdown not easy. The same effect appears, but much less markedly, with SLAB, and even less markedly on other machines (the PowerMac divides into fewer zones than x86, I think that may be a factor). We guess that lumpy reclaim of short-lived high-order pages is implicated in some way, and probably this bug has been tickling a poor decision somewhere in page reclaim. But instrumentation hasn't told me much, I've run out of time and imagination to determine exactly what's going on, and shouldn't hold up the fix any longer: it's valid, and might even fix other misbehaviours. Signed-off-by: Hugh Dickins Acked-by: Mel Gorman Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 629527c562c1cfae09776c8baeb9a8a273dc10e6 Author: Al Viro Date: Mon Jan 25 18:44:58 2010 -0500 Fix failure exit in ipathfs commit 12e9a45609054fb83d4a8b716a5265cc1a393e10 upstream. deactivate_locked_super() will be done by caller of fill_super, doing it there as well is b0rken. Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit 30d3844a878b9d6adb2aa76961042f0c73c7de6c Author: Al Viro Date: Sun Jan 24 00:06:22 2010 -0500 fix affs parse_options() commit 217686e98321a4ff4c1a6cc535e511e37c5d2dbf upstream. Error handling in that sucker got broken back in 2003. If function returns 0 on failure, it's not nice to add return -EINVAL into it. Adding return 1 on other failure exits is also not a good thing (and yes, original success exits with 1 and some of failure exits with 0 are still there; so's the original logics in callers). Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit d842c31e636e5dbc85c3c75d1b964a6ff6e4daeb Author: Al Viro Date: Sun Jan 24 00:04:07 2010 -0500 Fix remount races with symlink handling in affs commit 29333920a5a46edcc9b728e2cf0134d5a9b516ee upstream. A couple of fields in affs_sb_info is used in follow_link() and symlink() for handling AFFS "absolute" symlinks. Need locking against affs_remount() updates. Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit 36a0a4afb2e996f59651a845e5680d2f80cc6f23 Author: Al Viro Date: Mon Jan 25 06:05:54 2010 -0500 fix leak in romfs_fill_super() commit 7e32b7bb734047c5e3cecf2e896b9cf8fc35d1e8 upstream. Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit 26d2257801281a5bd2833d8f22cebead57a4b4c6 Author: Al Viro Date: Mon Jan 25 06:16:19 2010 -0500 fix oops in fs/9p late mount failure commit 083c73c253c23c20359a344dfe1198ea628e6259 upstream. if 9P ->get_sb() fails late (at root inode or root dentry allocation), we'll hit its ->kill_sb() with NULL ->s_root Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit deb20f1c49d390d3fcb62fa9789486f170054004 Author: Al Viro Date: Sun Jan 24 00:52:22 2010 -0500 Fix failure exits in bfs_fill_super() commit 5998649f779b7148a8a0c10c46cfa99e27d34dfe upstream. double iput(), leaks... Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit 703c300c7415c0a2f25dbd7d2f8773a5abd84099 Author: Al Viro Date: Sat Jan 23 23:38:27 2010 -0500 Fix a leak in affs_fill_super() commit afc70ed05a07bfe171f7a5b8fdc80bdb073d314f upstream. Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit 61d4374b51386dd40c03fd15df5a7f97347de688 Author: Zhenyu Wang Date: Thu Dec 17 16:12:56 2009 +0800 drm/i915: Reload hangcheck timer too for Ironlake commit c566ec49159b806db95a90fd8f37448376cd0ad2 upstream. Make sure hangcheck timer won't beat us unexpectedly on Ironlake. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit f0b4195748d200d4475e1ca976e7cabaf17e7c44 Author: Jesse Brandeburg Date: Fri Jan 22 22:56:16 2010 +0000 e1000/e1000e: don't use small hardware rx buffers commit 9926146b15fd96d78a4f7c32e7a26d50639369f4 upstream. When testing the "e1000: enhance frame fragment detection" (and e1000e) patches we found some bugs with reducing the MTU size. The 1024 byte descriptor used with the 1000 mtu test also (re) introduced the (originally) reported bug, and causes us to need the e1000_clean_tx_irq "enhance frame fragment detection" fix. So what has occured here is that 2.6.32 is only vulnerable for mtu < 1500 due to the jumbo specific routines in both e1000 and e1000e. So, 2.6.32 needs the 2kB buffer len fix for those smaller MTUs, but is not vulnerable to the original issue reported. It has been pointed out that this vulnerability needs to be patched in older kernels that don't have the e1000 jumbo routine. Without the jumbo routines, we need the "enhance frame fragment detection" fix the e1000, old e1000e is only vulnerable for < 1500 mtu, and needs a similar fix. We split the patches up to provide easy backport paths. There is only a slight bit of extra code when this fix and the original "enhance frame fragment detection" fixes are applied, so please apply both, even though it is a bit of overkill. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit b9ad9bb6350ddfb943e30ddd9ece9d349f7b374d Author: Jesse Brandeburg Date: Tue Jan 19 14:15:59 2010 +0000 e1000e: enhance frame fragment detection commit b94b50289622e816adc9f94111cfc2679c80177c upstream. Originally patched by Neil Horman e1000e could with a jumbo frame enabled interface, and packet split disabled, receive a packet that would overflow a single rx buffer. While in practice very hard to craft a packet that could abuse this, it is possible. this is related to CVE-2009-4538 Signed-off-by: Jesse Brandeburg CC: Neil Horman Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit dff2267e0c21d0d478b29bc921e8ec4f0ea462e6 Author: Jesse Brandeburg Date: Tue Jan 19 14:15:38 2010 +0000 e1000: enhance frame fragment detection commit 40a14deaf411592b57cb0720f0e8004293ab9865 upstream. Originally From: Neil Horman Modified by: Jesse Brandeburg Hey all- A security discussion was recently given: http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html And a patch that I submitted awhile back was brought up. Apparently some of their testing revealed that they were able to force a buffer fragment in e1000 in which the trailing fragment was greater than 4 bytes. As a result the fragment check I introduced failed to detect the fragement and a partial invalid frame was passed up into the network stack. I've written this patch to correct it. I'm in the process of testing it now, but it makes good logical sense to me. Effectively it maintains a per-adapter state variable which detects a non-EOP frame, and discards it and subsequent non-EOP frames leading up to _and_ _including_ the next positive-EOP frame (as it is by definition the last fragment). This should prevent any and all partial frames from entering the network stack from e1000. Signed-off-by: Jesse Brandeburg Acked-by: Neil Horman Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit cfc7e54cd19cabdadf803be3d6a04d89f2663aa5 Author: Mika Westerberg Date: Tue Jan 26 17:47:05 2010 +0200 UBI: fix volume creation input checking commit c5ce5b46af76f52dea21f467397d24c4ae6cb3ff upstream. Do not use an unchecked variable UBI_IOCMKVOL ioctl. Signed-off-by: Mika Westerberg Signed-off-by: Artem Bityutskiy Signed-off-by: Greg Kroah-Hartman commit 3b4f785d6fd9df90b783e9a6ce9414884877593e Author: Zhao Yakui Date: Fri Jan 8 21:29:58 2010 +0800 ACPI: Advertise to BIOS in _OSC: _OST on _PPC changes commit 6a4e2b7503d1f630bface040cf0f5a7aac1fabdb upstream. If the BIOS pokes the system-wide OSC bits to see if Linux supports evaluating _OST after a _PPC change notification, answer yes. Also, fix an oversight where we neglected to set the OSC bit advertising processor aggregator device support when acpi-pad is compiled as a module. Signed-off-by: Zhao Yakui Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 0d48a1a716844bc72f0e105418261024c75ce494 Author: Shaohua Li Date: Wed Dec 23 17:04:11 2009 +0800 ACPI: fix OSC regression that caused aer and pciehp not to load commit 9dc130fccb874f2959ef313d7922d306dc6d4f75 upstream. Executing _OSC returns a buffer, which has an acpi object in it. Don't directly returns the buffer, instead, we return the acpi object's buffer. This fixes a regression since caller of acpi_run_osc expects an acpi object's buffer returned. Tested-by: Yinghai Lu Signed-off-by: Shaohua Li Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 1a52addab3426e94879ce3638cb9daf9058d48fd Author: Shaohua Li Date: Thu Oct 29 11:05:05 2009 +0800 ACPI: Add platform-wide _OSC support. commit 3563ff964fdc36358cef0330936fdac28e65142a upstream. Signed-off-by: Shaohua Li Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit e62a96c8317c306d81ba5c690bf8f1be10e6cad9 Author: Shaohua Li Date: Thu Oct 29 11:04:28 2009 +0800 ACPI: Add a generic API for _OSC -v2 commit 70023de88c58a81a730ab4d13c51a30e537ec76e upstream. v2->v1: .improve debug info as suggedted by Bjorn,Kenji .API is using uuid string as suggested by Alexey Add an API to execute _OSC. A lot of devices can have this method, so add a generic API. Signed-off-by: Shaohua Li Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 1e8896049716fd580718bb9431c2ad3bddd114d7 Author: Stefan Haberland Date: Wed Jan 27 10:12:35 2010 +0100 dasd: fix possible NULL pointer errors commit 294001a80c9810e2fe27aaaad7df8be12a103065 upstream. Fix possible NULL pointer in DASD messages and correct discipline checking. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit 083beff011df31d82abe859479ab6c33af5504f5 Author: Felix Beck Date: Wed Jan 27 10:12:39 2010 +0100 zcrypt: Do not remove coprocessor for error 8/72 commit 19b123ebacacdce5e75045bfe82122b01c821a5b upstream. In a case where the number of the input data is bigger than the modulus of the key, the coprocessor adapters will report an 8/72 error. This case is not caught yet, thus the adapter will be taken offline. To prevent this, we return an -EINVAL instead. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit 63693ee86b7ebdcf8f08a40158782b6751bda3fc Author: Tejun Heo Date: Thu Jan 14 16:18:09 2010 +0900 libata: retry FS IOs even if it has failed with AC_ERR_INVALID commit 534ead709235b967b659947c55d9130873a432c4 upstream. libata currently doesn't retry if a command fails with AC_ERR_INVALID assuming that retrying won't get it any further even if retried. However, a failure may be classified as invalid through hardware glitch (incorrect reading of the error register or firmware bug) and there isn't whole lot to gain by not retrying as actually invalid commands will be failed immediately. Also, commands serving FS IOs are extremely unlikely to be invalid. Retry FS IOs even if it's marked invalid. Transient and incorrect invalid failure was seen while debugging firmware related issue on Samsung n130 on bko#14314. http://bugzilla.kernel.org/show_bug.cgi?id=14314 Signed-off-by: Tejun Heo Reported-by: Johannes Stezenbach Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit 8c2cd3f39601fee6837727cb85c36dd19a083e0f Author: H. Peter Anvin Date: Sat Jan 23 18:27:47 2010 -0800 x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG) commit b160091802d4a76dd063facb09fcf10bf5d5d747 upstream. CONFIG_X86_CPU_DEBUG, which provides some parsed versions of the x86 CPU configuration via debugfs, has caused boot failures on real hardware. The value of this feature has been marginal at best, as all this information is already available to userspace via generic interfaces. Causes crashes that have not been fixed + minimal utility -> remove. See the referenced LKML thread for more information. Reported-by: Ozan ��a��layan Signed-off-by: H. Peter Anvin LKML-Reference: Cc: Jaswinder Singh Rajput Cc: Linus Torvalds Cc: Rafael J. Wysocki Cc: Yinghai Lu Signed-off-by: Greg Kroah-Hartman commit b5b39c3961de96c8c82e2642f2174b3c41cb4327 Author: David Rientjes Date: Wed Jan 20 12:10:47 2010 -0800 x86: Set hotpluggable nodes in nodes_possible_map commit 3a5fc0e40cb467e692737bc798bc99773c81e1e2 upstream. nodes_possible_map does not currently include nodes that have SRAT entries that are all ACPI_SRAT_MEM_HOT_PLUGGABLE since the bit is cleared in nodes_parsed if it does not have an online address range. Unequivocally setting the bit in nodes_parsed is insufficient since existing code, such as acpi_get_nodes(), assumes all nodes in the map have online address ranges. In fact, all code using nodes_parsed assumes such nodes represent an address range of online memory. nodes_possible_map is created by unioning nodes_parsed and cpu_nodes_parsed; the former represents nodes with online memory and the latter represents memoryless nodes. We now set the bit for hotpluggable nodes in cpu_nodes_parsed so that it also gets set in nodes_possible_map. [ hpa: Haicheng Li points out that this makes the naming of the variable cpu_nodes_parsed somewhat counterintuitive. However, leave it as is in the interest of keeping the pure bug fix patch small. ] Signed-off-by: David Rientjes Tested-by: Haicheng Li LKML-Reference: Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 76e789c066a7d65c180e916c0d74227fbe3e0b05 Author: Martin Schwidefsky Date: Wed Jan 27 10:12:40 2010 +0100 S390: fix single stepped svcs with TRACE_IRQFLAGS=y commit 21ec7f6dbf10492ce9a21718040677d3e68bd57d upstream. If irq flags tracing is enabled the TRACE_IRQS_ON macros expands to a function call which clobbers registers %r0-%r5. The macro is used in the code path for single stepped system calls. The argument registers %r2-%r6 need to be restored from the stack before the system call function is called. Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit 16a2ae6eb112b506ca1e464d848e684f6f90dadc Author: Stefan Richter Date: Tue Jan 26 21:39:07 2010 +0100 firewire: ohci: fix crashes with TSB43AB23 on 64bit systems commit 7a481436787cbc932af6c407b317ac603969a242 upstream. Unsurprisingly, Texas Instruments TSB43AB23 exhibits the same behaviour as TSB43AB22/A in dual buffer IR DMA mode: If descriptors are located at physical addresses above the 31 bit address range (2 GB), the controller will overwrite random memory. With luck, this merely prevents video reception. With only a little less luck, the machine crashes. We use the same workaround here as with TSB43AB22/A: Switch off the dual buffer capability flag and use packet-per-buffer IR DMA instead. Another possible workaround would be to limit the coherent DMA mask to 31 bits. In Linux 2.6.33, this change serves effectively only as documentation since dual buffer mode is not used for any controller anymore. But somebody might want to re-enable it in the future to make use of features of dual buffer DMA that are not available in packet-per-buffer mode. In Linux 2.6.32 and older, this update is vital for anyone with this controller, more than 2 GB RAM, a 64 bit kernel, and FireWire video or audio applications. We have at least four reports: http://bugzilla.kernel.org/show_bug.cgi?id=13808 http://marc.info/?l=linux1394-user&m=126154279004083 https://bugzilla.redhat.com/show_bug.cgi?id=552142 http://marc.info/?l=linux1394-user&m=126432246128386 Reported-by: Paul Johnson Reported-by: Ronneil Camara Reported-by: G Zornetzer Reported-by: Mark Thompson Signed-off-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman commit d8e0902806c0bd2ccc4f6a267ff52565a3ec933b Author: Chris Wilson Date: Wed Jan 27 13:36:32 2010 +0000 drm/i915: Selectively enable self-reclaim commit 4bdadb9785696439c6e2b3efe34aa76df1149c83 upstream. Having missed the ENOMEM return via i915_gem_fault(), there are probably other paths that I also missed. By not enabling NORETRY by default these paths can run the shrinker and take memory from the system (but not from our own inactive lists because our shrinker can not run whilst we hold the struct mutex) and this may allow the system to survive a little longer whilst our drivers consume all available memory. References: OOM killer unexpectedly called with kernel 2.6.32 http://bugzilla.kernel.org/show_bug.cgi?id=14933 v2: Pass gfp into page mapping. v3: Use new read_cache_page_gfp() instead of open-coding. Signed-off-by: Chris Wilson Cc: KOSAKI Motohiro Cc: Hugh Dickins Cc: Jesse Barnes Cc: Eric Anholt Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 8268c0bce9f4df836265ac5c7982ff8f8808f199 Author: Linus Torvalds Date: Wed Jan 27 09:20:03 2010 -0800 mm: add new 'read_cache_page_gfp()' helper function commit 0531b2aac59c2296570ac52bfc032ef2ace7d5e1 upstream. It's a simplified 'read_cache_page()' which takes a page allocation flag, so that different paths can control how aggressive the memory allocations are that populate a address space. In particular, the intel GPU object mapping code wants to be able to do a certain amount of own internal memory management by automatically shrinking the address space when memory starts getting tight. This allows it to dynamically use different memory allocation policies on a per-allocation basis, rather than depend on the (static) address space gfp policy. The actual new function is a one-liner, but re-organizing the helper functions to the point where you can do this with a single line of code is what most of the patch is all about. Tested-by: Chris Wilson Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit b7a9d922a59d221ec2cfd15fb2fc317f2c742bdc Author: Anatolij Gustschin Date: Sat Dec 12 14:52:21 2009 +0100 mptsas: Fix issue with chain pools allocation on katmai commit f1053a7ca9ce095d95bcc1cf41684c5e4f3e7751 upstream. Since commit 9d2e9d66a3f032667934144cd61c396ba49f090d mptsas driver fails to allocate memory for the MPT chain buffers for second LSI adapter on PPC440SPe Katmai platform: ... ioc1: LSISAS1068E B3: Capabilities={Initiator} mptbase: ioc1: ERROR - Unable to allocate Reply, Request, Chain Buffers! mptbase: ioc1: ERROR - didn't initialize properly! (-3) mptsas: probe of 0002:31:00.0 failed with error -3 This commit increased MPT_FC_CAN_QUEUE value but initChainBuffers() doesn't differentiate between SAS and FC causing increased allocation for SAS case, too. Later pci_alloc_consistent() fails to allocate increased chain buffer pool size for SAS case. Provide a fix by looking at the bus type and using appropriate MPT_SAS_CAN_QUEUE value while calculation of the number of chain buffers. Signed-off-by: Anatolij Gustschin Acked-by: Kashyap Desai Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit e15fca01ba2678b5db6c29b79d142d73272cfb7b Author: Boaz Harrosh Date: Tue Dec 15 17:25:43 2009 +0200 scsi_lib: Fix bug in completion of bidi commands commit 63c43b0ec1765b74c734d465ba6345ef4f434df8 upstream. Because of the terrible structuring of scsi-bidi-commands it breaks some of the life time rules of a scsi-command. It is now not allowed to free up the block-request before cleanup and partial deallocation of the scsi-command. (Which is not so for none bidi commands) The right fix to this problem would be to make bidi command a first citizen by allocating a scsi_sdb pointer at scsi command just like cmd->prot_sdb. The bidi sdb should be allocated/deallocated as part of the get/put_command (Again like the prot_sdb) and the current decoupling of scsi_cmnd and blk-request should be kept. For now make sure scsi_release_buffers() is called before the call to blk_end_request_all() which might cause the suicide of the block requests. At best the leak of bidi buffers, at worse a crash, as there is a race between the existence of the bidi_request and the free of the associated bidi_sdb. The reason this was never hit before is because only OSD has the potential of doing asynchronous bidi commands. (So does bsg but it is never used) And OSD clients just happen to do all their bidi commands synchronously, up until recently. Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 24152b5a73c80ab1b5c75e712cfbb9fd7f61815b Author: Shan-Fu Chiou Date: Mon Sep 29 18:48:01 2008 -0700 pca963x: Phillips PCA963X 4-bit i2c led driver Signed-off-by: Rebecca Schultz commit 197d3f06e732a0428701c4f3550b91f9fc1297ab Author: Brian Swetland Date: Wed Jan 28 20:45:48 2009 -0800 HACK stay compatible with the emulated TLS register HACK commit f9d6d7703fca9b9d5d92c6e71ed4263220059884 Author: San Mehat Date: Sat Oct 10 09:35:24 2009 -0700 block: genhd: Add disk/partition specific uevent callbacks for partition info For disk devices, a new uevent parameter 'NPARTS' specifies the number of partitions detected by the kernel. Partition devices get 'PARTN' which specifies the partitions index in the table. Signed-off-by: San Mehat commit beb070f3d41fb82c69c6dcec1293817c7c788d10 Author: Jocelyn Falempe Date: Tue Sep 22 14:27:24 2009 +0200 cpufreq: ondemand: Don't synchronize sample rate unless mulitple cpus present For UP systems this is not required, and results in a more consistent sample interval. Signed-off-by: Jocelyn Falempe Signed-off-by: Mike Chan commit 6bb28b20afd42640ea80bcaabe4c24c3a8fe87e1 Author: Arve Hj��nnev��g Date: Wed Jan 6 17:17:33 2010 -0800 Staging: android: timed_gpio: Request gpios. Change-Id: I9e98250a04e5505ce2db2edd355e8fdf8391cabd Signed-off-by: Arve Hj��nnev��g commit 1d2b49700cbcfb109e2cfb0e6003e1c77370b5ce Author: Arve Hj��nnev��g Date: Thu Dec 17 23:42:08 2009 -0800 Staging: android: ram_console: Start ram console earlier Change-Id: I15d809d8c3002e5bf397a2b154e3803ea0e73642 Signed-off-by: Arve Hj��nnev��g commit b4c785a83a24830838f3293ff3e8ff5354509a66 Author: Tom Zhu Date: Thu Sep 24 10:58:50 2009 -0500 misc: apanic: erase kpanic when no data erase kpanic partition when there is no data(console and thread) Signed-off-by: Tom Zhu Signed-off-by: San Mehat commit 03d778875b93d95217990e3e420252a2ed7fa3a8 Author: Tom Zhu Date: Mon Sep 21 16:36:05 2009 -0500 misc: apanic: bad block handling Add bad block handling in apanic Signed-off-by: Tom Zhu Signed-off-by: San Mehat misc: apanic: Improved bad-block / watchdog handling 1. handle cases that there is no more good blocks 2. touch softlockup watchdog at the start of apanic 3. change unsigned char get_bb() to unsigned int get_bb() 4. return idx instead of rc2, to keep the previous written pages. Signed-off-by: Tom Zhu Signed-off-by: San Mehat commit 05ec8148bda5d0206e82eba2357138cc9f02705b Author: San Mehat Date: Thu Sep 17 14:27:41 2009 -0700 ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads Signed-off-by: San Mehat commit 4360c491027cc03cb055b9d1781e5c41b2f1cdd5 Author: San Mehat Date: Tue Sep 1 13:43:01 2009 -0700 drivers: apanic: Android kernel panic handler. This driver triggers when the kernel panics and attempts to write critical debug data to the flash. Signed-off-by: San Mehat drivers: apanic: checkpatch fixes Signed-off-by: San Mehat apanic: Fix a few cases of calling non-atomic things from atomic We need to pay special care to not enrage cond_resched(), and the base nand bb stuff calls schedule() so thats out. Signed-off-by: San Mehat commit 5c438f06fd4a07cad15cd6b59da4036f62efd990 Author: San Mehat Date: Wed Sep 16 12:39:10 2009 -0700 proc: smaps: Allow smaps access for CAP_SYS_RESOURCE Signed-off-by: San Mehat commit 90bb75ece868932904865ea46e61b78e5a987224 Author: San Mehat Date: Thu Aug 6 10:25:21 2009 -0700 kernel: printk: Add non exported function for clearing the log ring buffer Signed-off-by: San Mehat commit 4992adfafb41fc41427935911378210ac3243229 Author: San Mehat Date: Tue Aug 25 16:52:22 2009 -0700 [ARM] process: Add display of memory around registers when displaying regs. This is extremely useful in diagnosing remote crashes, and is based heavily on original work by . Signed-off-by: San Mehat Cc: Michael Davidson [ARM] process: Use uber-safe probe_kernel_address() to read mem when dumping. This prevents the dump from taking pagefaults / external aborts. Signed-off-by: San Mehat commit a431be40b097bb30ac0766b46364c041f99a9e11 Author: San Mehat Date: Thu Aug 20 10:50:45 2009 -0700 mtd: nand: Add naieve panic_write support for generic nand devices. Signed-off-by: San Mehat mtd: nand_base: fix nand_panic_wait fix the problem of nand_panic_wait Signed-off-by: Tom Zhu Signed-off-by: San Mehat commit d20c38c796134b43b46dc97faf9d09d3df437041 Author: San Mehat Date: Thu Aug 13 09:40:42 2009 -0700 drivers: power: Add watchdog timer to catch drivers which lockup during suspend. Rather than hard-lock the kernel, we now BUG() when a driver takes > 3 seconds to suspend. If the underlying platform supports panic dumps, then the data can be collected for debug. Signed-off-by: San Mehat commit c09426ea439387637204ccebafd6cd7f02065e62 Author: Nick Pelly Date: Thu Feb 4 09:06:57 2010 -0800 Bluetooth: Hack: Do not use power_save feature. power_save is a feature to allow HID devices to control the sniff mode. Unfortunately it also prevents us exiting sniff mode on some A2DP devices that do not explicitly exit sniff mode themselves, resulting in skipping audio. Marcel is trying to finalize a setsockopt() API to control whether power_save is enabled on a per socket basis. In the mean-time, turn off power_save for Android, since we do not have official HID support, and this is causing problems for A2DP which we do support. (Note the power_save logic is reversed, 0 is on, 1 is off). Change-Id: Ife4478055128b81669bf49308d2e2199e1aa11a1 Signed-off-by: Nick Pelly commit d7897fd1e9fb3a5df0740dc2dc45ec94ca0965f2 Author: Nick Pelly Date: Tue Dec 8 19:42:21 2009 -0800 Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets. With Bluetooth 2.1 ACL packets can be flushable or non-flushable. This changes makes the default ACL packet non-flushable, and allows selection of flushable packets on a per-L2CAP socket basis with L2CAP_LM_FLUSHABLE. Note the HCI Write Automatic Flush Timeout command also needs to be issued to set the flush timeout to non-zero. Need to featurize this change to Bluetooth 2.1 chipsets only before pushing upstream. Signed-off-by: Nick Pelly commit 7b75ff3c3f0b0014dd22c1db05ca916cd4b886e8 Author: Nick Pelly Date: Wed Dec 9 00:15:41 2009 -0800 Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info. This provides userspace debugging tools access to ACL flow control state. Signed-off-by: Nick Pelly commit 8fd3238575a5410507846838dbb2d4553f3f5aa2 Author: Nick Pelly Date: Fri Nov 13 14:16:32 2009 -0800 Bluetooth: Enter active mode before establishing a SCO link. When in sniff mode with a long interval time (1.28s) it can take 4+ seconds to establish a SCO link. Fix by requesting active mode before requesting SCO connection. This improves SCO setup time to ~500ms. Bluetooth headsets that use a long interval time, and exhibit the long SCO connection time include Motorola H790, HX1 and H17. They have a CSR 2.1 chipset Verified this behavior and fix with host Bluetooth chipsets: BCM4329 and TI1271. Signed-off-by: Nick Pelly commit df28bc9c1957170dbf796063853a4a1aee1af6ac Author: Nick Pelly Date: Tue Sep 22 15:19:46 2009 -0700 Bluetooth: Fallback to SCO on error code 0x10 (Connection Accept Timeout). This is to support the Motorola HF850 carkit which reports the error code 0x10 for an eSCO attempt, even though it advertises eSCO support. Here is the hcidump: 2009-09-22 15:40:24.492391 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17 handle 1 voice setting 0x0060 2009-09-22 15:40:24.493002 > HCI Event: Command Status (0x0f) plen 4 Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1 2009-09-22 15:40:30.594869 > HCI Event: Synchronous Connect Complete (0x2c) plen 17 status 0x10 handle 257 bdaddr 00:50:CD:20:C6:84 type eSCO Error: Connection Accept Timeout Exceeded With this patch we will retry with a SCO connection, which succeeds. Unfortunately the Moto HF850 also takes 5 seconds to return the error for the eSCO attempt, so it will still take 5 seconds to fallback to SCO with this patch. Signed-off-by: Nick Pelly commit 43a3de3be869aa4417817b94b7dde35267951418 Author: Nick Pelly Date: Mon Sep 21 18:20:03 2009 -0700 Bluetooth: Do not call rfcomm_session_put() due to RFCOMM UA on closed socket. Processing a RFCOMM UA frame when the socket is closed and we were not the RFCOMM initiator would cause rfcomm_session_put() to be called twice during rfcomm_process_rx(). This would cause a kernel panic in rfcomm_session_close. This could be easily reproduced during disconnect with devices such as Motorola H270 that send RFCOMM UA followed quickly by L2CAP disconnect request. This hcidump for this looks like: 2009-09-21 17:22:37.788895 < ACL data: handle 1 flags 0x02 dlen 8 L2CAP(d): cid 0x0041 len 4 [psm 3] RFCOMM(s): DISC: cr 0 dlci 20 pf 1 ilen 0 fcs 0x7d 2009-09-21 17:22:37.906204 > HCI Event: Number of Completed Packets (0x13) plen 5 handle 1 packets 1 2009-09-21 17:22:37.933090 > ACL data: handle 1 flags 0x02 dlen 8 L2CAP(d): cid 0x0040 len 4 [psm 3] RFCOMM(s): UA: cr 0 dlci 20 pf 1 ilen 0 fcs 0x57 2009-09-21 17:22:38.636764 < ACL data: handle 1 flags 0x02 dlen 8 L2CAP(d): cid 0x0041 len 4 [psm 3] RFCOMM(s): DISC: cr 0 dlci 0 pf 1 ilen 0 fcs 0x9c 2009-09-21 17:22:38.744125 > HCI Event: Number of Completed Packets (0x13) plen 5 handle 1 packets 1 2009-09-21 17:22:38.763687 > ACL data: handle 1 flags 0x02 dlen 8 L2CAP(d): cid 0x0040 len 4 [psm 3] RFCOMM(s): UA: cr 0 dlci 0 pf 1 ilen 0 fcs 0xb6 2009-09-21 17:22:38.783554 > ACL data: handle 1 flags 0x02 dlen 12 L2CAP(s): Disconn req: dcid 0x0040 scid 0x0041 Avoid calling rfcomm_session_put() twice by skipping this call in rfcomm_recv_ua() if the socket is closed. Signed-off-by: Nick Pelly commit 1f39bbdd42999892f5f6ef8aeb03b3fff6d1ebd6 Author: Nick Pelly Date: Fri Sep 18 18:29:23 2009 -0700 Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds. Legacy pairing is a bit of a problem because on the incoming end it is impossible to know pairing has begun: 2009-09-18 18:29:24.115692 > HCI Event: Connect Request (0x04) plen 10 bdaddr 00:23:D4:04:51:7A class 0x58020c type ACL 2009-09-18 18:29:24.115966 < HCI Command: Accept Connection Request (0x01|0x0009) plen 7 bdaddr 00:23:D4:04:51:7A role 0x00 Role: Master 2009-09-18 18:29:24.117065 > HCI Event: Command Status (0x0f) plen 4 Accept Connection Request (0x01|0x0009) status 0x00 ncmd 1 2009-09-18 18:29:24.282928 > HCI Event: Role Change (0x12) plen 8 status 0x00 bdaddr 00:23:D4:04:51:7A role 0x00 Role: Master 2009-09-18 18:29:24.291534 > HCI Event: Connect Complete (0x03) plen 11 status 0x00 handle 1 bdaddr 00:23:D4:04:51:7A type ACL encrypt 0x00 2009-09-18 18:29:24.291839 < HCI Command: Read Remote Supported Features (0x01|0x001b) plen 2 handle 1 2009-09-18 18:29:24.292144 > HCI Event: Page Scan Repetition Mode Change (0x20) plen 7 bdaddr 00:23:D4:04:51:7A mode 1 2009-09-18 18:29:24.293823 > HCI Event: Command Status (0x0f) plen 4 Read Remote Supported Features (0x01|0x001b) status 0x00 ncmd 1 2009-09-18 18:29:24.303588 > HCI Event: Max Slots Change (0x1b) plen 3 handle 1 slots 5 2009-09-18 18:29:24.309448 > HCI Event: Read Remote Supported Features (0x0b) plen 11 status 0x00 handle 1 Features: 0xff 0xff 0x2d 0xfe 0x9b 0xff 0x79 0x83 2009-09-18 18:29:24.345916 < HCI Command: Remote Name Request (0x01|0x0019) plen 10 bdaddr 00:23:D4:04:51:7A mode 2 clkoffset 0x0000 2009-09-18 18:29:24.346923 > HCI Event: Command Status (0x0f) plen 4 Remote Name Request (0x01|0x0019) status 0x00 ncmd 1 2009-09-18 18:29:24.375793 > HCI Event: Remote Name Req Complete (0x07) plen 255 status 0x00 bdaddr 00:23:D4:04:51:7A name 'test' 2009-09-18 18:29:34.332190 < HCI Command: Disconnect (0x01|0x0006) plen 3 handle 1 reason 0x13 There are some mainline patches such as "Add different pairing timeout for Legacy Pairing" but they do not address the HCI sequence above. I think the real solution is to avoid using CreateBond(), and instead make the profile connection immediately. This way both sides will use a longer timeout because there is a higher level connection in progress, and we will not end up with the useless HCI sequence above. Signed-off-by: Nick Pelly commit 8787099ec0143e0973165b3d9b0a88525a738639 Author: Nick Pelly Date: Fri Aug 14 11:36:19 2009 -0700 Bluetooth: Fallback from eSCO to SCO on error code 0x1a (unsupported feature). GM carkits with LGE BT chipsets return this error code when eSCO is attempted. Signed-off-by: Jaikumar Ganesh Acked-by: Nick Pelly commit 8a4424765e8daaf56a2d8a0e0ab9dfcf859879fa Author: Nick Pelly Date: Thu Jul 9 12:23:44 2009 -0700 Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG. This fixes a bug where shutdown() and close() on a rfcomm socket during ACL connection would not cause HCI Create Connection Cancel. Signed-off-by: Nick Pelly commit f5353976c6a13732718b472ad308af1bb997f025 Author: San Mehat Date: Wed Jul 29 20:21:28 2009 -0700 serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data. Signed-off-by: San Mehat commit 3431d2fb2dc6e731081e1b7203953b63fe5ad373 Author: Nick Pelly Date: Thu Dec 4 17:37:05 2008 -0800 rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down Some platforms do not want to power down rfkill devices on suspend. Change-Id: I62a11630521c636d54a4a02ab9037a43435925f5 Signed-off-by: Nick Pelly commit 6adc27186cf59e8d50e96f6873002f081ee2d111 Author: Nick Pelly Date: Thu Jun 11 10:49:48 2009 -0700 wl127x-rfkill: Add power control driver for TI WL127X Bluetooth chips Signed-off-by: Nick Pelly commit 25049b34a868c08147f8eca23d64945f74de0715 Author: Brian Swetland Date: Tue Apr 8 22:34:46 2008 -0700 kernel_debugger_core: add interrupt-context debugger core This provides kernel_debugger() which can be called from an interrupt context low level debugger wedge to execute commands that inspect kernel state. It doesn't do much on its own. Signed-off-by: Brian Swetland kernel_debugger_core: Add sysrq command. sysrq will run the sysrq command and dump what was added to the kernel log while the command ran. Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 8a3025c963926f1cc36b15f6b95b9da0c1ab1cdf Author: Arve Hj��nnev��g Date: Mon Apr 14 21:35:25 2008 -0700 printk: Fix log_buf_copy termination. If idx was non-zero and the log had wrapped, len did not get truncated to stop at the last byte written to the log. commit afa82e25d4d6ab6500828cd7cc9d395a9c1e5d69 Author: Arve Hj��nnev��g Date: Thu Jan 15 19:07:27 2009 -0800 Revert "printk: remove unused code from kernel/printk.c" This reverts commit acff181d3574244e651913df77332e897b88bff4. commit f9193a728ae53bf17792f3eebad07f89c2166c73 Author: Chia-chi Yeh Date: Tue Jun 30 11:23:04 2009 +0800 net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW). Signed-off-by: Chia-chi Yeh commit c30cd45aad4538d9433d691e62635ef8e2bcffaa Author: Chia-chi Yeh Date: Fri Jun 19 07:15:05 2009 +0800 security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable(). Signed-off-by: Chia-chi Yeh commit 286fcd1c1ed0003ba2bdbd26d1ffbe66f5980c85 Author: Chia-chi Yeh Date: Sat Jun 13 02:29:04 2009 +0800 net: PPPoPNS and PPPoLAC fixes. net: Fix a bitmask in PPPoPNS and rename constants in PPPoPNS and PPPoLAC. Signed-off-by: Chia-chi Yeh net: Fix a potential deadlock while releasing PPPoLAC/PPPoPNS socket. PPP driver guarantees that no thread will be executing start_xmit() after returning from ppp_unregister_channel(). To achieve this, a spinlock (downl) is used. In pppolac_release(), ppp_unregister_channel() is called after sk_udp is locked. At the same time, another thread might be running in pppolac_xmit() with downl. Thus a deadlock will occur if the thread tries to lock sk_udp. The same situation might happen on sk_raw in pppopns_release(). Signed-off-by: Chia-chi Yeh net: Force PPPoLAC and PPPoPNS to bind an interface before creating PPP channel. It is common to manipulate the routing table after configuring PPP device. Since both PPPoLAC and PPPoPNS run over IP, care must be taken to make sure that there is no loop in the routing table. Although this can be done by adding a host route, it might still cause problems when the interface is down for some reason. To solve this, this patch forces both drivers to bind an interface before creating PPP channel, so the system will not re-route the tunneling sockets to another interface when the original one is down. Another benefit is that now the host route is no longer required, so there is no need to remove it when PPP channel is closed. Signed-off-by: Chia-chi Yeh net: Avoid sleep-inside-spinlock in PPPoLAC and PPPoPNS. Since recv() and xmit() are called with a spinlock held, routines which might sleep cannot be used. This issue is solved by following changes: Incoming packets are now processed in backlog handler, recv_core(), instead of recv(). Since backlog handler is always executed with socket spinlock held, the requirement of ppp_input() is still satisfied. Outgoing packets are now processed in workqueue handler, xmit_core(), instead of xmit(). Note that kernel_sendmsg() is no longer used to prevent touching dead sockets. In release(), lock_sock() and pppox_unbind_sock() ensure that no thread is in recv_core() or xmit(). Then socket handlers are restored before release_sock(), so no packets will leak in backlog queue. Signed-off-by: Chia-chi Yeh net: Fix msg_iovlen in PPPoLAC and PPPoPNS. Although any positive value should work (which is always true in both drivers), the correct value should be 1. Signed-off-by: Chia-chi Yeh commit 7cc7c63e6272d939b82bbd6a3d081ed774f35ee2 Author: Chia-chi Yeh Date: Fri Jun 12 01:09:30 2009 +0800 net: add PPP on PPTP Network Server (PPPoPNS) driver. Signed-off-by: Chia-chi Yeh commit dbdb1c32784d0145fe545410e9771070e5dc702b Author: Chia-chi Yeh Date: Fri May 8 04:02:40 2009 +0800 net: add PPP on L2TP Access Concentrator (PPPoLAC) driver. Signed-off-by: Chia-chi Yeh commit 5038d42d2e60c855cf5b097197d95adaa1269d32 Author: San Mehat Date: Thu May 21 14:10:06 2009 -0700 cgroup: Add generic cgroup subsystem permission checks. Rather than using explicit euid == 0 checks when trying to move tasks into a cgroup via CFS, move permission checks into each specific cgroup subsystem. If a subsystem does not specify a 'can_attach' handler, then we fall back to doing our checks the old way. This way non-root processes can add arbitrary processes to a cgroup if all the registered subsystems on that cgroup agree. Also change explicit euid == 0 check to CAP_SYS_ADMIN Signed-off-by: San Mehat commit 703932d07237252c0aca76ab693463664f0a71a3 Author: Charles Manning Date: Tue Dec 8 12:40:28 2009 +1300 yaffs: Better control over rename shadowing The shadowing mechanism is used to ensure that the right interlocking happens when an object is renamed over an existing object. Extreme power fail stress testing revealed that garbage collection could disrupt the shadowing process causing object loss. This fixes the problem and has survived millions of simulated power failures. Change-Id: I1c9c4365632c0f8be4ed6a4b41534a732ea81507 Signed-off-by: Charles Manning commit ef330d560d9c3bb66ab1031af243b3171bba219f Author: Charles Manning Date: Tue Nov 17 07:49:32 2009 +1300 yaffs: Fix readdir hang. This aproach uses a search context iterator to allow yaffs to be unlocked during the filldir. The search context stores the next object to visited. If changes to the directory (ie unlinks) cause the directory to be modified then a callback moves the iterator to the next object if need be, thus preventing the iterator from being corrupted. Change-Id: Ia4735e42732f03a396ced7275e33facdc4f1beac Signed-off-by: Charles Manning commit 75e82381df19bcb8bf6681f3fe1a2a8360e6cddc Author: Charles Manning Date: Thu Nov 5 13:15:21 2009 +1300 Add handling for unrooted files Unrooted files should only happen due to a now fixed bug that would rmdir non-empty directories. Unrooted files are now re-rooted in lost_found. This also introduces a mechanism to empty out lost and found at mount, thus recaliming this space. This option may be controlled via a compile flag and overridden with a mount option. Signed-off-by: Charles Manning commit 8ff4860c2778c0be92a63808036de337d13fa864 Author: Charles Manning Date: Fri Oct 30 12:08:15 2009 +1300 Fix yaffs checkpoint out of space crash An ealy return from checkpoint opening caused the writing flag to be set incorrectly which caused the wrong execution path during the close. Also clean up space left behind by aborted checkpoints. Also jsut neaten up NULL handling. Signed-off-by: Charles Manning commit 4698f1ee43795d9b4b2c6a91c84e000c9bfee21b Author: Arve Hj��nnev��g Date: Thu Sep 17 14:52:42 2009 -0700 yaffs: Don't update page read and write counts from yaffs_mtdif2. These counters are now updated from yaffs_nand. Signed-off-by: Arve Hj��nnev��g commit 02a5a91a76ef89c9444cc04c309547f3be55cdc5 Author: Arve Hj��nnev��g Date: Wed Sep 16 18:30:41 2009 -0700 yaffs: Import yaffs from Wed Sep 9 03:03:01 2009 +0000 Author: charles Date: Wed Sep 9 03:03:01 2009 +0000 Rationalise stats gathering for nand access. Does not instrument mounting. Signed-off-by: Arve Hj��nnev��g commit 567940aa0a576440a6f64b8bb2517c378f6b6886 Author: Arve Hj��nnev��g Date: Wed May 6 17:37:10 2009 -0700 yaffs: Fix yaffs_file_write to not return -ENOSPC when there is nothing to write yaffs_write_end may get called with copied == 0 if the requested write was interrupted by a signal, but user-space will not restart the write if -ENOSPC is returned. Signed-off-by: Arve Hj��nnev��g commit a660ce8105791a9ef6b4cf4836cac073c8736442 Author: Arve Hj��nnev��g Date: Fri Apr 3 19:05:50 2009 -0700 yaffs: Update stats when using mtdif2. commit d7288aee1853ac9eda4e7bb7e6f723e545f5be0c Author: Arve Hj��nnev��g Date: Fri Apr 3 18:58:31 2009 -0700 yaffs: Pass through single bit errors from MTD. Signed-off-by: Arve Hj��nnev��g commit 1d5980b7f201b4eb9f013cdcd678f811f133526f Author: Arve Hj��nnev��g Date: Fri Oct 17 21:06:15 2008 -0700 yaffs: Set YAFFS_IGNORE_TAGS_ECC if compiled without ECC support. commit 4ee018b76663290410f82e50c5236fc9bf174d3f Author: Arve Hj��nnev��g Date: Fri Apr 3 17:45:58 2009 -0700 yaffs: Import yaffs from Tue Mar 17 01:12:00 2009 +0000 Author: wookey Date: Tue Mar 17 01:12:00 2009 +0000 This file escaped copyright date update. Fixed. commit 56788ee7bef1c0e32e1db3b0f315155c721dd818 Author: San Mehat Date: Sat Mar 21 18:48:54 2009 -0700 fs: block_dump: Don't display inode changes if block_dump < 2 Signed-off-by: San Mehat commit c6bebce007c71ffda935e1b4309b4eeb149f31bb Author: San Mehat Date: Sat Mar 21 18:48:05 2009 -0700 block: block_dump: Add number of sectors to debug output Signed-off-by: San Mehat commit 17a60bbffc14d01992f21313dae5b7ddde554152 Author: Dmitry Shmidt Date: Thu Dec 18 09:55:20 2008 -0800 tiwlan: Add abstract wifi control functions support commit 0ab69f47e172739fd499f09469fde6eb16e9287d Author: Mike Lockwood Date: Tue Jan 12 10:33:59 2010 -0800 USB: gadget: android: android USB gadget improvements: usb: gadget: f_mass_storage: use dev_set_name() Replacing strcpy() to device->bus_id which no longer exists in 2.6.32 Change-Id: Id978c881f457044c750bfd62f4c5bcc35bcd4fc5 Signed-off-by: Mike Lockwood USB: gadget: f_adb: Claim endpoints so they are not reused by another function. Change-Id: Ic9536cca800162e701c81cab36054f51ea759b72 Signed-off-by: Mike Lockwood USB: gadget: f_acm: Fix crashes in acm_set_alt() Change-Id: I91b761d392f8b1ca8784c69069b43e402b90d6a4 Signed-off-by: Mike Lockwood USB: gadget: f_acm: Include android code only if CONFIG_USB_ANDROID_ACM is set. Signed-off-by: Mike Lockwood USB: gadget: Android support for RNDIS serial ethernet function. Signed-off-by: Mike Lockwood USB: gadget: android: Add function name to android_register_function printk. Change-Id: I38bf79d9b544cdeaec9385f7482a131417fc4b23 Signed-off-by: Mike Lockwood commit 9bebaa516d632a1ac16aad0955dc8dd7897fdad9 Author: Mike Lockwood Date: Sat Dec 19 18:22:09 2009 -0500 USB: gadget: adb: Queue read requests with length specified by client. Previously we queued 4K requests rather than the count passed into read(). Signed-off-by: Mike Lockwood commit dd5acba95def6cd1fed0fcd9b047312f8ca8bef2 Author: Krishna, Vamsi Date: Wed Feb 11 21:07:20 2009 +0530 USB: gadget: android: android USB gadget improvements: USB: android gadget: add remote wakeup attribute to android function Add remote wakeup attribute to configuration descriptor of android function to advertise remote wakeup capability to host Acked-by: Allam, Suresh Reddy Signed-off-by: Mike Lockwood USB: gadget: android: Allow functions to handle setup requests. Signed-off-by: Mike Lockwood Support for specifying the list of USB functions from platform data. The main android.c gadget driver no longer has hard coded references to the mass_storage and adb functions. Support for computing the product ID based on tables in platform data and the currently enabled functions. Moved the adb enable/disable logic from android.c to f_adb.c. Change-Id: I6259d3fb1473ed973f700e55d17744956f3527bb Signed-off-by: Mike Lockwood commit 11d0a9ece74897740ffb987675c46adf1f782724 Author: Joe Swantek Date: Tue Dec 15 07:17:40 2009 -0500 USB: composite: Allow configurations to handle unhandled setup requests Signed-off-by: Mike Lockwood commit ee26eaf1392e4f38ed8d23047a6aa230d5a68188 Author: Mike Lockwood Date: Fri Dec 11 11:24:07 2009 -0500 USB: composite: Add flag to usb_function to hide its interface during enumeration Change-Id: Ie999b5190e3e2b6fd23015b8e796cdd178829929 Signed-off-by: Mike Lockwood commit 7558ae6cd0d401b863f8f8d63fee12348270d045 Author: Jared Suttles Date: Fri Aug 7 18:57:49 2009 -0500 USB: composite: Fix USB WHQL Certification Issues Submitted on behalf of RaviKumar Vembu Signed-off-by: Jared Suttles Signed-off-by: Mike Lockwood commit 5502501ffd887bfe047c1f3e1e36ac06b0f0e756 Author: Joe Swantek Date: Wed Jul 22 20:16:06 2009 -0500 drivers: usb: gadget: Add helper function for installing ACM gadget function. Submitted on behalf of James Luan Signed-off-by: Joe Swantek Signed-off-by: Mike Lockwood commit f355c97f4caa2f12b6561ccf2497c4860e47a572 Author: Jared Suttles Date: Thu Jul 30 16:13:27 2009 -0500 drivers: usb: gadget: handle NULL descriptors in composite config_buf This fixes a problem in enumeration after a gadget function is removed. Submitted on behalf of RaviKumar Vembu Signed-off-by: Jared Suttles Signed-off-by: Mike Lockwood commit 2c7c4829ac40fd18852a0c8bf0521a30a2ef2098 Author: Mike Lockwood Date: Tue Dec 2 22:01:33 2008 -0500 android_usb: Composite USB gadget driver for android. Signed-off-by: Mike Lockwood USB: android gadget: add remote wakeup attribute to android function Add remote wakeup attribute to configuration descriptor of android function to advertise remote wakeup capability to host Acked-by: Allam, Suresh Reddy Signed-off-by: Mike Lockwood usb gadget: link fixes for android composite gadget Signed-off-by: Mike Lockwood usb gadget: Fix null pointer errors in android composite driver Signed-off-by: Mike Lockwood usb: gadget: android: Allow usb charging to draw up to 500mA instead of 250. Signed-off-by: Rebecca Schultz Zavin usb gadget: android: Add helper function for usb_gadget_connect and disconnect. Signed-off-by: Mike Lockwood drivers: usb: gadget: call switch_dev_unregister in mass storage unbind callback This fixes a problem unloading the android gadget driver when built as a module Signed-off-by: Mike Lockwood usb: gadget: android: Add dependency on switch driver. Signed-off-by: Mike Lockwood USB: gadget: android: Fix USB WHQL Certification Issues Submitted on behalf of RaviKumar Vembu Signed-off-by: Jared Suttles Signed-off-by: Mike Lockwood drivers: usb: gadget: Add "usb_mass_storage" platform driver. This will be used for configuring vendor, product and release from board file. Submitted on behalf of RaviKumar Vembu Signed-off-by: Jared Suttles Signed-off-by: Mike Lockwood drivers: usb: gadget: Use usb_mass_storage platform device as parent for lun If a platform device is specified for the f_mass_storage function, use it as the parent driver for the lun files in sysfs. This allows a platform independent file path for controlling USB mass storage from user space. Signed-off-by: Mike Lockwood drivers: usb: gadget: Add platform data struct for usb_mass_storage device Signed-off-by: Mike Lockwood usb: gadget: mass_storage: Fix Mass Storage Panic during PC reboot Submitted on behalf of RaviKumar Vembu Signed-off-by: Jared Suttles Signed-off-by: Mike Lockwood usb: gadget: f_mass_storage: Handle setup request correctly Signed-off-by: Mike Lockwood usb: gadget: f_mass_storage: Clean up wakelocks on error paths Signed-off-by: Rebecca Schultz Zavin Signed-off-by: Mike Lockwood commit 79fe6726738e68f19d982213cdf8b7ff438d5157 Author: Dmitry Shmidt Date: Wed Feb 3 12:44:21 2010 -0800 drivers: mmc: Fix minimal frequency assignment Signed-off-by: Dmitry Shmidt commit f037ade21c3bd5a98460d9901ad987f497bc4ec3 Author: Adrian Hunter Date: Fri Jan 8 14:43:01 2010 -0800 mmc: allow for MMC v4.4 JEDEC eMMC specification version 4.4 (MMCA 4.4) defines Extended CSD structure versions up to 5. Signed-off-by: Adrian Hunter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat commit a895a6359c2dfa5a7571fd8c23811364aab503b6 Author: Adrian Hunter Date: Fri Jan 8 14:43:00 2010 -0800 mmc_block: fix queue cleanup The main bug was that 'blk_cleanup_queue()' was called while the block device could still be in use, for example, because the card was removed while files were still open. In addition, to be sure that 'mmc_request()' will get called for all new requests (so it can error them out), the queue is emptied during cleanup. This is done after the worker thread is stopped to avoid racing with it. Finally, it is not a device error for this to be happening, so quiet the (sometimes very many) error messages. Signed-off-by: Adrian Hunter Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat commit 28967844a184d9fe5ca613684c7f5065b616194f Author: Jarkko Lavinen Date: Fri Jan 8 14:42:59 2010 -0800 mmc_block: fix probe error cleanup bug If mmc_blk_set_blksize() fails mmc_blk_probe() the request queue and its thread have been set up and they need to be shut down properly before putting the disk. Signed-off-by: Jarkko Lavinen Signed-off-by: Adrian Hunter Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat commit 10cd61b99858ac55ff0a2674a416df01eb048165 Author: Anna Lemehova Date: Fri Jan 8 14:42:58 2010 -0800 mmc_block: add dev_t initialization check When a card is removed before mmc_blk_probe() has called add_disk(), then the minor field is uninitialized and has value 0. This caused mmc_blk_put() to always release devidx 0 even if 0 was still in use. Then the next mmc_blk_probe() used the first free idx of 0, which oopses in sysfs, since it is used by another card. Signed-off-by: Anna Lemehova Signed-off-by: Adrian Hunter Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: San Mehat commit 25c29cc964ec4d29370e8af7ae3b51f1f6a239ac Author: Daniel Chen Date: Wed Dec 9 09:45:36 2009 -0800 mmc: sdio: Add high speed support to sdio_reset_comm() Signed-off-by: San Mehat commit 94f9243a145376ef793dce987f4eeb42adf6f289 Author: David Ding Date: Fri Oct 9 06:38:10 2009 -0700 mmc: block: Resume multi-block reads after transient read errors. Signed-off-by: Bentao Zou Signed-off-by: David Ding Signed-off-by: San Mehat commit a7f4cf5b4cc1c0b5ba033a9324fbe9f74b90e04f Author: Dmitry Shmidt Date: Wed Jul 29 10:22:03 2009 -0700 mmc: sdio: Claim host in sdio_reset_comm() Signed-off-by: Dmitry Shmidt commit a31e8fffe82b08ace454b6190d60d31779ccf3d7 Author: San Mehat Date: Thu Jul 30 08:21:19 2009 -0700 mmc: mmcblk: Add support for deferred SD bus resume Signed-off-by: San Mehat mmc: card: Add MMC_BLOCK_DEFERRED_RESUME option to Kconfig Signed-off-by: San Mehat commit 40594a00454a1771286d86a8b3230ae5dba1a875 Author: San Mehat Date: Thu Jul 30 07:55:28 2009 -0700 mmc: core: Add deferred bus resume policy. A card driver can now specify that the underlying bus should *not* auto-resume with the rest of the system. This is useful for reducing resume latency as well as saving power when the card driver is not using the bus. In the future, we'll add support for manual suspend Signed-off-by: San Mehat commit 126f493e6b281b802471ce475c83c5a6ae58e26d Author: San Mehat Date: Mon Mar 23 12:20:37 2009 -0700 mmc: core: Hold a wake lock accross delayed work + mmc rescan Signed-off-by: San Mehat mmc: core: Rework mmc_delayed_work wakelock so that the wakelock is only extended if a card is added or removed. Signed-off-by: San Mehat commit 5b23a96fd66d13f00315d5d46f2b399464707a90 Author: San Mehat Date: Thu Dec 4 11:18:00 2008 -0800 mmc: sd: Add retries in re-detection Signed-off-by: San Mehat mmc: sd: Remove debugging printk Signed-off-by: Dima Zavin commit c7e87866b25cb49a830c85b0206436a7b0e3e40b Author: San Mehat Date: Mon Dec 1 08:52:34 2008 -0800 mmc: sd: When resuming, try a little harder to init the card Signed-off-by: San Mehat commit b6c5dbe49bdfd8f814243e7b7922167e9fbc853b Author: San Mehat Date: Thu May 15 09:15:37 2008 -0700 mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device Signed-off-by: San Mehat commit 8c542b3a4e7855926d7b9f533492eede643ff0ff Author: Dmitry Shmidt Date: Tue Nov 11 11:22:38 2008 -0800 trout: Add functions for WiFi commit 6558addc2ad78c412d6791544305256d5f90784c Author: San Mehat Date: Mon Apr 14 15:22:49 2008 -0700 mmc: Add concept of an 'embedded' SDIO device. This is required to support chips which use SDIO for signaling/ communication but do not implement the various card enumeration registers as required for full SD / SDIO cards. mmc: sdio: Fix bug where we're freeing the CIS tables we never allocated when using EMBEDDED_SDIO mmc: Add max_blksize to embedded SDIO data Signed-off-by: San Mehat commit ed6df5648f7c6270ecc24f4f36ac8ead30bc1f5f Author: San Mehat Date: Tue Nov 11 09:35:36 2008 -0800 mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection Signed-off-by: San Mehat commit cfd429c65523ddf1be48ff1835a2776d93688fb2 Author: San Mehat Date: Mon Nov 10 16:29:50 2008 -0800 mmc: Add status IRQ and status callback function to mmc platform data Signed-off-by: San Mehat commit 252e0e32acd8fc3ff204844c51fdacf3e57ad001 Author: Rebecca Schultz Zavin Date: Sun Mar 29 22:10:22 2009 -0700 Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver Signed-off-by: Rebecca Schultz Zavin Signed-off-by: Arve Hj��nnev��g commit 00757787ddca64ccaf624394d169a79e647c0865 Author: Arve Hj��nnev��g Date: Mon Jul 20 20:11:31 2009 -0700 Input: synaptics_i2c_rmi: Send new multi touch events Send both fingers using the new multitouch protocol in addition to the old single finger event and second finger ABS_HAT* hack. The new protocol does not specify how to report up events. To make sure the user-space frameworks can generate up events, we send at least one event where ABS_MT_TOUCH_MAJOR is zero before we stop sending events for a finger. Signed-off-by: Arve Hj��nnev��g commit 3929c1894c66d55c076be4e88780ff3205958411 Author: Arve Hj��nnev��g Date: Tue Jul 14 20:51:49 2009 -0700 Input: synaptics_i2c_rmi: Add sensitivity adjust option. Signed-off-by: Arve Hj��nnev��g commit 15fcd92b7a155185e1c4401cd5a0ef28efe65e54 Author: Arve Hj��nnev��g Date: Wed Jul 8 21:32:06 2009 -0700 Input: synaptics_i2c_rmi: Add support for panels with has-no-relative-data property. Signed-off-by: Arve Hj��nnev��g commit cf8b77e6a6c7cb87f6e5a5216e8f27a89bc047f6 Author: Arve Hj��nnev��g Date: Tue Aug 21 21:56:46 2007 -0700 Input: synaptics_i2c_rmi: Driver for Synaptics Touchscreens using RMI over I2C. Signed-off-by: Arve Hj��nnev��g Input: synaptics_i2c_rmi: disable_irq -> disable_irq_nosync Also remove duplicate swap macro Signed-off-by: Arve Hj��nnev��g commit 6cd91b7b3e7687595544380f8372318b5c17c07d Author: Mike Lockwood Date: Mon Dec 15 14:51:56 2008 -0500 input: keychord: Add keychord driver This driver allows userspace to receive notification when client specified key combinations are pressed. The client opens /dev/keychord and writes a list of keychords for the driver to monitor. The client then reads or polls /dev/keychord for notifications. A client specified ID for the keychord is returned from read() when a keychord press is detected. Signed-off-by: Mike Lockwood keychord: fix to build without CONFIG_PREEMPT Change-Id: I911f13aeda4224b6fa57863bc7e8972fec8837fb commit d94329d008a12abab1943304efd6f10f4fdc1f0f Author: Arve Hj��nnev��g Date: Fri Nov 21 21:47:23 2008 -0800 input: Add keyreset driver. Add a platform device in the board file to specify a reset key-combo. The first time the key-combo is detected a work function that syncs the filesystems is scheduled. If all the keys are released and then pressed again, it calls panic. Reboot on panic should be set for this to work. Signed-off-by: Arve Hj��nnev��g commit 22c233c3439e9b6bf86b0bb9d952d9d9b676d590 Author: Arve Hj��nnev��g Date: Fri Apr 17 18:24:59 2009 -0700 Input: gpio_input: disable_irq -> disable_irq_nosync Signed-off-by: Arve Hj��nnev��g commit f263c5383a87531ba05e342c06ef238250061939 Author: Arve Hj��nnev��g Date: Fri Jul 24 15:19:56 2009 -0700 Input: gpio_event: Allow multiple input devices per gpio_event device This is needed to support devices that put non-keyboard buttons in the keyboard matrix. For instance several devices put the trackball button in the keyboard matrix. In this case BTN_MOUSE should be reported from the same input device as REL_X/Y. It is also useful for devices that have multiple logical keyboard in the same matrix. The HTC dream has a menu key on the external keyboard and another menu key on the slide-out keyboard. With a single input device only one of these menu keys can be mapped to KEY_MENU. Signed-off-by: Arve Hj��nnev��g commit 0103b65fe81367bfa61551ec328a30debc153030 Author: Arve Hj��nnev��g Date: Tue Jul 14 20:58:41 2009 -0700 Input: gpio_input: Fix keys with keycode 0x100-0x1ff KEY_MAX is no longer a power of 2. Signed-off-by: Arve Hj��nnev��g commit cbc1c940b59973fafcd1e78648144d4e0024174e Author: Arve Hj��nnev��g Date: Wed Oct 15 18:23:47 2008 -0700 Input: Generic GPIO Input device. Supports keyboard matrixces, direct inputs, direct outputs and axes connected to gpios. Signed-off-by: Arve Hj��nnev��g Signed-off-by: Nick Pelly commit 004f0ae31748b0f2d77c3bf3bff927b6ce2780bc Author: Mike Chan Date: Thu Apr 24 10:22:26 2008 -0700 Grants system server access to /proc//oom_adj for Android applications. Signed-off-by: Brian Swetland commit e563c281d14e3af5f6a85c7371a984dbb6c3c700 Author: Mike Lockwood Date: Sat Mar 15 13:29:36 2008 -0400 FAT: Add new ioctl VFAT_IOCTL_GET_VOLUME_ID for reading the volume ID. Signed-off-by: Brian Swetland commit ab6c8fc0decb0b39f8cff97d4889fef5c3a50aa7 Author: Mike Chan Date: Wed Jan 7 11:40:42 2009 -0800 uidstat: Adding uid stat driver to collect network statistics. Signed-off-by: Mike Chan commit 9e0cd4352c967f2a1d50646d7a0e1caa5591d036 Author: Robert Love Date: Thu Jul 31 11:12:44 2008 -0400 sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size Add a family of knobs to /sys/kernel/ipv4 for controlling the TCP window size: tcp_wmem_min tcp_wmem_def tcp_wmem_max tcp_rmem_min tcp_rmem_def tcp_rmem_max This six values mirror the sysctl knobs in /proc/sys/net/ipv4/tcp_wmem and /proc/sys/net/ipv4/tcp_rmem. Sysfs, unlike sysctl, allows us to set and manage the files' permissions and owners. Signed-off-by: Robert Love commit e97bf10949b28a6815f149fb06167409bd86a297 Author: Robert Love Date: Mon May 12 17:08:29 2008 -0400 net: socket ioctl to reset connections matching local address Introduce a new socket ioctl, SIOCKILLADDR, that nukes all sockets bound to the same local address. This is useful in situations with dynamic IPs, to kill stuck connections. Signed-off-by: Brian Swetland net: fix tcp_v4_nuke_addr Signed-off-by: Dima Zavin net: ipv4: Fix a spinlock recursion bug in tcp_v4_nuke. We can't hold the lock while calling to tcp_done(), so we drop it before calling. We then have to start at the top of the chain again. Signed-off-by: Dima Zavin net: ipv4: Fix race in tcp_v4_nuke_addr(). To fix a recursive deadlock in 2.6.29, we stopped holding the hash table lock across tcp_done() calls. This fixed the deadlock, but introduced a race where the socket could die or change state. Fix: Before unlocking the hash table, we grab a reference to the socket. We can then unlock the hash table without risk of the socket going away. We then lock the socket, which is safe because it is pinned. We can then call tcp_done() without recursive deadlock and without race. Upon return, we unlock the socket and then unpin it, killing it. Change-Id: Idcdae072b48238b01bdbc8823b60310f1976e045 Signed-off-by: Robert Love Acked-by: Dima Zavin ipv4: disable bottom halves around call to tcp_done(). Signed-off-by: Robert Love Signed-off-by: Colin Cross ipv4: Move sk_error_report inside bh_lock_sock in tcp_v4_nuke_addr When sk_error_report is called, it wakes up the user-space thread, which then calls tcp_close. When the tcp_close is interrupted by the tcp_v4_nuke_addr ioctl thread running tcp_done, it leaks 392 bytes and triggers a WARN_ON. This patch moves the call to sk_error_report inside the bh_lock_sock, which matches the locking used in tcp_v4_err. Signed-off-by: Colin Cross commit 910b063a7e65960c1bb9cc4e91e9273b020709da Author: Robert Love Date: Wed Oct 15 15:35:44 2008 -0400 Paranoid network. With CONFIG_ANDROID_PARANOID_NETWORK, require specific uids/gids to instantiate network sockets. Signed-off-by: Robert Love paranoid networking: Use in_egroup_p() to check group membership The previous group_search() caused trouble for partners with module builds. in_egroup_p() is also cleaner. Signed-off-by: Nick Pelly Fix 2.6.29 build. Signed-off-by: Arve Hj��nnev��g net: Fix compilation of the IPv6 module Fix compilation of the IPv6 module -- current->euid does not exist anymore, current_euid() is what needs to be used. Signed-off-by: Steinar H. Gunderson commit 97f93ad8e2e34080a528666314d85ce7e89b3354 Author: Robert Love Date: Tue Oct 14 10:00:47 2008 -0400 ashmem for 2.6.27. Forward port of ashmem to 2.6.27. Signed-off-by: Robert Love ashmem: Don't install fault handler for private mmaps. Ashmem is used to create named private heaps. If this heap is backed by a tmpfs file it will allocate two pages for every page touched. In 2.6.27, the extra page would later be freed, but 2.6.29 does not scan anonymous pages when running without swap so the memory is not freed while the file is referenced. This change changes the behavior of private ashmem mmaps to match /dev/zero instead tmpfs. Signed-off-by: Arve Hj��nnev��g ashmem: Add common prefix to name reported in /proc/pid/maps Signed-off-by: Arve Hj��nnev��g ashmem: don't require a page aligned size This makes ashmem more similar to shmem and mmap, by not requiring the specified size to be page aligned, instead rounding it internally as needed. Signed-off-by: Marco Nelissen commit d69e8af59880b55f8c7db87ce31e7147d2be8cad Author: Robert Love Date: Wed Oct 15 15:34:49 2008 -0400 Add android_aid.h Add , our mapping of AID defines to gid numbers. Signed-off-by: Robert Love commit 653d96473f49110e6626eed73e8f3c85fbf3d8b8 Author: Rebecca Schultz Date: Thu Jul 24 11:22:53 2008 -0700 pmem: Add pmem driver Signed-off-by: Rebecca Schultz pmem: Use the thread group leader insted of the current thread. Instead of keeping track of the current thread, use the thread group leader Signed-off-by: Rebecca Schultz pmem: Add some apis to reference and flush pmem files by file struct The api to refer to pmem files by fd should be depricated, it can cause problems if a processes fd table changes while the kernel is processing data in a pmem file. This change adds the safer api. Signed-off-by: Rebecca Schultz Zavin pmem: Remove unused depricated fd api to pmem. Signed-off-by: Rebecca Schultz Zavin pmem: Remove error message when calling get_pmem_addr This call is used from the mdp driver to determine if the memory is in pmem or in the fb. We will encounter this case during normal operation so this error message should be removed. Signed-off-by: Rebecca Schultz Zavin pmem: Add include sched.h to fix compile errors Signed-off-by: Rebecca Schultz Zavin pmem: remove HW3D_* ioctls Signed-off-by: Dima Zavin pmem: Expose is_pmem_file to the in-kernel users. Signed-off-by: Dima Zavin pmem: Make the exposed functions be noops if CONFIG_ANDROID_PMEM is not set. Signed-off-by: Dima Zavin misc: pmem: don't flush if file was opened with O_SYNC Change-Id: I067218658a0d7f7ecc1fe73e9ff6b0c3b3054653 Signed-off-by: Dima Zavin commit 310504662c220173d097a420a75756940c9f7e7f Author: Mike Lockwood Date: Tue Oct 14 12:50:16 2008 -0400 switch: switch class and GPIO drivers. switch: Export symbol switch_set_state. Signed-off-by: Mike Lockwood switch: gpio: Don't call request_irq with interrupts disabled Signed-off-by: Arve Hj��nnev��g switch: Use device_create instead of device_create_drvdata. device_create_drvdata is obsolete. Signed-off-by: Arve Hj��nnev��g switch_gpio: Add missing #include Signed-off-by: Mike Lockwood commit cd1ffe8d5d97279f21dfc7098985a550fc0f428b Author: Arve Hj��nnev��g Date: Mon Sep 21 17:26:47 2009 -0700 power_supply: Hold a wake_lock while power supply change notifications are pending When connecting usb or the charger the device would often go back to sleep before the charge led and screen turned on. Signed-off-by: Arve Hj��nnev��g commit f8d61c26afb6b6a47f1a774e3f25ca7ea49b0053 Author: Mike Chan Date: Tue Oct 27 17:37:44 2009 -0700 input: evdev: Use unique wakelock names wakelock names are now contain evdev->name and pid Signed-off-by: Mike Chan commit 9abcb847eab34907c1bb0eac4a3b402977ea0e37 Author: Arve Hj��nnev��g Date: Fri Oct 17 15:28:08 2008 -0700 Input: Use monotonic time for event time stamps. Since wall time can jump backwards, it cannot be used to determine if one event occured before another or for how long a key was pressed. Signed-off-by: Arve Hj��nnev��g commit a92683626c2061c51701917c5dcbd0e1c91a04e2 Author: Arve Hj��nnev��g Date: Fri Oct 17 15:20:55 2008 -0700 Input: Hold wake lock while event queue is not empty. Allows userspace code to process input events while the device appears to be asleep. Signed-off-by: Arve Hj��nnev��g commit 2ec68be75c83c832913acb8756daec7d37aae067 Author: Arve Hj��nnev��g Date: Sun Mar 30 21:47:13 2008 -0700 ledtrig-sleep: Add led trigger for sleep debugging. Signed-off-by: Brian Swetland commit 65a84712596bfd5b0831b8a09691ad3eca391ade Author: Arve Hj��nnev��g Date: Fri Jul 25 20:58:15 2008 -0700 rtc: Try to prevent RTC errors from accumulating. When we resume we only know how many whole seconds has elapsed. These errors would accumulate in delta. We now only set the delta if it would change by more than two seconds. If we drift back by by more than a second add one in resume. Signed-off-by: Arve Hj��nnev��g commit d1d79061a9d4a184dc026ca6dc105d17da0693c3 Author: Arve Hj��nnev��g Date: Mon May 4 14:09:15 2009 -0700 rtc: alarm: Add in-kernel alarm interface Drivers can now create alarms that will use an hrtimer while the system is running and the rtc to wake up from suspend. Signed-off-by: Arve Hj��nnev��g commit b76a757d7b11b2eee422a917067193b31a1a994c Author: Arve Hj��nnev��g Date: Tue Oct 14 17:38:04 2008 -0700 rtc: Add android alarm driver. commit cc2ae286f899544417e94e1f10004ffa3ab327fa Author: Rebecca Schultz Date: Thu Jul 17 18:14:55 2008 -0700 PM: earlysuspend: Removing dependence on console. Rather than signaling a full update of the display from userspace via a console switch, this patch introduces 2 files int /sys/power, wait_for_fb_sleep and wait_for_fb_wake. Reading these files will block until the requested state has been entered. When a read from wait_for_fb_sleep returns userspace should stop drawing. When wait_for_fb_wake returns, it should do a full update. If either are called when the fb driver is already in the requested state, they will return immediately. Signed-off-by: Rebecca Schultz Signed-off-by: Arve Hj��nnev��g commit 7fc8c1c2813bd2c08e9a2fe1958451a33f30df14 Author: Arve Hj��nnev��g Date: Mon Dec 14 22:14:52 2009 -0800 consoleearlysuspend: Fix for 2.6.32 vt_waitactive now needs a 1 based console number Change-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e commit 849d91c2b34843ed8c96dd6123c050f6ab8ba34a Author: Arve Hj��nnev��g Date: Wed Oct 15 17:52:20 2008 -0700 PM: earlysuspend: Add console switch when user requested sleep state changes. Signed-off-by: Arve Hj��nnev��g commit ddbad8da3109a04b623976e9585f10a184694843 Author: Arve Hj��nnev��g Date: Tue Dec 1 20:54:37 2009 -0800 PM: wakelock: Don't dump unfrozen task list when aborting try_to_freeze_tasks after less than one second Change-Id: Ib2976e5b97a5ee4ec9abd4d4443584d9257d0941 Signed-off-by: Arve Hj��nnev��g commit 9a4999395d8b46f7005f9d1d61e0ef922b7cf49f Author: Arve Hj��nnev��g Date: Tue Oct 14 16:02:39 2008 -0700 PM: wakelock: Abort task freezing if a wake lock is held. Avoids a problem where the device sometimes hangs for 20 seconds before the screen is turned on. commit f5c158e3963c9d06bff767954ec7ce426e2ae675 Author: Arve Hj��nnev��g Date: Thu Oct 9 21:01:46 2008 -0700 PM: Add user-space wake lock api. This adds /sys/power/wake_lock and /sys/power/wake_unlock. Writing a string to wake_lock creates a wake lock the first time is sees a string and locks it. Optionally, the string can be followed by a timeout. To unlock the wake lock, write the same string to wake_unlock. commit 5f36bdf15970bf5ef97dce533ddac32d85191d6b Author: Arve Hj��nnev��g Date: Thu Oct 9 19:17:11 2008 -0700 PM: Enable early suspend through /sys/power/state If EARLYSUSPEND is enabled then writes to /sys/power/state no longer blocks, and the kernel will try to enter the requested state every time no wakelocks are held. Write "on" to resume normal operation. commit 74643fdcc38e8806e630cc83ce0f114808ee50ff Author: Arve Hj��nnev��g Date: Tue Oct 7 20:48:01 2008 -0700 PM: Implement early suspend api commit d38f947b14caa880e5449ed33ffb9d20002a3de6 Author: Arve Hj��nnev��g Date: Wed Dec 2 18:22:00 2009 -0800 PM: wakelocks: Use seq_file for /proc/wakelocks so we can get more than 3K of stats. Change-Id: I42ed8bea639684f7a8a95b2057516764075c6b01 Signed-off-by: Arve Hj��nnev��g commit 0f8a3256cb9b7535609e01066f3fe912998fba7e Author: Erik Gilling Date: Tue Aug 25 20:09:12 2009 -0700 power: wakelocks: fix buffer overflow in print_wake_locks Change-Id: Ic944e3b3d3bc53eddc6fd0963565fd072cac373c Signed-off-by: Erik Gilling commit 368bb8b6eed4c72d19f75669335d87f884fe2a94 Author: Mike Chan Date: Tue Aug 25 18:10:32 2009 -0700 power: Prevent spinlock recursion when wake_unlock() is called Signed-off-by: Mike Chan commit 1ea6dbb5067c5b0d0d75da730ae94af52150ce12 Author: Arve Hj��nnev��g Date: Tue Sep 9 22:14:34 2008 -0700 PM: Implement wakelock api. PM: wakelock: Replace expire work with a timer The expire work function did not work in the normal case. Signed-off-by: Arve Hj��nnev��g commit e86d97ab0243a7958ead9386e6509899018b2a8d Author: Arve Hj��nnev��g Date: Fri Sep 26 22:10:56 2008 -0700 PM: Add early suspend api. commit 046ebf066da0165666f919be16320b2d3ce01d73 Author: Arve Hj��nnev��g Date: Fri Sep 26 22:10:56 2008 -0700 PM: Add wake lock api. commit 9319b2654f1dc959d16a9169112c4e1d37d7bb5d Author: Mike Chan Date: Thu Jan 22 12:23:32 2009 -0800 [docs] android: Add android config documentation to boot framework. Signed-off-by: Mike Chan commit b08a883b6dce4b0f0cd52d8bee7505472301387c Author: Brian Swetland Date: Mon Nov 23 06:41:42 2009 -0800 w1: don't allow arbitrary users to remove w1 devices The search/pullup/add/remove device attributes were 0666 which would allow arbitrary users to affect the 1 wire bus. Change to 0664 to prevent that. Signed-off-by: Brian Swetland commit 196f3dc567992f06be0699437f4d4bd2a9a67f15 Author: Robert Love Date: Tue Apr 29 16:44:10 2008 -0400 Make /dev/mem configurable, as we don't want it. Signed-off-by: Brian Swetland commit 604ad7390d7ba24330d7b36da522e3e65a21a4a9 Author: Erik Gilling Date: Thu Nov 5 12:42:13 2009 -0800 sched: make task dump print all 15 chars of proc comm Change-Id: I1a5c9676baa06c9f9b4424bbcab01b9b2fbfcd99 Signed-off-by: Erik Gilling commit 563036940546f44a6232bee51459e7ea7d2da2c7 Author: Arve Hj��nnev��g Date: Wed Dec 10 20:06:28 2008 -0800 sched: Enable might_sleep before initializing drivers. This allows detection of init bugs in built-in drivers. Signed-off-by: Arve Hj��nnev��g commit 207f66e23a69bc23265e1f133702bc59c3096696 Author: Arve Hj��nnev��g Date: Tue May 8 15:39:13 2007 +0700 Add build option to to set the default panic timeout. commit 3414e45fe081b2f7b89a2156e0b7eec26f77839b Author: Arve Hj��nnev��g Date: Tue Jun 9 20:17:45 2009 -0700 [ARM] Optionally flush entire dcache from v6_dma_flush_range If CACHE_FLUSH_RANGE_LIMIT is defined, then the entire dcache will be flushed if the requested range is larger than this limit. Signed-off-by: Arve Hj��nnev��g commit 8d4c42afa543eda97ce1bc88f160ac1e0379ec52 Author: Arve Hj��nnev��g Date: Tue Jun 9 20:21:44 2009 -0700 futex: Restore one of the fast paths eliminated by 38d47c1b7075bd7ec3881141bb3629da58f88dab This improves futex performance until our user-space code is fixed to use FUTEX_PRIVATE_FLAG for non-shared futexes. Signed-off-by: Arve Hj��nnev��g commit 675bed294c5136b04e283f647e5c73fb897cfd19 Author: Arve Hj��nnev��g Date: Wed Mar 18 17:27:31 2009 -0700 mm: Check if any page in a pageblock is reserved before marking it MIGRATE_RESERVE This fixes a problem where the first pageblock got marked MIGRATE_RESERVE even though it only had a few free pages. This in turn caused no contiguous memory to be reserved and frequent kswapd wakeups that emptied the caches to get more contiguous memory. commit c177d04116de6acff4d41706df54cf6c909aa5a2 Author: Arve Hj��nnev��g Date: Tue Feb 17 14:51:02 2009 -0800 mm: Add min_free_order_shift tunable. By default the kernel tries to keep half as much memory free at each order as it does for one order below. This can be too agressive when running without swap. Signed-off-by: Arve Hj��nnev��g commit 7725dd9abd08371ccab1025e5b7b77bd5a206e73 Author: Brian Swetland Date: Mon Jan 26 17:15:49 2009 -0800 [ARM] avoid mis-detecting some V7 cores in the decompressor This allows kernel decompress to happen nearly instantly instead of taking over 20 seconds. Signed-off-by: Brian Swetland commit bdc8620a08c9aba3848f1bf256be4c17153efb21 Author: Brian Swetland Date: Mon Jan 26 17:14:04 2009 -0800 [ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6. The mechanism is the same -- just need to adjust some ifdefs. Signed-off-by: Brian Swetland commit 8084e5f64a0fd0272dec87aef364c9e67d5190f7 Author: Arve Hj��nnev��g Date: Sat Dec 1 18:34:14 2007 -0800 [ARM] armv6 dcc tty driver Signed-off-by: Brian Swetland Signed-off-by: Arve Hj��nnev��g commit 85d747b476df558eb36fd9966125a08f02ab5d12 Author: Arve Hj��nnev��g Date: Mon Apr 9 17:13:02 2007 +0700 [ARM] Add code to prevent system calls from being restarted muliple times before returning from the kernel. Fixes crashes with thumb syscalls. commit 39078ee4d12d5b33108f9c56c24cc9c31d1d54bd Author: Tony Lindgren Date: Mon May 9 14:10:26 2005 -0700 ARM: Make low-level printk work Makes low-level printk work. Signed-off-by: Tony Lindgren commit 034309060232c703e843b6b63d35f3a56f9dd2c4 Author: Arve Hj��nnev��g Date: Tue Dec 8 20:37:55 2009 -0800 Revert "Staging: android: mark subsystem as broken" This reverts commit 2cdf99ce2b9418c9d7c5f907195cfac421375520. commit 3cc8af27c10b5e1eb8e9ad2b19823f3553647405 Author: Corentin Chary Date: Sat Nov 28 09:45:14 2009 +0100 staging/android: fix build issues Signed-off-by: Corentin Chary commit f1f8e7cd6f796b15ed011361f09b57db796d9b4e Author: Arve Hj��nnev��g Date: Wed Dec 16 21:15:49 2009 -0800 sysfs: Fix sysfs owner and group. First call to sysfs_setattr ignored the requested owner and group. Change-Id: I8343f818c65c54f6dbb55533cd34b31eeba5b554 Signed-off-by: Arve Hj��nnev��g commit 18ed2ed46071a47e06820740650686da48e84dbb Author: Peter Zijlstra Date: Fri Dec 4 09:59:02 2009 +0100 sched: Fix task priority bug 83f9ac removed a call to effective_prio() in wake_up_new_task(), which leads to tasks running at MAX_PRIO. This is caused by the idle thread being set to MAX_PRIO before forking off init. O(1) used that to make sure idle was always preempted, CFS uses check_preempt_curr_idle() for that so we can savely remove this bit of legacy code. Reported-by: Mike Galbraith Tested-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1259754383.4003.610.camel@laptop> Signed-off-by: Ingo Molnar commit b4bdd73ce865213a5653dc424873e8da37e858cc Author: Greg Kroah-Hartman Date: Thu Jan 28 15:06:20 2010 -0800 Linux 2.6.32.7 commit a8e96d6f81c39a86449f6a8404450b0cfb1d42fe Author: Russ Anderson Date: Tue Jan 26 20:37:22 2010 -0600 x86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers. commit da482474b8396e1a099c37ffc6541b78775aedb4 upstream. Pass the number of minors when unregistering MSR and CPUID drivers. Reported-by: Dean Nelson Signed-off-by: Dean Nelson LKML-Reference: <20100127023722.GA22305@sgi.com> Signed-off-by: Russ Anderson Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 0a1c275a44db55b2624652b04d4ed9430e82957b Author: Greg Kroah-Hartman Date: Tue Jan 26 15:04:02 2010 -0800 fnctl: f_modown should call write_lock_irqsave/restore commit b04da8bfdfbbd79544cab2fadfdc12e87eb01600 upstream. Commit 703625118069f9f8960d356676662d3db5a9d116 exposed that f_modown() should call write_lock_irqsave instead of just write_lock_irq so that because a caller could have a spinlock held and it would not be good to renable interrupts. Cc: Eric W. Biederman Cc: Al Viro Cc: Alan Cox Cc: Tavis Ormandy Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 01e991b8eb2cc28f41ed3f96ec33ae3dd6b860a3 Author: Wey-Yi Guy Date: Tue Jan 26 12:00:43 2010 -0800 iwlwifi: Fix throughput stall issue in HT mode for 5000 commit 1152dcc28c66a74b5b3f1a3ede0aa6729bfd48e4 upstream Similar to 6000 and 1000 series, RTS/CTS is the recommended protection mechanism for 5000 series in HT mode based on the HW design. Using RTS/CTS will better protect the inner exchange from interference, especially in highly-congested environment, it also prevent uCode encounter TX FIFO underrun and other HT mode related performance issues. Signed-off-by: Wey-Yi Guy Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit d274df694b319a87405e35553bd2c45ab75f4554 Author: Len Brown Date: Tue Jan 26 16:15:28 2010 -0500 ACPI: enable C2 and Turbo-mode on Nehalem notebooks on A/C upstream in 2.6.33-rc: 5d76b6f6c17572e662f5c99c2023adae92100855 Refreshed here for 2.6.32.y, applies w/ offset back to 2.6.29.y. Linux has always ignored ACPI BIOS C2 with exit latency > 100 usec, and the ACPI spec is clear that is correct FADT-supplied C2. However, the ACPI spec explicitly states that _CST-supplied C-states have no latency limits. So move the 100usec C2 test out of the code shared by FADT and _CST code-paths, and into the FADT-specific path. This bug has not been visible until Nehalem, which advertises a CPU-C2 worst case exit latency on servers of 205usec. That (incorrect) figure is being used by BIOS writers on mobile Nehalem systems for the AC configuration. Thus, Linux ignores C2 leaving just C1, which is saves less power, and also impacts performance by preventing the use of turbo mode. http://bugzilla.kernel.org/show_bug.cgi?id=15064 Tested-by: Alex Chiang Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 59568be10aaa60db63576671d2b4064428ff2345 Author: Pallipadi, Venkatesh Date: Thu Dec 17 12:27:02 2009 -0800 x86: Reenable TSC sync check at boot, even with NONSTOP_TSC commit 6c56ccecf05fafe100ab4ea94f6fccbf5ff00db7 upstream. Commit 83ce4009 did the following change If the TSC is constant and non-stop, also set it reliable. But, there seems to be few systems that will end up with TSC warp across sockets, depending on how the cpus come out of reset. Skipping TSC sync test on such systems may result in time inconsistency later. So, reenable TSC sync test even on constant and non-stop TSC systems. Set, sched_clock_stable to 1 by default and reset it in mark_tsc_unstable, if TSC sync fails. This change still gives perf benefit mentioned in 83ce4009 for systems where TSC is reliable. Signed-off-by: Venkatesh Pallipadi Acked-by: Suresh Siddha LKML-Reference: <20091217202702.GA18015@linux-os.sc.intel.com> Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 194223f3a9d72ad95eeb85cf15c0bb2262421186 Author: David J. Wilder Date: Wed Dec 9 10:03:00 2009 -0800 IPoIB: Clear ipoib_neigh.dgid in ipoib_neigh_alloc() commit 0cd4d0fd9b0a4e10c091fc6316d1bf92885dcd9c upstream. IPoIB can miss a change in destination GID under some conditions. The problem is caused when ipoib_neigh->dgid contains a stale address. The fix is to set ipoib_neigh->dgid to zero in ipoib_neigh_alloc(). This can happen when a system using bonding on its IPoIB interfaces has switched its active interface from interface A to B and back to A. The system that fails over will not correctly processes the 2nd address change, as described below. When an address has changed neighbor->ha is updated with the new address. Each neighbor has an associated ipoib_neigh. ipoib_neigh->dgid also holds a copy of the remote node's hardware address. When an address changes neighbor->ha is updated by the network layer (arp code) with the new address. IPoIB detects this change in ipoib_start_xmit() by comparing neighbor->ha with ipoib_neigh->dgid. The bug is that ipoib_neigh->dgid may already contain the new address (A) thus the change from B to A is missed by ipoib. Here is the sequence of events: ipoib_neigh->dgid = A and neighbor->ha = A The address is switched to B (the first switch) neighbor->ha = B The change is seen in ipoib_start_xmit() -- neighbor->ha != ipoib_neigh->dgid so ipoib_neigh is released, and a new one is allocated. The allocator may return the same chunk of memory that was just released, therefore ipoib_neigh->dgid still contains A at this point. ipoib_neigh->dgid should be updated in neigh_add_path(), but if the following conditions are true dgid is not updated: 1) __path_find() returns a path 2) path->ah is NULL The remote system now switches from address B to A, neighbor->ha is updated to A. Now we have again : ipoib_neigh->dgid = A and neighbor->ha = A Since the addresses are the same ipoib won't process the change in address. Fix this by zeroing out the dgid field when allocating a new struct ipoib_neigh. Signed-off-by: David Wilder Signed-off-by: Roland Dreier Signed-off-by: Greg Kroah-Hartman commit 454f8b167c06886ab7d469c889d9cca613398431 Author: Marcelo Tosatti Date: Thu Oct 29 13:44:17 2009 -0200 KVM: only clear irq_source_id if irqchip is present commit e50212bb51356f0df48d6cce0aae5acf41df336d upstream. Otherwise kvm might attempt to dereference a NULL pointer. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit eaccd490b0128d11ce2ea4d9d89e092661ae90b5 Author: Jiri Slaby Date: Fri Sep 25 09:33:38 2009 +0200 KVM: fix lock imbalance in kvm_*_irq_source_id() commit 0c6ddcebd8303ada6faefa6f72ac18b6230320c4 upstream. Stanse found 2 lock imbalances in kvm_request_irq_source_id and kvm_free_irq_source_id. They omit to unlock kvm->irq_lock on fail paths. Fix that by adding unlock labels at the end of the functions and jump there from the fail paths. Signed-off-by: Jiri Slaby Cc: Marcelo Tosatti Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit 9801911326462a332d83eb508f1120bd45178426 Author: Wei Yongjun Date: Fri Jan 22 14:21:29 2010 +0800 KVM: x86: Fix leak of free lapic date in kvm_arch_vcpu_init() commit 443c39bc9ef7d8f648408d74c97e943f3bb3f48a upstream. In function kvm_arch_vcpu_init(), if the memory malloc for vcpu->arch.mce_banks is fail, it does not free the memory of lapic date. This patch fixed it. Signed-off-by: Wei Yongjun Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 8e5c20d09b0003c91a96e35f7117633eefe2545a Author: Wei Yongjun Date: Fri Jan 22 14:18:47 2010 +0800 KVM: x86: Fix probable memory leak of vcpu->arch.mce_banks commit 36cb93fd6b6bf7e9163a69a8bf20207aed5fea44 upstream. vcpu->arch.mce_banks is malloc in kvm_arch_vcpu_init(), but never free in any place, this may cause memory leak. So this patch fixed to free it in kvm_arch_vcpu_uninit(). Signed-off-by: Wei Yongjun Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 0118bac21740345d8b4754da24f6ce1aab4a91bf Author: Sheng Yang Date: Tue Jan 5 19:02:28 2010 +0800 KVM: x86: Fix host_mapping_level() commit 82b7005f0e72d8d1a8226e4c192cbb0850d10b3f upstream. When found a error hva, should not return PAGE_SIZE but the level... Also clean up the coding style of the following loop. Signed-off-by: Sheng Yang Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 493821093f18655d39f16e31264c00b022640701 Author: Marcelo Tosatti Date: Thu Jan 14 17:41:27 2010 -0200 KVM: MMU: bail out pagewalk on kvm_read_guest error commit a6085fbaf65ab09bfb5ec8d902d6d21680fe1895 upstream. Exit the guest pagetable walk loop if reading gpte failed. Otherwise its possible to enter an endless loop processing the previous present pte. Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 59cf8545b9b307b15441f07dec587b7774484789 Author: Avi Kivity Date: Tue Dec 29 12:42:16 2009 +0200 KVM: Fix race between APIC TMR and IRR commit a5d36f82c4f3e852b61fdf1fee13463c8aa91b90 upstream. When we queue an interrupt to the local apic, we set the IRR before the TMR. The vcpu can pick up the IRR and inject the interrupt before setting the TMR, and perhaps even EOI it, causing incorrect behaviour. The race is really insignificant since it can only occur on the first interrupt (usually following interrupts will not change TMR), but it's better closed than open. Fixed by reordering setting the TMR vs IRR. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit f0d13b89d4b12f331a0dd1d646a69060e49b1951 Author: Michael S. Tsirkin Date: Wed Jan 13 18:58:09 2010 +0200 KVM: only allow one gsi per fd commit f1d1c309f35e9b0fb961cffd70fbd04f450ec47c upstream. Looks like repeatedly binding same fd to multiple gsi's with irqfd can use up a ton of kernel memory for irqfd structures. A simple fix is to allow each fd to only trigger one gsi: triggering a storm of interrupts in guest is likely useless anyway, and we can do it by binding a single gsi to many interrupts if we really want to. Signed-off-by: Michael S. Tsirkin Acked-by: Acked-by: Gregory Haskins Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit 70be4d76c0e5d426067601a79be0b33ea673f3ff Author: Christian Borntraeger Date: Thu Jan 21 12:19:07 2010 +0100 KVM: S390: fix potential array overrun in intercept handling commit 062d5e9b0d714f449b261bb522eadaaf6f00f438 upstream. kvm_handle_sie_intercept uses a jump table to get the intercept handler for a SIE intercept. Static code analysis revealed a potential problem: the intercept_funcs jump table was defined to contain (0x48 >> 2) entries, but we only checked for code > 0x48 which would cause an off-by-one array overflow if code == 0x48. Use the compiler and ARRAY_SIZE to automatically set the limits. Signed-off-by: Christian Borntraeger Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit eb6002526b1c5cb3e7f9e42004ba395f5d57beaf Author: Abhijeet Kolekar Date: Wed Jan 13 13:23:14 2010 -0800 cfg80211: fix channel setting for wext commit 5f6120335c701ba07d5151206071f4d6ccaa684f upstream. Patch fixes the bug at http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2139 Currently we cannot set the channel using wext extension if we have already associated and disconnected. As cfg80211_mgd_wext_siwfreq will not switch the channel if ssid is set. This fixes it by clearing the ssid. Following is the sequence which it tries to fix. modprobe iwlagn iwconfig wlan0 essid "" ifconfig wlan0 down iwconfig wlan0 chan X wext is marked as deprecate.If we use nl80211 we can easily play with setting the channel. Signed-off-by: Abhijeet Kolekar Acked-by: Samuel Ortiz Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 304cd19e41f6c77c3d307869f15a8bfe2a7408cd Author: Benoit Papillault Date: Fri Jan 15 12:21:37 2010 +0100 mac80211: check that ieee80211_set_power_mgmt only handles STA interfaces. commit e5de30c9bf4a39db9f54c4a373470ce65881ade0 upstream. ieee80211_set_power_mgmt is meant for STA interfaces only. Moreover, since sdata->u.mgd.mtx is only initialized for STA interfaces, using this code for any other type of interface (like creating a monitor interface) will result in a oops. Signed-off-by: Benoit Papillault Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 09e4d0f1f69726615a2c9c5246410ec72b60b09f Author: Guennadi Liakhovetski Date: Fri Jan 22 18:00:03 2010 +0100 ASoC: fix a memory-leak in wm8903 commit 40aa7030e5213a43e9e0554fd7f95534ea310bf3 upstream. Remember to free the temporary register-cache. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit 2cdc2dc3bdf8948ddf5a11d2907ac9d98d1c2794 Author: Peter Horton Date: Tue Jan 5 11:14:36 2010 +0000 UBI: initialise update marker commit ff998793288b49a3b22d929bf8e56362320905ff upstream. The in kernel copy of a volume's update marker is not initialised from the volume table. This means that volumes where an update was unfinnished will not be treated as "forbidden to use". This is basically that the update functionality was broken. Signed-off-by: Peter Horton Signed-off-by: Artem Bityutskiy Signed-off-by: Greg Kroah-Hartman commit f6fbe0baa35fd65a4344a48ebc60c08f18a0fc20 Author: Artem Bityutskiy Date: Mon Jan 18 16:43:44 2010 +0200 UBI: fix memory leak in update path commit ebddd63b74dcf1cb676d14328d5852f1fee19a8a upstream. When truncating an UBI volume, UBI should allocates a PEB-sized buffer but does not release it, which leads to memory leaks. This patch fixes the issue. Reported-by: Marek Skuczynski Signed-off-by: Artem Bityutskiy Tested-by: Marek Skuczynski Signed-off-by: Greg Kroah-Hartman commit 4d845d60ad3d385c43716c50fc7c87dd5d3466fe Author: Hans de Goede Date: Mon Jan 25 15:00:50 2010 +0100 hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog commit c453615f77aa51593c1c9c9031b4278797d3fd19 upstream. When /dev/watchdog gets opened a second time we return -EBUSY, but we already have got a kref then, so we end up leaking our data struct. Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 00bd133151947ffd56beef6159c5d2a2b7d02def Author: Takashi Iwai Date: Wed Jan 20 08:35:06 2010 +0100 ALSA: hda - Fix HP T5735 automute commit dc99be47667c56046555e89e62f1ac17fa06329a upstream. This patch fixes the aut-mute setup on HP T5735 with ALC262 codec. Instead of wrong amp, use pin control toggling for muting the speaker now. Tested-by: Lee Trager Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit a0dffef3213a314d3a53e4fffe7d325edbe1d05c Author: Serge E. Hallyn Date: Tue Dec 15 16:47:27 2009 -0800 ipc ns: fix memory leak (idr) commit 7d6feeb287c61aafa88f06345387b1188edf4b86 upstream. We have apparently had a memory leak since 7ca7e564e049d8b350ec9d958ff25eaa24226352 "ipc: store ipcs into IDRs" in 2007. The idr of which 3 exist for each ipc namespace is never freed. This patch simply frees them when the ipcns is freed. I don't believe any idr_remove() are done from rcu (and could therefore be delayed until after this idr_destroy()), so the patch should be safe. Some quick testing showed no harm, and the memory leak fixed. Caught by kmemleak. Signed-off-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Acked-by: Nick Piggin Signed-off-by: Greg Kroah-Hartman commit a5981dfb82297858395742530509c7f80a41e3bd Author: Ursula Braun Date: Thu Nov 12 21:46:30 2009 +0000 netiucv: displayed TX bytes value much too high commit 998221c26b86a7edd621e66b437628c5ec0f8e9b upstream. tx_bytes value must be updated by skb length before skb is freed. Signed-off-by: Ursula Braun Signed-off-by: David S. Miller Acked-by: John Jolly Signed-off-by: Greg Kroah-Hartman commit 27aeefb33617d3307a6627483f67d07ebda8b184 Author: Peter Oberparleiter Date: Mon Dec 7 12:51:24 2009 +0100 cio: dont panic in non-fatal conditions commit 16b9a0571da4ee5cd15ca75e871722b0b5aee64d upstream. Remove the call to BUG() for situations which are unexpected but do not cause actual problems. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit f5b1bc5470c2871fda157d55bc27746422b7112c Author: Peter Oberparleiter Date: Mon Dec 7 12:51:15 2009 +0100 cio: fix double free in case of probe failure commit 48e4c385c5f54626651cca027afe242439281899 upstream. io_subchannel_probe() frees memory for sch->private which is later freed again when io_subchannel_remove() is called. Fix this problem by removing the cleanup in io_subchannel_probe(). Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit da0297498ee0e4a73ac74beae564dc72abbe6f48 Author: Laurent Pinchart Date: Wed Dec 9 22:31:21 2009 -0300 V4L/DVB (13826): uvcvideo: Fix controls blacklisting commit 385097e08b9c24655626ed760bc67eb7e50115a0 upstream. The control blacklisting code erroneously used usb_match_id() by passing a pointer to a usb_device_id structure instead of an array of such structures. Replace the usb_match_id() call by usb_match_id_one(). Thanks to Paulo Assis for diagnosing the bug and providing an initial fix. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit 2928b68f6294139ffbd2138440ce08efeaf23d15 Author: NeilBrown Date: Wed Dec 30 12:08:50 2009 +1100 md: fix small irregularity with start_ro module parameter commit 0f9552b5dc4fe10da37fa3f4a4ca185d90fa41c9 upstream. The start_ro modules parameter can be used to force arrays to be started in 'auto-readonly' in which they are read-only until the first write. This ensures that no resync/recovery happens until something else writes to the device. This is important for resume-from-disk off an md array. However if an array is started 'readonly' (by writing 'readonly' to the 'array_state' sysfs attribute) we want it to be really 'readonly', not 'auto-readonly'. So strengthen the condition to only set auto-readonly if the array is not already read-only. Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman commit 31cf6d8a86469e96cf4ea0a0a89b87ddef1a65cc Author: Bartlomiej Zolnierkiewicz Date: Thu Dec 3 20:32:08 2009 +0100 ata_piix: fix MWDMA handling on PIIX3 commit 6938594374ee506e91a4c03117a034ea0ed66783 upstream. Fix erroneous check for ap->udma_mask in do_pata_set_dmamode() resulting in controller not being programmed properly for MWDMA. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit 3de08a120ab3ac85bfc31e03b5d2dc2758a3bd21 Author: Shaohua Li Date: Mon Nov 16 09:56:05 2009 +0800 ahci: disable SNotification capability for ich8 commit 1b677afda44f7882b7e257d6f025d006ec5d14f9 upstream. I obseved there is a sata_async_notification() for every ahci interrupt. But the async notification does nothing (this is hard disk drive and no pmp). This cause cpu wastes some time on sntf register access. It appears ICH AHCI doesn't support SNotification register, but the controller reports it does. After quirking it, the async notification disappears. PS. it appears all ICH don't support SNotification register from ICH manual, don't know if we need quirk all ICH. I don't have machines with all kinds of ICH. Signed-off-by: Shaohua Li Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit c817c1975bd7d46bc8af3ccacde8d86353bed02a Author: Seth Heasley Date: Thu Jan 14 20:58:05 2010 +0000 iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs commit 3c9d8eccd8687f0e770e4d89fd0d73d4f81a985a upstream. This patch adds the Intel Cougar Point and PCH DeviceIDs for iTCO Watchdog. Signed-off-by: Seth Heasley Signed-off-by: Wim Van Sebroeck Acked-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit 42b4505ad420b9788d25ff02c4182a6754eef050 Author: Imre Kaloz Date: Mon Dec 7 20:42:26 2009 +0100 iTCO_wdt: add PCI ID for the Intel EP80579 (Tolapai) SoC commit 4946f8353da9d3038e2a9d0295d5dfeee4cee5c5 upstream. add PCI ID for the Intel EP80579 (Tolapai) SoC Signed-off-by: Imre Kaloz Signed-off-by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman commit 53691f222670765b843035aff24952d471d68d00 Author: Wim Van Sebroeck Date: Sun Nov 15 13:44:54 2009 +0000 iTCO_wdt.c - cleanup chipset documentation commit cb711a1931363b8ad4dc98df4a92c262ced8eeb4 upstream. Cleanup the documentation about the supported chipsets. [needed for further device ids to add to this driver - gkh] Signed-off-by: Wim Van Sebroeck Signed-off-by: Greg Kroah-Hartman commit 4220098f176347efd6916bf73112975e092bbef3 Author: Takashi Iwai Date: Tue Dec 8 12:36:52 2009 +0100 ALSA: hda - Add missing Line-Out and PCM switches as slave commit 23033b2bce4361f2859ee0331f97c9056dae7091 upstream. Realtek codecs may have "PCM" and "Line-Out" playback switches, and they can be slaves for vmaster. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 9049580626c076943f5f8b7e90c0a2fa4b8ca2f4 Author: Takashi Iwai Date: Fri Dec 18 08:48:42 2009 +0100 ALSA: hda - Fix quirk for Maxdata obook4-1 commit 2fef62c825f09e29d2f52dc187ddf6f99e28c7f1 upstream. Works fine with the auto-parser. Reference: Novell bnc#564940 https://bugzilla.novell.com/show_bug.cgi?id=564940 Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit a2c5952e122f124c273280ee9a7ad6db44874ee4 Author: Wu Fengguang Date: Fri Oct 30 11:34:19 2009 +0100 ALSA: hda - select IbexPeak handler for Calpella commit 739b47f1e5aa3b36eadd7906cc6b41f0175c6ed1 upstream. An earlier patch merely adds id for 0x80862804. It has 2/3 cvt/pin nodes and shall be tied to the IbexPeak handler. Signed-off-by: Wu Fengguang Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit d16061056a95ac864354c4c743f3ab77f027a287 Author: Elliott Sales de Andrade Date: Sun Jan 10 23:59:05 2010 -0800 Input: i8042 - add Dritek quirk for Acer Aspire 5610. commit e6edbdc52bc0755cbfe0721ca91d4fd87649bc13 upstream. Signed-off-by: Elliott Sales de Andrade Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 461eb3f6b31f67e16dfaf2e1827d746ebc76a9fc Author: Dmitry Torokhov Date: Sun Dec 13 00:34:06 2009 -0800 Input: i8042 - add Gigabyte M1022M to the noloop list commit a61cd03827eceefcec19eefc6e1173703fdc5e5d upstream. Gigabyte netbook model M1022M requires i8042.noloop, otherwise AUX port will not detected and the touchpad will not work. Unfortunately chassis type in DMI set to "Other" and thus generic laptop entry does not fire on it. Reported-by: Darryl Bond Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit f6278f11ca471e406868b636cbc2d9a65f6ee29f Author: Dmitry Torokhov Date: Fri Dec 4 10:24:19 2009 -0800 Input: i8042 - remove identification strings from DMI tables commit f909b1df0a068f30e252d8dc3e9d45ca25bf266f upstream. The driver does not reference identification strings in DMI tables and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 44d13be6ecdafef19772d84a290c6c9d53787db8 Author: Dmitry Torokhov Date: Fri Dec 4 10:24:19 2009 -0800 DMI: allow omitting ident strings in DMI tables commit 75757507e014fa074d25d2883c4ab604999584bd upstream. The purpose of dmi->ident is twofold - it may be used by DMI callback functions when composing log messages; it is also used to determine end of DMI table in dmi_check_system() and dmi_first_match(). However, in case when callbacks are not interested in using ident at all it just wastes memory. Let's make entries with empty first match slot serve as end-of-table markers instead. [needed for DMI table changes that need to be done by later patches - gkh] Acked-by: Jean Delvare Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 5172b4b0f1d06dd5cb27f335223131a2f08accb4 Author: Song Youquan Date: Fri Dec 11 18:42:35 2009 -0500 PCI: AER: fix aer inject result in kernel oops commit 46256f83d0d066f99ffde547f27473dfd2a78009 upstream. If the BIOS does not export _OSC to allow OS take over the PCIe AER, the pcie aer driver will not initialize the aer service. However, the aer_inject driver does not check this scenario, which results in a kernel oops when injecting an aer error into OS. For example: BUG: unable to handle kernel NULL pointer dereference at 0000000000000350 IP: [] _spin_lock_irqsave+0xc/0x23 PGD 155c41067 PUD 157fe0067 PMD 0 Oops: 0002 [#1] SMP Pid: 5119, comm: aer-inject Not tainted 2.6.32-rc8-mce #2 RIP: 0010:[] [] _spin_lock_irqsave+0xc/0x23 RSP: 0018:ffff880157f81e28 EFLAGS: 00010096 RAX: 0000000000000296 RBX: 0000000000000000 RCX: 0000000000000100 RDX: 0000000000010000 RSI: 0000000000000246 RDI: 0000000000000350 RBP: ffff880157f81e28 R08: 0000000000000004 R09: ffff880157f81dac R10: ffff88015a666f60 R11: ffff88015a666f40 R12: ffff88015758cc00 R13: 0000000000000350 R14: 0000000000000000 R15: 0000000000000100 FS: 00007f4d4a66e6f0(0000) GS:ffff8800282e0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000350 CR3: 000000015661a000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process aer-inject (pid: 5119, threadinfo ffff880157f80000, task ffff8801585f4340) Stack: ffff880157f81e78 ffffffff811b1615 ffff880157f81e78 ffffffff81222823 Call Trace: [] aer_irq+0x38/0x117 [] ? device_for_each_child+0x5f/0x6f [] aer_inject_write+0x409/0x45e [aer_inject] [] vfs_write+0xae/0x16a [] sys_write+0x47/0x6e [] system_call_fastpath+0x16/0x1b RIP [] _spin_lock_irqsave+0xc/0x23 RSP CR2: 0000000000000350 So check the _OSC before assuming that AER is available to the OS. Signed-off-by: Song Youquan Acked-by: Huang Ying Signed-off-by: Jesse Barnes Signed-off-by: Thomas Renninger Signed-off-by: Greg Kroah-Hartman commit bf9a88d93ee2cfa44b0cc1ada710e2ef37b5ce0d Author: Ron Mercer Date: Tue Nov 17 11:10:40 2009 +0000 qlge: Bonding fix for mode 6. commit 63ae93a19094d88c8ca62543586b20e3a7ff7637 upstream. Allow MAC address to be changed even if device is not up. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman commit 6b076176f9228c25cac5bdc17af8e4c4d2e687ab Author: Ron Mercer Date: Sat Oct 10 09:35:05 2009 +0000 qlge: Add handler for DCBX firmware event. commit 91ced682f9de17ebab5fcb2a70b48e372eb43281 upstream. The driver has nothing to do, but this marker prevents the event from showing up 'not handled'. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman commit 6055e7f7db45d4488608c47904d84b140eee8639 Author: Ron Mercer Date: Sat Oct 10 09:35:09 2009 +0000 qlge: Don't fail open when port is not initialized. commit 80928860941023bb37e9c61927395d0eb753bc3b upstream. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 836750ba4928d6af719bedcd338fe471fd440c6a Author: Ron Mercer Date: Sat Oct 10 09:35:04 2009 +0000 qlge: Set PCIE max read request size. commit bc9167f39ff8cd428e8577eb72751a653008edb2 upstream. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit ffd1fabc743060f589b1510f9b385d8c9bf0ffca Author: Ron Mercer Date: Sat Oct 10 09:35:03 2009 +0000 qlge: Remove explicit setting of PCI Dev CTL reg. commit 1d1023d039d8295070b8dbb92c4d972237235304 upstream. Remove explicit setting of error reporting bits. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 7c0798e2892bd16487e19ac87300013e3f7ec9e6 Author: Yi Zou Date: Tue Nov 3 11:49:43 2009 -0800 fcoe: Fix getting san mac for VLAN interface commit 5bab87e6d465d54a2b5899e0f583d42f00dbee2e upstream. Make sure we are get the SAN MAC address from the real netdev if the input netdev is a VLAN device. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 1ce03481ed022f32b3912ec780388f40eff9cec2 Author: Yi Zou Date: Tue Nov 3 11:49:38 2009 -0800 fcoe: Fix checking san mac address commit bf361707c81f8e8e43e332bfc8838bae76ae021a upstream. This was fixed before in 7a7f0c7 but it's introduced again recently. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit e166cb138dbfffc03d49ece03d27e9855db00f63 Author: Vasu Dev Date: Thu Oct 15 17:46:55 2009 -0700 fcoe, libfc: fix an libfc issue with queue ramp down in libfc commit 14caf44c69184ed72d46a2f883311daf27a4192f upstream. The cmd_per_lun value is used by scsi-ml as fall back lowest queue_depth value but in case of libfc cmd_per_lun is set to same value as max queue_depth = 32. So this patch reduces cmd_per_lun value to 3 and configures each lun with default max queue_depth 32 in fc_slave_alloc. Signed-off-by: Vasu Dev Acked-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 2792e0ceb2452e55269443158a6076a721d7556b Author: Abhijeet Joglekar Date: Thu Dec 10 09:59:20 2009 -0800 libfc: remote port gets stuck in restart state without really restarting commit 5543c72e2bbb30e5ba5938b18ec26617b8b3fb04 upstream. We ran into a scenario where a remote port goes into RESTART state, but never gets added to scsi transport. The running vmcore showed the following: a) Port was in RESTART state b) rdata->event was STOP c) no work gets scheduled for the remote work to fc_rport_work After this point, shut/no-shut of the remote port did not cause the port to get re-discovered. The port would move betwen DELETE and RESTART states, but the event would always be STOP, no work would get scheduled to fc_rport_work and the port would not get added to scsi_transport. The problem is that rdata->event is not set to NONE after a port is restarted. After this point, no more work gets scheduled for the remote port since new work is scheduled only if rdata->event is non-NONE. So, the event and state keep changing, but fc_rport_work does not get scheduled to actually handle the event. Here's a transition of states that explains the above observation: ) Port is first in READY State, event is NONE 2) RSCN on shut, port goes to DELETED, event is stop 3) Before fc_rport_work runs, RSCN on no-shut, port goes to RESTART, event is still STOP 4) fc_rport_work gets scheduled, removes the port from transport, sees state as RESTART, begins the PLOGI state machine, event remains as STOP (event NOT changed to NONE, this is the bug) 5) Plogi state machine completes, port state goes to READY, event goes to READY, but no work is scheduled since event was STOP (non-NONE) before. Fc_rport_work is not scheduled, port remains in READY state, but is not added to transport. Things are broken at this point. Libfc rport is ready, but no transport rport created. 6) now a shut causes port state to change to DELETE, event to change to STOP, no work gets scheduled 7) no-shut causes port state to change to RESTART, event remains at STOP, no work gets scheduled (6) and (7) now get repeated everytime we do shut/no-shut. No way to get out of this state. Fcc reset does not help too. Only way to get out is to load/unload module. Fix is to set rdata->event to NONE while processing the STOP/LOGO/FAILED events, inside the discovery and rport locks. Signed-off-by: Abhijeet Joglekar Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 407590ad18fa9f3c6561bda1caa04cdcdec9fe1f Author: Joe Eykholt Date: Wed Oct 21 16:28:30 2009 -0700 libfc: fix free of fc_rport_priv with timer pending commit b4a9c7ede96e90f7b1ec009ce7256059295e76df upstream. Timer crashes were caused by freeing a struct fc_rport_priv with a timer pending, causing the timer facility list to be corrupted. This was during FC uplink flap tests with a lot of targets. After discovery, we were doing an PLOGI on an rdata that was in DELETE state but not yet removed from the lookup list. This moved the rdata from DELETE state to PLOGI state. If the PLOGI exchange allocation failed and needed to be retried, the timer scheduling could race with the free being done by fc_rport_work(). When fc_rport_login() is called on a rport in DELETE state, move it to a new state RESTART. In fc_rport_work, when handling a LOGO, STOPPED or FAILED event, look for restart state. In the RESTART case, don't take the rdata off the list and after the transport remote port is deleted and exchanges are reset, re-login to the remote port. Note that the new RESTART state also corrects a problem we had when re-discovering a port that had moved to DELETE state. In that case, a new rdata was created, but the old rdata would do an exchange manager reset affecting the FC_ID for both the new rdata and old rdata. With the new state, the new port isn't logged into until after any old exchanges are reset. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit a3d46ca93e4625246a89e62c913ba60742d7bc70 Author: Chris Leech Date: Wed Oct 21 16:28:09 2009 -0700 libfc: fix memory corruption caused by double frees and bad error handling commit 8f550f937e9fdafa5c37e348e214aecec851ef3f upstream. I was running into several different panics under stress, which I traced down to a few different possible slab corruption issues in error handling paths. I have not yet looked into why these exchange sends fail, but with these fixes my test system is much more stable under stress than before. fc_elsct_send() could fail and either leave the passed in frame intact (failure in fc_ct/els_fill) or the frame could have been freed if the failure was is fc_exch_seq_send(). The caller had no way of knowing, and there was a potential double free in the error handling in fc_fcp_rec(). Make fc_elsct_send() always free the frame before returning, and remove the fc_frame_free() call in fc_fcp_rec(). While fc_exch_seq_send() did always consume the frame, there were double free bugs in the error handling of fc_fcp_cmd_send() and fc_fcp_srr() as well. Numerous calls to error handling routines (fc_disc_error(), fc_lport_error(), fc_rport_error_retry() ) were passing in a frame pointer that had already been freed in the case of an error. I have changed the call sites to pass in a NULL pointer, but there may be more appropriate error codes to use. Question: Why do these error routines take a frame pointer anyway? I understand passing in a pointer encoded error to the response handlers, but the error routines take no action on a valid pointer and should never be called that way. Signed-off-by: Chris Leech Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 4c40dbe52412690b4a686e4e6c1625f19cb8c6c6 Author: Yi Zou Date: Wed Oct 21 16:27:58 2009 -0700 libfc: Fix frags in frame exceeding SKB_MAX_FRAGS in fc_fcp_send_data commit d37322a43ebac79eef417149f5696390cf8872db upstream. In case of sequence offload, in fc_fcp_send_data(), the skb_fill_page_info() called may end up adding more frags to the skb_shinfo(fp_skb(fp))->frags[], exceeding SKB_MAX_FRAGS, this eventually corrupts the memory. I am adding the FR_FRAME_SG_LEN back, but as SKB_MAX_FRAGS -1, leaving 1 for our fcoe_eof_crc page. And send will be broken into multiple large sends if the frame already contains more frags than skb handle. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 88cc93a1148a8a2f56a556a4f511837056556c4e Author: Mike Christie Date: Wed Oct 21 16:27:44 2009 -0700 fcoe: initialize return value in fcoe_destroy commit 8eca355fa8af660557fbdd5506bde1392eee9bfe upstream. When doing echo ethX > /sys..../destroy I am getting errors when the tear down succeeds. It looks like the reason for this is because the rc var is not getting set when the destruction works. This just sets it to zero. Signed-off-by: Mike Christie Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 7c8a0dc2b096fb9acf7dea76cc7935da8aeb711d Author: Joe Eykholt Date: Wed Oct 21 16:27:22 2009 -0700 libfc: don't WARN_ON in lport_timeout for RESET state commit 22655ac22289d7b7def8ef2d72eafe5024bd57fe upstream. It's possible and harmless to get FLOGI timeouts while in RESET state. Don't do a WARN_ON in that case. Also, split out the other WARN_ONs in fc_lport_timeout, so we can tell which one is hit by its line number. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 83d236b7272f68e8a7736894970a6d283c74d415 Author: Joe Eykholt Date: Wed Oct 21 16:27:17 2009 -0700 libfc: lport: fix minor documentation errors commit 1b69bc062c2a4c8f3e15ac69f487afec3aa8d774 upstream. Fix minor errors. A debug message said an RLIR was received instead of ECHO. "Expected" was misspelled in several places. Fix a type cast from u32 to __be32. Rob, Some of these may have been also taken care of in your other doc cleanup patch. Feel free to fold them in. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 56320f6e40141bfbe46168083e0760e07aabe926 Author: Yi Zou Date: Wed Oct 21 16:27:12 2009 -0700 libfc: Fix wrong scsi return status under FC_DATA_UNDRUN commit 4347fa66878e079766258bc0d077c350cb31a799 upstream. This bug is exposed when there is a link flap in LLD. Particularly, when it happens right after a SCSI write command is sent out, no FCP_DATA is sent, causing fsp->status_code to be set as FC_DATA_UNDRUN in fc_fcp_complete_locked even no SCSI status is received. Consequently, fc_io_compl treats this as DID_OK. This results in SCSI returning successful to the initial I/O request even there is no DATA actually sent. Particularly, if you run an I/O tool w/ data verification on, the read back for verification is gonna fail. This is fixed here by checking when FC_DATA_UNDRUN happens, SCSI status is received w/ FC_SRB_RCV_STATUS set in fsp->state. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit d5d72dafd7513b5413e409d1c3618230713c882c Author: Yi Zou Date: Wed Oct 21 16:26:55 2009 -0700 fcoe: remove redundant checking of netdev->netdev_ops commit b04d023cf5b7f4113cc4a09405c2fe8003bfe37d upstream. Remove the redundant checking of netdev->netdev_ops as it will never be NULL. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 34556a180553c21a2f4a935d8eb9c84d857df61c Author: Yi Zou Date: Wed Oct 21 16:26:50 2009 -0700 libfc: fix ddp in fc_fcp for 0 xid commit 5e472d077f45de4f37365171bd742f18b3ef20de upstream. xid 0 was used as an indication of invalid xid before but now xid 0 can be used as a valid exchange i. This patch fixes the ddp completion in fcp layer, i.e., in fc_fcp.c:fc_fcp_ddp_done() function, to make sure it does not use xid 0 for indication of an invalid xid, instead, it now uses use FC_XID_UNKNOWN for such indication. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 1e418b2888ac64de29659d693d70614583d30ddf Author: Joe Eykholt Date: Wed Oct 21 16:26:45 2009 -0700 libfc: fix typo in retry check on received PRLI commit 85b5893ca97c69e409ecbb5ee90a5d99882369c4 upstream. A received Fibre Channel ELS PRLI request contains a bit that indicates whether the remote port supports certain retry processing sequences. The test for this bit was somehow coded to use multiply instead of AND! This case would apply only for target mode operation, and it is unlikely to be noticed as an initiator. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 253f41bf6ec0c40f6364bdf211f7f7661667e4f8 Author: Michael Reed Date: Fri Sep 18 12:02:05 2009 -0500 lpfc: fix hang on SGI ia64 platform commit 8e68597d087977d3e4fd3e735d290ab45fd0b5ea upstream. In testing 2.6.31 on one of our ia64 platforms I've encountered a hang due to the driver using hardware ATEs which are a limited resource. This is because the driver does not set the dma consistent mask to 64 bits. Signed-off-by: Michael Reed Acked-by: James Smart Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 4b2bc96c3aa79b5d39be8ddbf903b7d19c701d88 Author: Michael Reed Date: Fri Oct 9 14:15:59 2009 -0500 scsi_transport_fc: remove invalid BUG_ON commit 8798a694da59486e4a3ff0abeec183202fb34c20 upstream. I was doing some large lun count testing with 2.6.31 and hit a BUG_ON() in fc_timeout_deleted_rport(), and it seems like it should have been just a matter of time before someone did. It seems invalid to set port_state under lock, then expect it to remain set after releasing the lock. Another thread called fc_remote_port_add() when the lock was released, changing the port_state. This patch removes the BUG_ON and moves the test of the port_state to inside the host_lock. It's been running for several weeks now with no ill effect. Signed-off-by: Michael Reed Acked-by: James Smart Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit d502a766937129c5965bc88b8740a9362b9b263b Author: Chandra Seetharaman Date: Fri Sep 11 10:20:35 2009 -0700 scsi_dh: create sysfs file, dh_state for all SCSI disk devices commit 5917290ce9b376866b165d02a5ed88d5ecdb32d0 upstream. Create the sysfs file, dh_state even if the new SCSI device is not in the any of the device handler's internal lists. Signed-Off-by: Chandra Seetharaman Acked-by: Hannes Reinecke Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit e7c8167e4e6fc9c66740e3984add69154bf30a90 Author: Takahiro Yasui Date: Tue Nov 10 16:22:19 2009 -0500 scsi_devinfo: update Hitachi entries (v2) commit 627511e3e67553b04f6917c03e39b797df210e04 upstream. Four models, OPEN-/DF400/DF500/DISK-SUBSYSTEM, can handle REPORT_LUN, and the BLIST_REPORTLUN2 flag needs to be set. And DF600 doesn't require any flags because it returns ANSI 03h (SPC). Signed-off-by: Takahiro Yasui Signed-off-by: James Bottomley Acked-by: Hannes Reinecke Signed-off-by: Greg Kroah-Hartman commit 001252f8ea9e1ce2e376d515d410c23d932b5a31 Author: Jiri Kosina Date: Thu Nov 5 14:08:03 2009 +0100 HID: fixup quirk for NCR devices commit 5b915d9e6dc3d22fedde91dfef1cb1a8fa9a1870 upstream. NCR devices are terminally broken by design -- they claim themselves to contain proper input applications in their HID report descriptor, but behave very badly if treated in standard way. According to NCR developers, the devices get confused when queried for reports in a standard way, rendering them unusable. NCR is shipping application called "RPSL" that can be used to drive these devices through hiddev, under the assumption that in-kernel driver doesn't perform initial report query. If it does, neither in-kernel nor hiddev-based driver can operate with these devices any more. Introduce a quirk that skips the report query for all NCR devices. The previous NOGET quirk was wrong and had been introduced because I misunderstood the nature of brokenness of these devices. Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit 5e057878f946d25bf3a3bc811f4e27099f41c24f Author: Chuck Lever Date: Thu Dec 3 15:58:56 2009 -0500 NFS: Revert default r/wsize behavior commit dd47f96c077b4516727e497e4b6fd47a06778c0a upstream. When the "rsize=" or "wsize=" mount options are not specified, text-based mounts have slightly different behavior than legacy binary mounts. Text-based mounts use the smaller of the server's maximum and the client's maximum, but binary mounts use the smaller of the server's _preferred_ size and the client's maximum. This difference is actually pretty subtle. Most servers advertise the same value as their maximum and their preferred transfer size, so the end result is the same in most cases. The reason for this difference is that for text-based mounts, if r/wsize are not specified, they are set to the largest value supported by the client. For legacy mounts, the values are set to zero if these options are not specified. nfs_server_set_fsinfo() can negotiate the transfer size defaults correctly in any case. There's no need to specify any particular value as default in the text-based option parsing logic. Note that nfs4 doesn't use nfs_server_set_fsinfo(), but the mount.nfs4 command does set rsize and wsize to 0 if the user didn't specify these options. So, make the same change for text-based NFSv4 mounts. Thanks to James Pearson for reporting and diagnosing the problem. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust Cc: Neil Brown Signed-off-by: Greg Kroah-Hartman commit 1d42a1bd932f8963c5c5b4944baabb7e74b6e8e2 Author: Mike Christie Date: Wed Nov 11 16:34:34 2009 -0600 iscsi class: modify handling of replacement timeout commit fdd46dcbe4468a1f47a2cc9be442d11c3d21dd68 upstream. This patch modifies the replacement/recovery_timeout so it works more like the fc fast io fail tmo. If userspace tries to set the replacement/recovery_timeout to less than zero, we will turn off the forced recovery cleanup. If userspace sets the value to 0 then we will force the recovery cleanup immediately. Signed-off-by: Mike Christie Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 83886fa2a0a80b8069b37beed574655feeb70de3 Author: Alex Williamson Date: Mon Nov 30 14:51:44 2009 -0700 PCI: Always set prefetchable base/limit upper32 registers commit 59353ea30e65ab3ae181d6175e3212e1361c3787 upstream. Prior to 1f82de10 we always initialized the upper 32bits of the prefetchable memory window, regardless of the address range used. Now we only touch it for a >32bit address, which means the upper32 registers remain whatever the BIOS initialized them too. It's valid for the BIOS to set the upper32 base/limit to 0xffffffff/0x00000000, which makes us program prefetchable ranges like 0xffffffffabc00000 - 0x00000000abc00000 Revert the chunk of 1f82de10 that made this conditional so we always write the upper32 registers and remove now unused pref_mem64 variable. Signed-off-by: Alex Williamson Signed-off-by: Jesse Barnes Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman commit 5cf92e9a8fb63cff15027fd6a738d455b4efcd1a Author: Mike Travis Date: Tue Nov 17 18:22:13 2009 -0600 timers, init: Limit the number of per cpu calibration bootup messages commit feae3203d711db0a9965300ee6d592257fdaae4f upstream. Limit the number of per cpu calibration messages by only printing out results for the first cpu to boot. Also, don't print "CPUx is down" as this is expected, and we don't need 4096 reminders... ;-) Signed-off-by: Mike Travis Cc: Heiko Carstens Cc: Roland Dreier Cc: Randy Dunlap Cc: Tejun Heo Cc: Andi Kleen Cc: Greg Kroah-Hartman Cc: Yinghai Lu Cc: David Rientjes Cc: Steven Rostedt Cc: Rusty Russell Cc: Hidetoshi Seto Cc: Jack Steiner Cc: Frederic Weisbecker LKML-Reference: <20091118002219.889552000@alcatraz.americas.sgi.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 34911bf2037c212644cc6b3e2e3207af4e763df7 Author: Frank Filz Date: Wed Oct 21 16:45:02 2009 -0700 nfsd: Fix sort_pacl in fs/nfsd/nf4acl.c to actually sort groups commit aba24d71580180dfdf6a1a83a5858a1c048fd785 upstream. We have been doing some extensive testing of Linux support for ACLs on NFDS v4. We have noticed that the server rejects ACLs where the groups are out of order, for example, the following ACL is rejected: A::OWNER@:rwaxtTcCy A::user101@domain:rwaxtcy A::GROUP@:rwaxtcy A:g:group102@domain:rwaxtcy A:g:group101@domain:rwaxtcy A::EVERYONE@:rwaxtcy Examining the server code, I found that after converting an NFS v4 ACL to POSIX, sort_pacl is called to sort the user ACEs and group ACEs. Unfortunately, a minor bug causes the group sort to be skipped. Signed-off-by: Frank Filz Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman commit a9238ce3bb0fda6e760780b702c6cbd3793087d3 Author: Jon Hunter Date: Tue Aug 18 12:45:10 2009 -0500 nohz: Prevent clocksource wrapping during idle commit 98962465ed9e6ea99c38e0af63fe1dcb5a79dc25 upstream. The dynamic tick allows the kernel to sleep for periods longer than a single tick, but it does not limit the sleep time currently. In the worst case the kernel could sleep longer than the wrap around time of the time keeping clock source which would result in losing track of time. Prevent this by limiting it to the safe maximum sleep time of the current time keeping clock source. The value is calculated when the clock source is registered. [ tglx: simplified the code a bit and massaged the commit msg ] Signed-off-by: Jon Hunter Cc: John Stultz LKML-Reference: <1250617512-23567-2-git-send-email-jon-hunter@ti.com> Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit db47a1671a787a27a6f9ef780f1865fa4372f361 Author: Christian Ehrhardt Date: Mon Nov 30 12:16:46 2009 +0100 sched: Fix missing sched tunable recalculation on cpu add/remove commit 0bcdcf28c979869f44e05121b96ff2cfb05bd8e6 upstream. Based on Peter Zijlstras patch suggestion this enables recalculation of the scheduler tunables in response of a change in the number of cpus. It also adds a max of eight cpus that are considered in that scaling. Signed-off-by: Christian Ehrhardt Signed-off-by: Peter Zijlstra LKML-Reference: <1259579808-11357-2-git-send-email-ehrhardt@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 08b84be9e906f97340acbf6c5daaa53bbf4fa194 Author: Rusty Russell Date: Wed Dec 2 14:09:16 2009 +1030 sched: Fix isolcpus boot option commit bdddd2963c0264c56f18043f6fa829d3c1d3d1c0 upstream. Anton Blanchard wrote: > We allocate and zero cpu_isolated_map after the isolcpus > __setup option has run. This means cpu_isolated_map always > ends up empty and if CPUMASK_OFFSTACK is enabled we write to a > cpumask that hasn't been allocated. I introduced this regression in 49557e620339cb13 (sched: Fix boot crash by zalloc()ing most of the cpu masks). Use the bootmem allocator if they set isolcpus=, otherwise allocate and zero like normal. Reported-by: Anton Blanchard Signed-off-by: Rusty Russell Cc: peterz@infradead.org Cc: Linus Torvalds Cc: LKML-Reference: <200912021409.17013.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar Tested-by: Anton Blanchard commit eb9dbd9c1ffe8fa93e385c186e25ffa7bad53b67 Author: Aleksey Kunitskiy Date: Sat Nov 14 15:18:54 2009 +0200 ALSA: ice1724 - Patch for suspend/resume for ESI Juli@ commit 50d40f187f9182ee8caa1b83f80a0e11e2226baa upstream. Add proper suspend/resume code for Juli@ cards. Based on ice1724 suspend/resume work of Igor Chernyshev. Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4413 Tested on linux-2.6.31.6 Signed-off-by: Aleksey Kunitskiy Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit e96610c64809b253558c3706b02fe173b0b829d8 Author: Karel Zak Date: Mon Nov 23 09:29:13 2009 +0100 partitions: use sector size for EFI GPT commit 7d13af3279985f554784a45cc961f706dbcdbdd1 upstream. Currently, kernel uses strictly 512-byte sectors for EFI GPT parsing. That's wrong. UEFI standard (version 2.3, May 2009, 5.3.1 GUID Format overview, page 95) defines that LBA is always based on the logical block size. It means bdev_logical_block_size() (aka BLKSSZGET) for Linux. This patch removes static sector size from EFI GPT parser. The problem is reproducible with the latest GNU Parted: # modprobe scsi_debug dev_size_mb=50 sector_size=4096 # ./parted /dev/sdb print Model: Linux scsi_debug (scsi) Disk /dev/sdb: 52.4MB Sector size (logical/physical): 4096B/4096B Partition Table: gpt Number Start End Size File system Name Flags 1 24.6kB 3002kB 2978kB primary 2 3002kB 6001kB 2998kB primary 3 6001kB 9003kB 3002kB primary # blockdev --rereadpt /dev/sdb # dmesg | tail -1 sdb: unknown partition table <---- !!! with this patch: # blockdev --rereadpt /dev/sdb # dmesg | tail -1 sdb: sdb1 sdb2 sdb3 Signed-off-by: Karel Zak Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 6f8de29a8ef0abd5800589f3f8f4927b9a72739a Author: Karel Zak Date: Mon Nov 23 09:29:58 2009 +0100 partitions: read whole sector with EFI GPT header commit 87038c2d5bda2418fda8b1456a0ae81cc3ff5bd8 upstream. The size of EFI GPT header is not static, but whole sector is allocated for the header. The HeaderSize field must be greater than 92 (= sizeof(struct gpt_header) and must be less than or equal to the logical block size. It means we have to read whole sector with the header, because the header crc32 checksum is calculated according to HeaderSize. For more details see UEFI standard (version 2.3, May 2009): - 5.3.1 GUID Format overview, page 93 - Table 13. GUID Partition Table Header, page 96 Signed-off-by: Karel Zak Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 8f2fefcddff63394e42a6165040945cc9967bd19 Author: Florian Westphal Date: Mon Nov 23 10:43:57 2009 +0100 netfilter: xtables: fix conntrack match v1 ipt-save output commit 3a0429292daa0e1ec848bd26479f5e48b0d54a42 upstream. commit d6d3f08b0fd998b647a05540cedd11a067b72867 (netfilter: xtables: conntrack match revision 2) does break the v1 conntrack match iptables-save output in a subtle way. Problem is as follows: up = kmalloc(sizeof(*up), GFP_KERNEL); [..] /* * The strategy here is to minimize the overhead of v1 matching, * by prebuilding a v2 struct and putting the pointer into the * v1 dataspace. */ memcpy(up, info, offsetof(typeof(*info), state_mask)); [..] *(void **)info = up; As the v2 struct pointer is saved in the match data space, it clobbers the first structure member (->origsrc_addr). Because the _v1 match function grabs this pointer and does not actually look at the v1 origsrc, run time functionality does not break. But iptables -nvL (or iptables-save) cannot know that v1 origsrc_addr has been overloaded in this way: $ iptables -p tcp -A OUTPUT -m conntrack --ctorigsrc 10.0.0.1 -j ACCEPT $ iptables-save -A OUTPUT -p tcp -m conntrack --ctorigsrc 128.173.134.206 -j ACCEPT (128.173... is the address to the v2 match structure). To fix this, we take advantage of the fact that the v1 and v2 structures are identical with exception of the last two structure members (u8 in v1, u16 in v2). We extract them as early as possible and prevent the v2 matching function from looking at those two members directly. Previously reported by Michel Messerschmidt via Ben Hutchings, also see Debian Bug tracker #556587. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 3cd4bea0c43831b242a8562f713122b1b9daf21a Author: Ben Hutchings Date: Thu Dec 3 19:51:09 2009 -0300 V4L/DVB (13680b): DocBook/media: create links for included sources commit 5bf583473813530c1bf82051a35fac8d5045f4f7 upstream. If docs are being built in a separate directory, xmlto and xsltproc can't find included sources. Make links back to the source directory. I would much prefer to have xmlto and xsltproc look in the source directory for included entities but couldn't see how to do that. This needs to be solved in some way for 2.6.32, even if this patch isn't the right way to do it. Signed-off-by: Ben Hutchings Cc: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit 35f42c92098c70fc576e3baa8955db9fb2ba9cb5 Author: Ben Hutchings Date: Thu Dec 3 19:50:35 2009 -0300 V4L/DVB (13680a): DocBook/media: copy images after building HTML commit 49b14650ba5bf80234cb1984fd8396aff03430ce upstream. The rule for %.html removes the output directory, so there is no point in copying images before building HTML. Documentation/DocBook/Makefile | 10 +++++----- Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 857ffb889a5d4760b14e5e46bbe6308fd02d0526 Author: Jie Yang Date: Tue Dec 1 17:18:34 2009 +0000 atl1e:disable NETIF_F_TSO6 for hardware limit commit 7c7afb083675b3d4d012a2aacec3a958ba484ab0 upstream. For hardware limit to support TSOV6, just disable this feature Signed-off-by: Jie Yang Signed-off-by: David S. Miller Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit f7b17144048d7b1feda0dd1f255629bb187ac30f Author: Jie Yang Date: Sun Dec 6 23:16:58 2009 +0000 atl1c:use common_task instead of reset_task and link_chg_task commit cb19054697e92a793f336380fd72c588521178ff upstream. use common_task instead of reset_task and link_chg_task, so it fix "call cancel_work_sync from the work itself". Signed-off-by: Jie Yang Signed-off-by: David S. Miller Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit b68f61930c00abfe5e7dd6535c6e23547c77bab4 Author: Seth Heasley Date: Wed Nov 11 02:24:01 2009 +0100 iTCO_wdt: Add support for Intel Ibex Peak commit 79e8941dda254505bb8af37b3a009165dfb7e98a upstream. Add the Intel Ibex Peak (PCH) Device IDs to iTCO_wdt.c. Signed-off-by: Seth Heasley Signed-off-by: Wim Van Sebroeck Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 96ef353c45ee9ef98c28c72c1c240c9825c75392 Author: Danny Wood Date: Sun Sep 20 12:14:21 2009 -0300 V4L/DVB (13168): Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847) commit e3c6e1aaa5db7822524f5b1355960fd732910068 upstream. Adds the device IDs and driver linking to allow the Asus Europa DVB-T card to operate with these drivers. The device has a SAA7134 chipset with a TD1316 Hybrid Tuner. All inputs work on the card including switching between DVB-T and Analogue TV, there is also no IR with this card. [mchehab@redhat.com: CodingStyle fixes] Signed-off-by: Danny Wood Cc: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit 8429570c6a0a53b0b1eee1410e9b54d1b224db8d Author: Cliff Brake Date: Tue Dec 1 09:53:42 2009 -0500 USB: ftdi_sio: add USB device ID's for B&B Electronics line commit a8cbd90a0410096e152f68a4e114a8b5c7abb49b upstream. Reviewed-by: John Pilles Signed-off-by: Cliff Brake Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 5bcaffb93f43a5e1c8906e87524f813140795ced Author: Cliff Brake Date: Tue Dec 1 09:53:43 2009 -0500 USB: mos7840: add device IDs for B&B electronics devices commit acf509ae28301d78b022c534c26b1e4765c18f2b upstream. Reviewed-by: John Pilles Signed-off-by: Cliff Brake Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 4d3c6786cace38eb34ee6f00fc59ef8b848ebd8c Author: Michael Krufky Date: Mon Nov 30 18:22:10 2009 -0300 V4L/DVB (13569): smsusb: add autodetection support for five additional Hauppauge USB IDs commit 20d15a200d34cfb7141fb4558895d7d5233db84b upstream. Add support for five new Hauppauge Device USB IDs: 2040:b980 2040:b990 2040:c010 2040:c080 2040:c090 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit ff23399022735e9e629919843a236ba0b9897a81 Author: Stefan Ringel Date: Mon Dec 14 11:27:11 2009 +0100 ALSA: hda - Add PCI IDs for Nvidia G2xx-series commit 6dd7dc767e35cfbb38f8c63a50b1c27acad25920 upstream. Signed-off-by: Stefan Ringel Signed-off-by: Takashi Iwai Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 4bc685e6b0d123ceca7bccb05ebce2e5e6a5ba21 Author: Kay Sievers Date: Fri Dec 18 21:18:15 2009 +0100 vfs: get_sb_single() - do not pass options twice commit 9329d1beaeed1a94f030c784dcec5ff973f402c4 upstream. Filesystem code usually destroys the option buffer while parsing it. This leads to errors when the same buffer is passed twice. In case we fill a new superblock do not call remount. This is needed to quite a warning that the debugfs code causes every boot. Cc: Miklos Szeredi Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 1b715f18181d2156290bfb8f116e233ffc8fb362 Author: Heiko Carstens Date: Mon Jan 18 14:36:12 2010 +0100 driver-core: fix devtmpfs crash on s390 commit f776c5ec4690b21b3668ad5956774a22c86f541a upstream. On Mon, Jan 18, 2010 at 05:26:20PM +0530, Sachin Sant wrote: > Hello Heiko, > > Today while trying to boot next-20100118 i came across > the following Oops : > > Brought up 4 CPUs > Unable to handle kernel pointer dereference at virtual kernel address 0000000000 > 543000 > Oops: 0004 #1 SMP > Modules linked in: > CPU: 0 Not tainted 2.6.33-rc4-autotest-next-20100118-5-default #1 > Process swapper (pid: 1, task: 00000000fd792038, ksp: 00000000fd797a30) > Krnl PSW : 0704200180000000 00000000001eb0b8 (shmem_parse_options+0xc0/0x328) > R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:2 PM:0 EA:3 > Krnl GPRS: 000000000054388a 000000000000003d 0000000000543836 000000000000003d > 0000000000000000 0000000000483f28 0000000000536112 00000000fd797d00 > 00000000fd4ba100 0000000000000100 0000000000483978 0000000000543832 > 0000000000000000 0000000000465958 00000000001eb0b0 00000000fd797c58 > Krnl Code: 00000000001eb0aa: c0e5000994f1 brasl %r14,31da8c > 00000000001eb0b0: b9020022 ltgr %r2,%r2 > 00000000001eb0b4: a784010b brc 8,1eb2ca > >00000000001eb0b8: 92002000 mvi 0(%r2),0 > 00000000001eb0bc: a7080000 lhi %r0,0 > 00000000001eb0c0: 41902001 la %r9,1(%r2) > 00000000001eb0c4: b9040016 lgr %r1,%r6 > 00000000001eb0c8: b904002b lgr %r2,%r11 > Call Trace: > (<00000000fd797c50> 0xfd797c50) > <00000000001eb5da> shmem_fill_super+0x13a/0x25c > <0000000000228cfa> get_sb_single+0xbe/0xdc > <000000000034ffc0> dev_get_sb+0x2c/0x38 > <000000000066c602> devtmpfs_init+0x46/0xc0 > <000000000066c53e> driver_init+0x22/0x60 > <000000000064d40a> kernel_init+0x24e/0x3d0 > <000000000010a7ea> kernel_thread_starter+0x6/0xc > <000000000010a7e4> kernel_thread_starter+0x0/0xc > > I never tried to boot a kernel with DEVTMPFS enabled on a s390 box. > So am wondering if this is supported or not ? If you think this > is supported i will send a mail to community on this. There is nothing arch specific to devtmpfs. This part crashes because the kernel tries to modify the data read-only section which is write protected on s390. Signed-off-by: Heiko Carstens Acked-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit da30443952067e4abb1f3e50b226b8669c62dc02 Author: Kay Sievers Date: Fri Oct 30 12:48:32 2009 +0100 Driver-Core: devtmpfs - set root directory mode to 0755 commit 03d673e6af6490371aaf64dfe1f84c658c48b71d upstream. Signed-off-by: Kay Sievers Cc: Mark Rosenstand Signed-off-by: Greg Kroah-Hartman commit 04daa51ee473ca536c225539699af0cdf7d165c6 Author: Sebastian Kapfer Date: Fri Jan 15 10:11:22 2010 -0800 Input: ALPS - add interleaved protocol support (Dell E6x00 series) commit 1d9f26262aef6d63ff65eba0fd5f1583f342b69b upstream Properly handle version of the protocol where standard PS/2 packets from trackpoint are stuffed into middle (byte 3-6) of the standard ALPS packets when both the touchpad and trackpoint are used together. The patch is based on work done by Matthew Chapman and additional research done by David Kubicek and Erik Osterholm: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/296610 Many thanks to David Kubicek for his efforts in researching fine points of this new version of the protocol, especially interaction between pad and stick in these models. Cc: Andy Isaacson Signed-off-by: Sebastian Kapfer Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 30dc12eeba955e22fdb4e64c1af5f6373220555e Author: Hemant Pedanekar Date: Wed Sep 2 16:49:35 2009 +0530 davinci: dm646x: Add support for 3.x silicon revision commit f63dd12da29f47c37bbc093abec098538e04357c upstream. DM6467 silicon revisions 3.x have variant field in JTAGID register as '1'. This path adds entry for the same in dm646x_ids to be able to boot on boards with 3.x revision chips. Also modifies name for 'variant=0' (revisions 1.0, 1.1). Signed-off-by: Hemant Pedanekar Signed-off-by: Kevin Hilman Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit c375e84ef885bcf95b2ac1964b4dad64238f3b89 Author: Ben Hutchings Date: Sat Jan 23 14:27:55 2010 +0000 powerpc/fsl: Add PCI device ids for new QoirQ chips commit a3f62bd2b20c769ddc989b242ddd274179e19ee6 upstream by Kumar Gala . I have adjusted the patch context for 2.6.32. Signed-off-by: Kumar Gala Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit a98917c181b0f37a9ec47f15853d4742a1d38b3b Author: Thomas Klute Date: Tue Nov 17 11:58:18 2009 +0100 ar9170: Add support for D-Link DWA 160 A2 commit 15295380f45aa0d35665f6e5596ac98c081d95b9 upstream. At least two revisions of the D-Link DWA 160 exist, called A1 and A2. A1 (USB-ID 07d1:3c10) is already listed in usb.c as D-Link DWA 160A. A2 (USB-ID 07d1:3a09) works if added to ar9170_usb_ids. I didn't do much testing until now, but I was able to connect to APs using WPA or WEP and transmit data. Summary: * Add model revision number to the comment for D-Link DWA 160 A1 (07d1:3c10) * Add support for D-Link DWA 160 A2 (07d1:3a09) Signed-off-by: Thomas Klute Signed-off-by: John W. Linville Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 002464c610da98684edbde2aaf8d728c098f3486 Author: Kashyap, Desai Date: Wed Sep 23 17:24:27 2009 +0530 mpt2sas: New device SAS2208 support is added commit db27136a89d061bf9dceb28953a61a8ef862ca7f upstream. Added device ids range for { 0x80 - 87 } , modified mpi/mpi2_cnfg.h containing MPI2_MFGPAGE_DEVID_SAS2208_X. Signed-off-by: Kashyap Desai Signed-off-by: Eric Moore Signed-off-by: James Bottomley Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 90ee3cae9a305273b03231176be15e50f23c78ba Author: Ajit Khaparde Date: Thu Oct 29 01:11:06 2009 -0700 be2net: Add the new PCI IDs to PCI_DEVICE_TABLE. commit 59fd5d87a4243a992f3a3e69f3627cf4c509608e upstream. This patch adds the PCI IDs for the next generation chip to the PCI_DEVICE_ID table. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 879c8e8fe006114b844580b7ab5cd30073914ea6 Author: Ajit Khaparde Date: Fri Oct 16 18:02:12 2009 -0700 be2net: Add support for next generation of BladeEngine device. commit 12d7ea2c5a5c87834daf9fcd920aab80ff6248b1 upstream. Add new PCI ids to support next generation of BladeEngine device. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit c97c73dead2d08a2e3eb2f84ad27b941deaef405 Author: Neil Turton Date: Wed Dec 23 13:47:13 2009 +0000 sfc: Fix DMA mapping cleanup in case of an error in TSO commit a7ebd27a13757248863cd61e541af7fa9e7727ee upstream. We need buffer->len to remain valid to work out the correct address to be unmapped. We therefore need to clear buffer->len after the unmap operation. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 9396c903006269d71ee54431b7a405cc8c318efd Author: Xiaotian Feng Date: Thu Dec 10 19:56:45 2009 +0800 ACPI: don't cond_resched if irq is disabled commit c084ca704a3661bf77690a05bc6bd2c305d87c34 upstream. commit 8bd108d adds preemption point after each opcode parse, then a sleeping function called from invalid context bug was founded during suspend/resume stage. this was fixed in commit abe1dfa by don't cond_resched when irq_disabled. But recent commit 138d156 changes the behaviour to don't cond_resched when in_atomic. This makes the sleeping function called from invalid context bug happen again, which is reported in http://lkml.org/lkml/2009/12/1/371. This patch also fixes http://bugzilla.kernel.org/show_bug.cgi?id=14483 Reported-and-bisected-by: Larry Finger Reported-and-bisected-by: Justin P. Mattock Signed-off-by: Xiaotian Feng Acked-by: Alexey Starikovskiy Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit ce946bce1761f3c9f1f1ed8c15515d70d19047e9 Author: H Hartley Sweeten Date: Fri Oct 16 18:19:01 2009 -0400 clockevents: Add missing include to pacify sparse commit 8e1a928a2ed7e8d5cad97c8e985294b4caedd168 upstream. Include "tick-internal.h" in order to pick up the extern function prototype for clockevents_shutdown(). This quiets the following sparse build noise: warning: symbol 'clockevents_shutdown' was not declared. Should it be static? Signed-off-by: H Hartley Sweeten LKML-Reference: Reviewed-by: Yong Zhang Cc: johnstul@us.ibm.com Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit 08b8ff44354d5550d90eafd6cde87cb9f1d0ebcb Author: Xiaotian Feng Date: Thu Jan 7 11:22:44 2010 +0800 clockevent: Don't remove broadcast device when cpu is dead commit ea9d8e3f45404d411c00ae67b45cc35c58265bb7 upstream. Marc reported that the BUG_ON in clockevents_notify() triggers on his system. This happens because the kernel tries to remove an active clock event device (used for broadcasting) from the device list. The handling of devices which can be used as per cpu device and as a global broadcast device is suboptimal. The simplest solution for now (and for stable) is to check whether the device is used as global broadcast device, but this needs to be revisited. [ tglx: restored the cpuweight check and massaged the changelog ] Reported-by: Marc Dionne Tested-by: Marc Dionne Signed-off-by: Xiaotian Feng LKML-Reference: <1262834564-13033-1-git-send-email-dfeng@redhat.com> Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit f584d374f2ab8cbc348ad23ecb82b419c0b8705c Author: Greg Kroah-Hartman Date: Mon Jan 25 10:50:10 2010 -0800 Linux 2.6.32.6 commit 9607f0688fe1db11f19ff43940fe4697845ec9da Author: Peter Zijlstra Date: Mon Jan 18 09:12:32 2010 +0100 perf: Honour event state for aux stream data commit 22e190851f8709c48baf00ed9ce6144cdc54d025 upstream. Anton reported that perf record kept receiving events even after calling ioctl(PERF_EVENT_IOC_DISABLE). It turns out that FORK,COMM and MMAP events didn't respect the disabled state and kept flowing in. Reported-by: Anton Blanchard Signed-off-by: Peter Zijlstra Tested-by: Anton Blanchard LKML-Reference: <1263459187.4244.265.camel@laptop> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit b0a93920c4117933657cb5572157ce502ef0fc57 Author: Peter Zijlstra Date: Thu Dec 17 13:16:32 2009 +0100 perf events: Dont report side-band events on each cpu for per-task-per-cpu events commit 5d27c23df09b702868d9a3bff86ec6abd22963ac upstream. Acme noticed that his FORK/MMAP numbers were inflated by about the same factor as his cpu-count. This led to the discovery of a few more sites that need to respect the event->cpu filter. Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <20091217121830.215333434@chello.nl> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 5a20267b12fec85520acc1e839ee61f2ea16413d Author: Arjan van de Ven Date: Sat Jan 16 12:53:19 2010 -0800 perf timechart: Use tid not pid for COMM change commit 8f06d7e6e1bbfb32698d6d455583ab7460c090e2 upstream. A process that changes its comm field, does this on a per kernel task struct basis. The timechart tool used, incorrectly, the pid to track this, and should have used the tid instead... Signed-off-by: Arjan van de Ven Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <20100116125319.34ac3edd@infradead.org> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit f2fa92b29da64ead309293a048fe41776338a280 Author: Yongseok Koh Date: Tue Jan 19 17:33:49 2010 +0900 vmalloc: remove BUG_ON due to racy counting of VM_LAZY_FREE commit 88f5004430babb836cfce886d5d54c82166f8ba4 upstream. In free_unmap_area_noflush(), va->flags is marked as VM_LAZY_FREE first, and then vmap_lazy_nr is increased atomically. But, in __purge_vmap_area_lazy(), while traversing of vmap_are_list, nr is counted by checking VM_LAZY_FREE is set to va->flags. After counting the variable nr, kernel reads vmap_lazy_nr atomically and checks a BUG_ON condition whether nr is greater than vmap_lazy_nr to prevent vmap_lazy_nr from being negative. The problem is that, if interrupted right after marking VM_LAZY_FREE, increment of vmap_lazy_nr can be delayed. Consequently, BUG_ON condition can be met because nr is counted more than vmap_lazy_nr. It is highly probable when vmalloc/vfree are called frequently. This scenario have been verified by adding delay between marking VM_LAZY_FREE and increasing vmap_lazy_nr in free_unmap_area_noflush(). Even the vmap_lazy_nr is for checking high watermark, it never be the strict watermark. Although the BUG_ON condition is to prevent vmap_lazy_nr from being negative, vmap_lazy_nr is signed variable. So, it could go down to negative value temporarily. Consequently, removing the BUG_ON condition is proper. A possible BUG_ON message is like the below. kernel BUG at mm/vmalloc.c:517! invalid opcode: 0000 [#1] SMP EIP: 0060:[] EFLAGS: 00010297 CPU: 3 EIP is at __purge_vmap_area_lazy+0x144/0x150 EAX: ee8a8818 EBX: c08e77d4 ECX: e7c7ae40 EDX: c08e77ec ESI: 000081fe EDI: e7c7ae60 EBP: e7c7ae64 ESP: e7c7ae3c DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 Call Trace: [] free_unmap_vmap_area_noflush+0x69/0x70 [] remove_vm_area+0x22/0x70 [] __vunmap+0x45/0xe0 [] vmalloc+0x2c/0x30 Code: 8d 59 e0 eb 04 66 90 89 cb 89 d0 e8 87 fe ff ff 8b 43 20 89 da 8d 48 e0 8d 43 20 3b 04 24 75 e7 fe 05 a8 a5 a3 c0 e9 78 ff ff ff <0f> 0b eb fe 90 8d b4 26 00 00 00 00 56 89 c6 b8 ac a5 a3 c0 31 EIP: [] __purge_vmap_area_lazy+0x144/0x150 SS:ESP 0068:e7c7ae3c [ See also http://marc.info/?l=linux-kernel&m=126335856228090&w=2 ] Signed-off-by: Yongseok Koh Reviewed-by: Minchan Kim Cc: Nick Piggin Cc: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 3d0cc9a9a1cd4a043ffcd3251161d07a846a103c Author: Ryan May Date: Wed Jan 6 10:09:25 2010 -0600 USB: fix usbstorage for 2770:915d delivers no FAT commit 10d2cdb6102669279bee2d9a00a22431b74583d5 upstream. Resolves kernel.org bug 14914. Remove entry for 2770:915d (usb digital camera with mass storage support) from unusual_devs.h. The fix triggered by the entry causes the file system on the camera to be completely inaccessible (no partition table, the device is not mountable). The patch works, but let me clarify a few things about it. All the patch does is remove the entry for this device from the drivers/usb/storage/unusual_devs.h, which is supposed to help with a problem with the device's reported size (I think). I'm pretty sure it was originally added for a reason, so I'm not sure removing it won't cause other problems to reappear. Also, I should note that this unusual_devs.h entry was present (and activating workarounds) in 2.6.29, but in that version everything works fine. Starting with 2.6.30, things no longer work. Signed-off-by: Ryan May Cc: Rohan Hart Signed-off-by: Greg Kroah-Hartman commit 538a6fdbcffffe7ddecf13f94129502524f771d5 Author: Suresh Siddha Date: Mon Oct 26 13:21:32 2009 -0800 x86/PCI/PAT: return EINVAL for pci mmap WC request for !pat_enabled commit 2992e545ea006992ec9dc91c4fa996ce1e15f921 upstream. Thomas Schlichter reported: > X.org uses libpciaccess which tries to mmap with write combining enabled via > /sys/bus/pci/devices/*/resource0_wc. Currently, when PAT is not enabled, the > kernel does fall back to uncached mmap. Then libpciaccess thinks it succeeded > mapping with write combining enabled and does not set up suited MTRR entries. > ;-( Instead of silently mapping pci mmap region as UC minus in the case of !pat_enabled and wc request, we can return error. Eric Anholt mentioned that caller (like X) typically follows up with UC minus pci mmap request and if there is a free mtrr slot, caller will manage adding WC mtrr. Jesse Barnes says: > Older versions of libpciaccess will behave better if we do it that way > (iirc it only allocates an MTRR if the resource_wc file doesn't exist or > fails to get mapped). Reported-by: Thomas Schlichter Signed-off-by: Thomas Schlichter Signed-off-by: Suresh Siddha Acked-by: Eric Anholt Acked-by: Jesse Barnes Signed-off-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman commit e0f5cfa7c18b411634e73923841eccd3a4c0ce7f Author: Martin K. Petersen Date: Mon Jan 11 03:21:50 2010 -0500 DM: Fix device mapper topology stacking commit b27d7f16d3c6c27345d4280a739809c1c2c4c0b5 upstream. Make DM use bdev_stack_limits() function so that partition offsets get taken into account when calculating alignment. Clarify stacking warnings. Also remove obsolete clearing of final alignment_offset and misalignment flag. Signed-off-by: Martin K. Petersen Signed-off-by: Mike Snitzer Cc: Alasdair G. Kergon Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit fbe2992083cc1e865a91a4a101e97c2c35667acf Author: Martin K. Petersen Date: Mon Jan 11 03:21:49 2010 -0500 block: bdev_stack_limits wrapper commit 17be8c245054b9c7786545af3ba3ca4e54cd4ad9 upstream. DM does not want to know about partition offsets. Add a partition-aware wrapper that DM can use when stacking block devices. Signed-off-by: Martin K. Petersen Acked-by: Mike Snitzer Reviewed-by: Alasdair G Kergon Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit ed0cd89c7333b17d50812201602f436b57ef1482 Author: Zhao Yakui Date: Fri Jan 8 10:58:20 2010 +0800 drm/i915: try another possible DDC bus for the SDVO device with multiple outputs commit 7c3f0a2726fed78e0e0afe3b6fc3c1f5b298e447 upstream. There exist multiple DDC buses for the SDVO cards with multiple outputs. When we can't get the EDID by using the select DDC bus, we can try the other possible DDC bus to see whether the EDID can be obtained. https://bugs.freedesktop.org/show_bug.cgi?id=23842 Signed-off-by: Zhao Yakui Tested-by: Sebastien Caty Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 4fb77a3f85d3e4633e6ef3a8b319f882caf7c623 Author: Zhao Yakui Date: Fri Jan 8 10:58:19 2010 +0800 drm/i915: Read the response after issuing DDC bus switch command commit 6a304caf0bf9c429fc261f260b86cabf5bde2cbb upstream. For some SDVO cards based on conexant chip, we can't read the EDID if we don't read the response after issuing SDVO DDC bus switch command. From the SDVO spec once when another I2C transaction is finished after completing the I2C transaction of issuing the bus switch command, it will be switched back to the SDVO internal state again. So we can't initiate a new I2C transaction to read the response after issuing the DDC bus switch command. Instead we should issue DDC bus switch command and read the response in the same I2C transaction. https://bugs.freedesktop.org/show_bug.cgi?id=23842 https://bugs.freedesktop.org/show_bug.cgi?id=24458 https://bugs.freedesktop.org/show_bug.cgi?id=24522 https://bugs.freedesktop.org/show_bug.cgi?id=24282 Signed-off-by: Zhao Yakui Tested-by: Sebastien Caty Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 8cef765ff1eafb77cc40e8dad7a7a00190d9a6fc Author: James Bottomley Date: Thu Nov 26 09:50:20 2009 -0600 SCSI: enclosure: fix oops while iterating enclosure_status array commit cc9b2e9f6603190c009e5d2629ce8e3f99571346 upstream. Based on patch originally by Jeff Mahoney enclosure_status is expected to be a NULL terminated array of strings but isn't actually NULL terminated. When writing an invalid value to /sys/class/enclosure/.../.../status, it goes off the end of the array and Oopses. Fix by making the assumption true and adding NULL at the end. Reported-by: Artur Wojcik Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 5f0ab2dfbf84454894568377e4dd6578ef3938f3 Author: Alexey Starikovskiy Date: Wed Dec 30 15:53:10 2009 +0300 ACPI: EC: Add wait for irq storm commit 54070101f86ca9a6e9ba243c999d144721ec3db7 upstream. Merge of poll and irq modes accelerated EC transaction, so that keyboard starts to suffer again. Add msleep(1) into transaction path for the storm to allow keyboard controller to do its job. Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14747 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown Cc: Fran��ois Valenduc Signed-off-by: Greg Kroah-Hartman commit 1ff7b99e4983d9e93d25e98ba1ce303ad4e4909e Author: Alexey Starikovskiy Date: Thu Dec 24 11:34:16 2009 +0300 ACPI: EC: Accelerate query execution commit a62e8f1978f49e52f87a711ff6711b323d4b12ff upstream. Split EC query handling into acknowledge and execution phase. This allows much smaller pending query lattency and lowers chances of EC going "wild" and losing events. Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14858 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown Cc: Fran��ois Valenduc Signed-off-by: Greg Kroah-Hartman commit 111ab4bcb4a3c6d803f4cefde0c910de1fdbfc90 Author: Greg Kroah-Hartman Date: Thu Jan 14 10:33:19 2010 -0800 USB: add speed values for USB 3.0 and wireless controllers commit b132b04e193908a94d95065d0628f8fb0159cc55 upstream. These controllers say "unknown" for their speed in sysfs, which obviously isn't correct. Reported-by: Kurt Garloff Cc: Sarah Sharp Cc: David Vrabel Signed-off-by: Greg Kroah-Hartman commit a2a5b33aa3675f267259604218d0663b9778227f Author: Alan Stern Date: Fri Jan 8 11:18:38 2010 -0500 USB: add missing delay during remote wakeup commit 49d0f078f494b9d81e820a13dd8093a9bfb0b6b1 upstream. This patch (as1330) fixes a bug in khbud's handling of remote wakeups. When a device sends a remote-wakeup request, the parent hub (or the host controller driver, for directly attached devices) begins the resume sequence and notifies khubd when the sequence finishes. At this point the port's SUSPEND feature is automatically turned off. However the device needs an additional 10-ms resume-recovery time (TRSMRCY in the USB spec). Khubd does not wait for this delay if the SUSPEND feature is off, and as a result some devices fail to behave properly following a remote wakeup. This patch adds the missing delay to the remote-wakeup path. It also extends the resume-signalling delay used by ehci-hcd and uhci-hcd from 20 ms (the value in the spec) to 25 ms (the value we use for non-remote-wakeup resumes). The extra time appears to help some devices. Signed-off-by: Alan Stern Cc: Rickard Bellini Signed-off-by: Greg Kroah-Hartman commit bfec5cee7784fdc9c07c9ef72312dbad0bff5690 Author: Alan Stern Date: Fri Jan 8 11:18:20 2010 -0500 USB: EHCI & UHCI: fix race between root-hub suspend and port resume commit cec3a53c7fe794237b582e8e77fc0e48465e65ee upstream. This patch (as1321) fixes a problem with EHCI and UHCI root-hub suspends: If the suspend occurs while a port is trying to resume, the resume doesn't finish and simply gets lost. When remote wakeup is enabled, this is undesirable behavior. The patch checks first to see if any port resumes are in progress, and if they are then it fails the root-hub suspend with -EBUSY. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 07d577f8868a40466bf3044d8911c06cc7dc283e Author: Alan Stern Date: Fri Jan 8 11:17:55 2010 -0500 USB: EHCI: fix handling of unusual interrupt intervals commit 1b9a38bfa6e664ff02511314f5586d711c83cc91 upstream. This patch (as1320) fixes two problems related to interrupt-URB scheduling in ehci-hcd. URBs with an interval of 2 or 4 microframes aren't handled. For the time being, the patch reduces to interval to 1 uframe. URBs are constrained to have an interval no larger than 1024 frames by usb_submit_urb(). But some EHCI controllers allow use of a schedule as short as 256 frames; for these controllers we may have to decrease the interval to the actual schedule length. The second problem isn't very significant since few devices expose interrupt endpoints with an interval larger than 256 frames. But the first problem is critical; it will prevent the kernel from working with devices having interrupt intervals of 2 or 4 uframes. Signed-off-by: Alan Stern Tested-by: Glynn Farrow Signed-off-by: Greg Kroah-Hartman commit 186c74d336e2c1377df9e5dc88f7966b2dd6acf7 Author: Oliver Neukum Date: Tue Jan 12 12:32:50 2010 +0100 USB: Don't use GFP_KERNEL while we cannot reset a storage device commit acbe2febe71abb2360b008e9ab3ee5c44169f78c upstream. Memory allocations with GFP_KERNEL can cause IO to a storage device which can fail resulting in a need to reset the device. Therefore GFP_KERNEL cannot be safely used between usb_lock_device() and usb_unlock_device(). Replace by GFP_NOIO. Signed-off-by: Oliver Neukum Cc: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fa68188da8abe7c20cf44f19326c81a74498b921 Author: Alan Stern Date: Tue Dec 22 23:16:32 2009 -0500 USB: fix bitmask merge error commit a91b593edd4b3e8aa91f671b763b27b8119eb49d upstream. This patch adds a mask bit which was mistakenly omitted from the as1311 patch (usb-storage: add BAD_SENSE flag). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 911b8be09d303ee5c63295be2ad7b39eec899f45 Author: Johan Hovold Date: Wed Jan 6 15:48:42 2010 -0800 usb: serial: fix memory leak in generic driver commit 2591530204a76fecc843529ade56afe865dd2657 upstream. Fix a regression introduced by commit 715b1dc01fe44537e8fce9566e4bb48d6821d84b ("USB: usb_debug, usb_generic_serial: implement multi urb write"). URB transfer buffer was never freed when using multi-urb writes. Currently the only driver enabling multi-urb writes is usb_debug. Signed-off-by: Johan Hovold Cc: Greg KH Acked-by: Jason Wessel Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 04f7ec720e5bc4413540ca5dedde8b9e5a30c401 Author: Matthew Garrett Date: Wed Dec 9 12:31:37 2009 -0800 serial: 8250_pnp: use wildcard for serial Wacom tablets commit 6d34855d9aa281f72c533ecb827405139d1b0fe9 upstream. Wacom claims that the WACF namespace will always be devoted to serial Wacom tablets. Remove the existing entries and add a wildcard to avoid having to update the kernel every time they add a new device. Signed-off-by: Ping Cheng Signed-off-by: Matthew Garrett Tested-by: Ping Cheng Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6fc7937a46b9a5d6b7f61005055a856736f31442 Author: Alan Cox Date: Mon Jan 4 16:26:50 2010 +0000 nozomi: quick fix for the close/close bug commit eeec32a731631a9bad9abb21c626b9f2840bee0d upstream. Nozomi goes wrong if you get the sequence open open close [stuff] close which turns out to occur on some ppp type setups. This is a quick patch up for the problem. It's not really fixing Nozomi which completely fails to implement tty open/close semantics and all the other needed stuff. Doing it right is a rather more invasive patch set and not one that will backport. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8c535426188c312914bebec8158324dbdbdca2d3 Author: Erez Zadok Date: Thu Dec 3 13:35:27 2009 -0500 ecryptfs: initialize private persistent file before dereferencing pointer commit e27759d7a333d1f25d628c4f7caf845c51be51c2 upstream. Ecryptfs_open dereferences a pointer to the private lower file (the one stored in the ecryptfs inode), without checking if the pointer is NULL. Right afterward, it initializes that pointer if it is NULL. Swap order of statements to first initialize. Bug discovered by Duckjin Kang. Signed-off-by: Duckjin Kang Signed-off-by: Erez Zadok Cc: Dustin Kirkland Cc: Al Viro Signed-off-by: Tyler Hicks Signed-off-by: Greg Kroah-Hartman commit 36212162584e722f432f531d7611099e31fe9f3e Author: Dan Carpenter Date: Tue Jan 19 12:34:32 2010 +0300 ecryptfs: use after free commit ece550f51ba175c14ec3ec047815927d7386ea1f upstream. The "full_alg_name" variable is used on a couple error paths, so we shouldn't free it until the end. Signed-off-by: Dan Carpenter Signed-off-by: Tyler Hicks Signed-off-by: Greg Kroah-Hartman commit 179b7e53797c61a7652075eb48c6008dbd2b88d5 Author: Greg Kroah-Hartman Date: Thu Dec 17 07:07:19 2009 -0800 tty: fix race in tty_fasync commit 703625118069f9f8960d356676662d3db5a9d116 upstream. We need to keep the lock held over the call to __f_setown() to prevent a PID race. Thanks to Al Viro for pointing out the problem, and to Travis for making us look here in the first place. Cc: Eric W. Biederman Cc: Al Viro Cc: Alan Cox Cc: Linus Torvalds Cc: Tavis Ormandy Cc: Jeff Dike Cc: Julien Tinnes Cc: Matt Mackall Signed-off-by: Greg Kroah-Hartman commit b70922a1819f26c3962a184070d9370dfae634a9 Author: Greg Kroah-Hartman Date: Fri Jan 8 09:06:40 2010 -0800 Staging: hv: fix smp problems in the hyperv core code commit 7692fd4d441afac728cb83fdd33349d5ba07406c upstream. This fixes a number of SMP problems that were in the hyperv core code. Patch originally written by K. Y. Srinivasan but forward ported to the latest in-kernel code and tweaked slightly by me. Novell, Inc. hereby disclaims all copyright in any derivative work copyright associated with this patch. Signed-off-by: K. Y. Srinivasan Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 50e49751f94abb0b79563b69bd31392b8b477a2a Author: Eugeni Dodonov Date: Wed Dec 23 10:27:22 2009 -0200 Staging: asus_oled: fix oops in 2.6.32.2 commit 20633bf0141c5e93e3396770d5eb7d200ee4068a upstream. After updating to 2.6.32 kernel, I started experiencing Oopses caused by the asus_oled module. After quick investigation, I wrapped this simple patch which fixes an Oops in by asus_oled module on 2.6.32.2 kernel, caused by incorrect usage of strict_strtoul function call within set_enabled and set_disabled functions. This can be triggered by simple running the userspace client for asus_old (e.g., 'asusoled -e' or 'asusoled -d'). Signed-off-by: Eugeni Dodonov Signed-off-by: Greg Kroah-Hartman commit ccb90b8b6aae814987b23d60d13b4d32dc03a389 Author: Jean-Francois Moine Date: Sun Jan 10 04:32:11 2010 -0300 V4L/DVB (13900): gspca - sunplus: Fix bridge exchanges. commit 07d1c69b2dcfdd1b21e36af0ff8b9506234908ee upstream. A previous code optimization inverted bridge registers and values, doing a regression in kernel 2.6.32. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit d547e913ca2e6ec29510cca3e72a3cc430e53b89 Author: H. Peter Anvin Date: Tue Dec 15 15:13:07 2009 -0800 x86, msr/cpuid: Register enough minors for the MSR and CPUID drivers commit 0b962d473af32ec334df271b54ff4973cb2b4c73 upstream. register_chrdev() hardcodes registering 256 minors, presumably to avoid breaking old drivers. However, we need to register enough minors so that we have all possible CPUs. checkpatch warns on this patch, but the patch is correct: NR_CPUS here is a static *upper bound* on the *maximum CPU index* (not *number of CPUs!*) and that is what we want. Reported-and-tested-by: Russ Anderson Cc: Tejun Heo Cc: Alan Cox Cc: Takashi Iwai Cc: Alexander Viro Signed-off-by: H. Peter Anvin LKML-Reference: Signed-off-by: Greg Kroah-Hartman commit a2febcd43d859a48672ad922990bd27e5628271f Author: Greg Kroah-Hartman Date: Fri Jan 22 15:23:21 2010 -0800 Linux 2.6.32.5 commit af55a3da5049fb26a84ba562c7c8b55b910ff234 Author: OGAWA Hirofumi Date: Wed Jan 13 21:14:09 2010 +0900 vfs: Fix vmtruncate() regression commit cedabed49b39b4319bccc059a63344b6232b619c upstream. If __block_prepare_write() was failed in block_write_begin(), the allocated blocks can be outside of ->i_size. But new truncate_pagecache() in vmtuncate() does nothing if new < old. It means the above usage is not working anymore. So, this patch fixes it by removing "new < old" check. It would need more cleanup/change. But, now -rc and truncate working is in progress, so, this tried to fix it minimum change. Acked-by: Nick Piggin Signed-off-by: OGAWA Hirofumi Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 26931397cc71bcac187efdcd2fc43ce0d41e4eb0 Author: Peter Zijlstra Date: Fri Dec 4 09:59:02 2009 +0100 sched: Fix task priority bug commit 57785df5ac53c70da9fb53696130f3c551bfe1f9 upstream. 83f9ac removed a call to effective_prio() in wake_up_new_task(), which leads to tasks running at MAX_PRIO. This is caused by the idle thread being set to MAX_PRIO before forking off init. O(1) used that to make sure idle was always preempted, CFS uses check_preempt_curr_idle() for that so we can savely remove this bit of legacy code. Reported-by: Mike Galbraith Tested-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1259754383.4003.610.camel@laptop> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit fdc360e9cd88b119fa978cc812d1f0be69087f9a Author: Ping Date: Fri Jan 15 17:01:07 2010 -0800 serial/8250_pnp: add a new Fujitsu Wacom Tablet PC device commit 3018aa4b1a46946dfd0ee73a533038f24e390539 upstream. This is a new two finger touch Fujitsu Wacom Tablet PC. Signed-off-by: Ping Cheng Cc: Alan Cox Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 2d22b3821b34d2dec1e263820ffa0b43311d92d2 Author: Wolfram Sang Date: Sat Jan 16 20:43:13 2010 +0100 i2c/pca: Don't use *_interruptible commit 22f8b2695eda496026623020811cae34590ee3d7 upstream. Unexpected signals can disturb the bus-handling and lock it up. Don't use interruptible in 'wait_event_*' and 'wake_*' as in commits dc1972d02747d2170fb1d78d114801f5ecb27506 (for cpm), 1ab082d7cbd0f34e39a5396cc6340c00bc5d66ef (for mpc), b7af349b175af45f9d87b3bf3f0a221e1831ed39 (for omap). Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit c1f77a7025d7802dc29ca1a8fe84e416973525ed Author: Thadeu Lima de Souza Cascardo Date: Sat Jan 16 20:43:13 2010 +0100 i2c: Do not use device name after device_unregister commit c556752109794a5ff199b80a1673336b4df8433a upstream. dev_dbg outputs dev_name, which is released with device_unregister. This bug resulted in output like this: i2c Xy2���0: adapter [SMBus I801 adapter at 1880] unregistered The right output would be: i2c i2c-0: adapter [SMBus I801 adapter at 1880] unregistered Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4bff5fff57875872c813022bfa3a523b88196c98 Author: David S. Miller Date: Mon Jan 4 23:16:03 2010 -0800 sparc64: Fix Niagara2 perf event handling. [ Upstream commit e04ed38d4e0cd32141f723560efcc8252b0241e2 ] For chips like Niagara2 that have true overflow indications in the %pcr (which we don't actually need and don't use) the interrupt signal persists until the overflow bits are cleared by an explicit %pcr write. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 9d6567c5369d439440ad96e8b402919d4480e2c6 Author: David S. Miller Date: Mon Jan 4 15:37:04 2010 -0800 sparc64: Fix NMI programming when perf events are active. [ Upstream commit 8183e2b38480672a1f61d416812ac078ce94b67b ] If perf events are active, we should not reset the %pcr to PCR_PIC_PRIV. That perf events code does the management. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 896fb0d2fb2f6ba691eeac7fc6fde604629d0b59 Author: David Miller Date: Sun Dec 13 18:25:02 2009 -0800 sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK commit b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac upstream. Relax stable-sched-clock architectures to not save/disable/restore hardirqs in cpu_clock(). The background is that I was trying to resolve a sparc64 perf issue when I discovered this problem. On sparc64 I implement pseudo NMIs by simply running the kernel at IRQ level 14 when local_irq_disable() is called, this allows performance counter events to still come in at IRQ level 15. This doesn't work if any code in an NMI handler does local_irq_save() or local_irq_disable() since the "disable" will kick us back to cpu IRQ level 14 thus letting NMIs back in and we recurse. The only path which that does that in the perf event IRQ handling path is the code supporting frequency based events. It uses cpu_clock(). cpu_clock() simply invokes sched_clock() with IRQs disabled. And that's a fundamental bug all on it's own, particularly for the HAVE_UNSTABLE_SCHED_CLOCK case. NMIs can thus get into the sched_clock() code interrupting the local IRQ disable code sections of it. Furthermore, for the not-HAVE_UNSTABLE_SCHED_CLOCK case, the IRQ disabling done by cpu_clock() is just pure overhead and completely unnecessary. So the core problem is that sched_clock() is not NMI safe, but we are invoking it from NMI contexts in the perf events code (via cpu_clock()). A less important issue is the overhead of IRQ disabling when it isn't necessary in cpu_clock(). CONFIG_HAVE_UNSTABLE_SCHED_CLOCK architectures are not affected by this patch. Signed-off-by: David S. Miller Acked-by: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20091213.182502.215092085.davem@davemloft.net> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 9fc68ca0778831d6901fc9bcfa65db214770f97f Author: Ike Panhc Date: Thu Dec 3 07:45:11 2009 +0000 asus-laptop: add Lenovo SL hotkey support commit 14f8af311e7d3e4198cbaade84a34f86505dcb37 upstream. Lenovo SL series laptop has a very similar DSDT with Asus laptops. We can easily have the extra ACPI function support with little modification in asus-laptop.c Here is the hotkey enablement for Lenovo SL series laptop. This patch will enable the following hotkey: - Volumn Up - Volumn Down - Mute - Screen Lock (Fn+F2) - Battery Status (Fn+F3) - WLAN switch (Fn+F5) - Video output switch (Fn+F7) - Touchpad switch (Fn+F8) - Screen Magnifier (Fn+Space) The following function of Lenovo SL laptop is still need to be enabled: - Hotkey: KEY_SUSPEND (Fn+F4), KEY_SLEEP (Fn+F12), Dock Eject (Fn+F9) - Rfkill for bluetooth and wlan - LenovoCare LED - Hwmon for fan speed - Fingerprint scanner - Active Protection System Signed-off-by: Ike Panhc Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 2196ca4e67b04a1e083337aae825c381df0a919c Author: Tai-hwa Liang Date: Wed Jan 13 00:16:27 2010 -0800 Input: pmouse - move Sentelic probe down the list commit 4a18b3ab6ed537b055e3fcfca64ab870b4f9acf0 upstream. Sentelic probes confuse IBM trackpoints so they stop responding to TP_READ_ID command. See: http://bugzilla.kernel.org/show_bug.cgi?id=14970 Let's move FSP detection lower so it is probed after trackpoint and others, just before we strat probing for Intellimouse Explorer. Signed-off-by: Tai-hwa Liang Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman commit 94249e60370f0094831ba673881222252d799257 Author: Bryn M. Reeves Date: Thu Nov 12 18:31:54 2009 +0000 megaraid_sas: remove sysfs poll_mode_io world writeable permissions commit bb7d3f24c71e528989501617651b669fbed798cb upstream. /sys/bus/pci/drivers/megaraid_sas/poll_mode_io defaults to being world-writable, which seems bad (letting any user affect kernel driver behavior). This turns off group and user write permissions, so that on typical production systems only root can write to it. Signed-off-by: Bryn M. Reeves Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 2db740cb364a38b6bf50e1c61dc6d9615bfe390c Author: Benjamin Herrenschmidt Date: Tue Jan 19 12:42:19 2010 +0100 PCI/cardbus: Add a fixup hook and fix powerpc commit 2d1c861871d767153538a77c498752b36d4bb4b8 upstream The cardbus code creates PCI devices without ever going through the necessary fixup bits and pieces that normal PCI devices go through. There's in fact a commented out call to pcibios_fixup_bus() in there, it's commented because ... it doesn't work. I could make pcibios_fixup_bus() do the right thing on powerpc easily but I felt it cleaner instead to provide a specific hook pci_fixup_cardbus for which a weak empty implementation is provided by the PCI core. This fixes cardbus on powerbooks and probably all other PowerPC platforms which was broken completely for ever on some platforms and since 2.6.31 on others such as PowerBooks when we made the DMA ops mandatory (since those are setup by the fixups). Acked-by: Dominik Brodowski Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Jesse Barnes Signed-off-by: Stefan Bader Acked-by: Benjamin Herrenschmidt Acked-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman commit eecd8a9ec6488e6b5c43c1c12368d6fdb8aa9430 Author: Christian Schuerer-Waldheim Date: Wed Jan 6 14:49:57 2010 +0100 HID: add device IDs for new model of Apple Wireless Keyboard commit 23aeb61e7e1f02fb0f3b8f9e798e75537ca1731d upstream. Added device IDs for the new model of the Apple Wireless Keyboard (November 2009). Signed-off-by: Christian Schuerer-Waldheim Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit 781d5c42490436e4e0b6b624088b109695cf6b00 Author: Jan Kara Date: Thu Dec 17 15:27:06 2009 -0800 reiserfs: truncate blocks not used by a write commit ec8e2f7466ca370f5e09000ca40a71759afc9ac8 upstream. It can happen that write does not use all the blocks allocated in write_begin either because of some filesystem error (like ENOSPC) or because page with data to write has been removed from memory. We truncate these blocks so that we don't have dangling blocks beyond i_size. Cc: Jeff Mahoney Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 56a7f72d020e86c33b3c829c9a89d33f8c359305 Author: Roel Kluin Date: Fri Dec 18 12:22:43 2009 -0300 V4L/DVB (13868): gspca - sn9c20x: Fix test of unsigned. commit c60503c1db76bd46577cc7ff4fafa033b675e0e5 upstream. Signed-off-by: Roel Kluin Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit fe52cee99c5cf51c38c4d150fbc8a84fb8ed97d6 Author: Takashi Iwai Date: Thu Jan 14 12:39:02 2010 +0100 ALSA: hda - Fix missing capture mixer for ALC861/660 codecs commit c7a8eb103248a110cdbe0530d8c5ce987f099eee upstream. The capture-related mixer elements are missing with ALC861/ALC660 codecs when quirks are present, due to missing call of set_capture_mixer(). Reference: Novell bnc#567340 http://bugzilla.novell.com/show_bug.cgi?id=567340 Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 34e7aa0779b24f22d38b31a804bca700a0d38ea1 Author: Mark Brown Date: Mon Jan 4 18:05:00 2010 +0000 mfd: Correct WM835x ISINK ramp time defines commit 9dffe2a32b0deef52605d50527c0d240b15cabf7 upstream. The constants used to specify ISINK ramp times for WM835x had the wrong shifts so that the on times applied to the off ramp and vice versa. The masks for the bitfields are correct. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman commit 33faa3c2d01eaff106a231a3fb01f9f532e9821b Author: Mark Brown Date: Thu Jan 7 16:16:14 2010 +0000 mfd: WM835x GPIO direction register is not locked commit 8e6ba2dfa2d6c4691a83a63e211990a8bd7b788b upstream. No need to set the security key when writing to it. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman commit 7f08f93d08ac8363a0c73b98ec3e2f24e952ea8a Author: Mike Travis Date: Fri Jan 8 12:13:54 2010 -0800 x86: SGI UV: Fix mapping of MMIO registers commit fcfbb2b5facd65efa7284cc315225bfe3d1856c2 upstream. This fixes the problem of the initialization code not correctly mapping the entire MMIO space on a UV system. A side effect is the map_high() interface needed to be changed to accommodate different address and size shifts. Signed-off-by: Mike Travis Reviewed-by: Mike Habeck Cc: Jack Steiner Cc: Linus Torvalds LKML-Reference: <4B479202.7080705@sgi.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 7f40c6b6ad3b97dc8aceb3ce73d4d6ed335a8d6d Author: Tamas Vincze Date: Fri Jan 15 17:01:10 2010 -0800 edac: i5000_edac critical fix panic out of bounds commit 118f3e1afd5534c15f9701f33514186cfc841a27 upstream. EDAC MC0: INTERNAL ERROR: channel-b out of range (4 >= 4) Kernel panic - not syncing: EDAC MC0: Uncorrected Error (XEN) Domain 0 crashed: 'noreboot' set - not rebooting. This happens because FERR_NF_FBD bit 28 is not updated on i5000. Due to that, both bits 28 and 29 may be equal to one, returning channel = 3. As this value is invalid, EDAC core generates the panic. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14568 Signed-off-by: Tamas Vincze Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 25d5699981856908986c5afb712481a4c917e00b Author: Suresh Siddha Date: Mon Jan 18 12:10:48 2010 -0800 x86, apic: use physical mode for IBM summit platforms commit dfea91d5a7c795fd6f4e1a97489a98e4e767463e upstream. Chris McDermott from IBM confirmed that hurricane chipset in IBM summit platforms doesn't support logical flat mode. Irrespective of the other things like apic_id's, total number of logical cpu's, Linux kernel should default to physical mode for this system. The 32-bit kernel does so using the OEM checks for the IBM summit platform. Add a similar OEM platform check for the 64bit kernel too. Otherwise the linux kernel boot can hang on this platform under certain bios/platform settings. Signed-off-by: Suresh Siddha Tested-by: Ananth N Mavinakayanahalli Cc: Chris McDermott Cc: Yinghai Lu Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit c91ab0438c6700e4be078d64cfb01879986e3bde Author: KOSAKI Motohiro Date: Fri Jan 15 17:01:18 2010 -0800 page allocator: update NR_FREE_PAGES only when necessary commit 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 upstream. commit f2260e6b (page allocator: update NR_FREE_PAGES only as necessary) made one minor regression. if __rmqueue() was failed, NR_FREE_PAGES stat go wrong. this patch fixes it. Signed-off-by: KOSAKI Motohiro Cc: Mel Gorman Reviewed-by: Minchan Kim Reported-by: Huang Shijie Reviewed-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit d4c893f20758ff549e4aaa4a02a79e563deaebb9 Author: KOSAKI Motohiro Date: Tue Jan 5 16:32:43 2010 +0900 futexes: Remove rw parameter from get_futex_key() commit 7485d0d3758e8e6491a5c9468114e74dc050785d upstream. Currently, futexes have two problem: A) The current futex code doesn't handle private file mappings properly. get_futex_key() uses PageAnon() to distinguish file and anon, which can cause the following bad scenario: 1) thread-A call futex(private-mapping, FUTEX_WAIT), it sleeps on file mapping object. 2) thread-B writes a variable and it makes it cow. 3) thread-B calls futex(private-mapping, FUTEX_WAKE), it wakes up blocked thread on the anonymous page. (but it's nothing) B) Current futex code doesn't handle zero page properly. Read mode get_user_pages() can return zero page, but current futex code doesn't handle it at all. Then, zero page makes infinite loop internally. The solution is to use write mode get_user_page() always for page lookup. It prevents the lookup of both file page of private mappings and zero page. Performance concerns: Probaly very little, because glibc always initialize variables for futex before to call futex(). It means glibc users never see the overhead of this patch. Compatibility concerns: This patch has few compatibility issues. After this patch, FUTEX_WAIT require writable access to futex variables (read-only mappings makes EFAULT). But practically it's not a problem, glibc always initalizes variables for futexes explicitly - nobody uses read-only mappings. Reported-by: Hugh Dickins Signed-off-by: KOSAKI Motohiro Acked-by: Peter Zijlstra Acked-by: Darren Hart Cc: Linus Torvalds Cc: KAMEZAWA Hiroyuki Cc: Nick Piggin Cc: Ulrich Drepper LKML-Reference: <20100105162633.45A2.A69D9226@jp.fujitsu.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 8410b13cced2fa9aee301d4722a5ce751fcc253a Author: Cyrill Gorcunov Date: Mon Dec 14 17:56:34 2009 +0900 x86, mce: Thermal monitoring depends on APIC being enabled commit 485a2e1973fd9f98c2c6776e66ac4721882b69e0 upstream. Add check if APIC is not disabled since thermal monitoring depends on it. As only apic gets disabled we should not try to install "thermal monitor" vector, print out that thermal monitoring is enabled and etc... Note that "Intel Correct Machine Check Interrupts" already has such a check. Also I decided to not add cpu_has_apic check into mcheck_intel_therm_init since even if it'll call apic_read on disabled apic -- it's safe here and allow us to save a few code bytes. Reported-by: Thomas Gleixner Signed-off-by: Cyrill Gorcunov Signed-off-by: Hidetoshi Seto LKML-Reference: <4B25FDC2.3020401@jp.fujitsu.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 1bd24fdff4b0bd7f0a50f330165a82be690a919c Author: Martin K. Petersen Date: Fri Jan 15 01:55:07 2010 -0500 block: Fix incorrect reporting of partition alignment commit 81744ee44ab2845c16ffd7d6f762f7b4a49a4750 upstream queue_sector_alignment_offset returned the wrong value which caused partitions to report an incorrect alignment_offset. Since offset calculation is needed several places it has been split into a separate helper function. Signed-off-by: Martin K. Petersen Tested-by: Mike Snitzer Cc: Jens Axboe Signed-off-by: Greg Kroah-Hartman commit 8a9c3f5c34a93fd4635aa739810280c4752eaa6e Author: Zou Nan hai Date: Fri Jan 15 10:29:06 2010 +0800 drm/i915: remove loop in Ironlake interrupt handler commit c7c85101afd0cb8ce497456d12ee1cad4aad152f upstream. On Ironlake, there is an interrupt master control bit. With the bit disabled before clearing IIR, we do not need to handle extra interrupt in a loop. This patch removes the loop in Ironlake interrupt handler. It fixed irq lost issue on some Ironlake platforms. Signed-off-by: Zou Nan hai Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 4334ab76da3dc18a531948882ff6247764d96ea8 Author: Daisuke Nishimura Date: Fri Jan 15 17:01:30 2010 -0800 memcg: ensure list is empty at rmdir commit fce66477578d081f19aef5ea218664ff7758c33a upstream. Current mem_cgroup_force_empty() only ensures mem->res.usage == 0 on success. But this doesn't guarantee memcg's LRU is really empty, because there are some cases in which !PageCgrupUsed pages exist on memcg's LRU. For example: - Pages can be uncharged by its owner process while they are on LRU. - race between mem_cgroup_add_lru_list() and __mem_cgroup_uncharge_common(). So there can be a case in which the usage is zero but some of the LRUs are not empty. OTOH, mem_cgroup_del_lru_list(), which can be called asynchronously with rmdir, accesses the mem_cgroup, so this access can cause a problem if it races with rmdir because the mem_cgroup might have been freed by rmdir. Actually, I saw a bug which seems to be caused by this race. [1530745.949906] BUG: unable to handle kernel NULL pointer dereference at 0000000000000230 [1530745.950651] IP: [] mem_cgroup_del_lru_list+0x30/0x80 [1530745.950651] PGD 3863de067 PUD 3862c7067 PMD 0 [1530745.950651] Oops: 0002 [#1] SMP [1530745.950651] last sysfs file: /sys/devices/system/cpu/cpu7/cache/index1/shared_cpu_map [1530745.950651] CPU 3 [1530745.950651] Modules linked in: configs ipt_REJECT xt_tcpudp iptable_filter ip_tables x_tables bridge stp nfsd nfs_acl auth_rpcgss exportfs autofs4 hidp rfcomm l2cap crc16 bluetooth lockd sunrpc ib_iser rdma_cm ib_cm iw_cm ib_sa ib_mad ib_core ib_addr iscsi_tcp bnx2i cnic uio ipv6 cxgb3i cxgb3 mdio libiscsi_tcp libiscsi scsi_transport_iscsi dm_mirror dm_multipath scsi_dh video output sbs sbshc battery ac lp kvm_intel kvm sg ide_cd_mod cdrom serio_raw tpm_tis tpm tpm_bios acpi_memhotplug button parport_pc parport rtc_cmos rtc_core rtc_lib e1000 i2c_i801 i2c_core pcspkr dm_region_hash dm_log dm_mod ata_piix libata shpchp megaraid_mbox sd_mod scsi_mod megaraid_mm ext3 jbd uhci_hcd ohci_hcd ehci_hcd [last unloaded: freq_table] [1530745.950651] Pid: 19653, comm: shmem_test_02 Tainted: G M 2.6.32-mm1-00701-g2b04386 #3 Express5800/140Rd-4 [N8100-1065] [1530745.950651] RIP: 0010:[] [] mem_cgroup_del_lru_list+0x30/0x80 [1530745.950651] RSP: 0018:ffff8803863ddcb8 EFLAGS: 00010002 [1530745.950651] RAX: 00000000000001e0 RBX: ffff8803abc02238 RCX: 00000000000001e0 [1530745.950651] RDX: 0000000000000000 RSI: ffff88038611a000 RDI: ffff8803abc02238 [1530745.950651] RBP: ffff8803863ddcc8 R08: 0000000000000002 R09: ffff8803a04c8643 [1530745.950651] R10: 0000000000000000 R11: ffffffff810c7333 R12: 0000000000000000 [1530745.950651] R13: ffff880000017f00 R14: 0000000000000092 R15: ffff8800179d0310 [1530745.950651] FS: 0000000000000000(0000) GS:ffff880017800000(0000) knlGS:0000000000000000 [1530745.950651] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [1530745.950651] CR2: 0000000000000230 CR3: 0000000379d87000 CR4: 00000000000006e0 [1530745.950651] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [1530745.950651] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [1530745.950651] Process shmem_test_02 (pid: 19653, threadinfo ffff8803863dc000, task ffff88038612a8a0) [1530745.950651] Stack: [1530745.950651] ffffea00040c2fe8 0000000000000000 ffff8803863ddd98 ffffffff810c739a [1530745.950651] <0> 00000000863ddd18 000000000000000c 0000000000000000 0000000000000000 [1530745.950651] <0> 0000000000000002 0000000000000000 ffff8803863ddd68 0000000000000046 [1530745.950651] Call Trace: [1530745.950651] [] release_pages+0x142/0x1e7 [1530745.950651] [] ? pagevec_move_tail+0x6e/0x112 [1530745.950651] [] pagevec_move_tail+0xfd/0x112 [1530745.950651] [] lru_add_drain+0x76/0x94 [1530745.950651] [] exit_mmap+0x6e/0x145 [1530745.950651] [] mmput+0x5e/0xcf [1530745.950651] [] exit_mm+0x11c/0x129 [1530745.950651] [] ? audit_free+0x196/0x1c9 [1530745.950651] [] do_exit+0x1f5/0x6b7 [1530745.950651] [] ? up_read+0x2b/0x2f [1530745.950651] [] ? lockdep_sys_exit_thunk+0x35/0x67 [1530745.950651] [] do_group_exit+0x83/0xb0 [1530745.950651] [] sys_exit_group+0x17/0x1b [1530745.950651] [] system_call_fastpath+0x16/0x1b [1530745.950651] Code: 54 53 0f 1f 44 00 00 83 3d cc 29 7c 00 00 41 89 f4 75 63 eb 4e 48 83 7b 08 00 75 04 0f 0b eb fe 48 89 df e8 18 f3 ff ff 44 89 e2 <48> ff 4c d0 50 48 8b 05 2b 2d 7c 00 48 39 43 08 74 39 48 8b 4b [1530745.950651] RIP [] mem_cgroup_del_lru_list+0x30/0x80 [1530745.950651] RSP [1530745.950651] CR2: 0000000000000230 [1530745.950651] ---[ end trace c3419c1bb8acc34f ]--- [1530745.950651] Fixing recursive fault but reboot is needed! The problem here is pages on LRU may contain pointer to stale memcg. To make res->usage to be 0, all pages on memcg must be uncharged or moved to another(parent) memcg. Moved page_cgroup have already removed from original LRU, but uncharged page_cgroup contains pointer to memcg withou PCG_USED bit. (This asynchronous LRU work is for improving performance.) If PCG_USED bit is not set, page_cgroup will never be added to memcg's LRU. So, about pages not on LRU, they never access stale pointer. Then, what we have to take care of is page_cgroup _on_ LRU list. This patch fixes this problem by making mem_cgroup_force_empty() visit all LRUs before exiting its loop and guarantee there are no pages on its LRU. Signed-off-by: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 70f800ff2289dce1ecb0f941dc2f08e706d9d1ad Author: Mark Brown Date: Fri Jan 15 17:01:40 2010 -0800 revert "drivers/video/s3c-fb.c: fix clock setting for Samsung SoC Framebuffer" commit eb29a5cc0b601c458bae9df2f6c3696d75c2d383 upstream. Fix divide by zero and broken output. Commit 600ce1a0fa ("fix clock setting for Samsung SoC Framebuffer") introduced a mandatory refresh parameter to the platform data for the S3C framebuffer but did not introduce any validation code, causing existing platforms (none of which have refresh set) to divide by zero whenever the framebuffer is configured, generating warnings and unusable output. Ben Dooks noted several problems with the patch: - The platform data supplies the pixclk directly and should already have taken care of the refresh rate. - The addition of a window ID parameter doesn't help since only the root framebuffer can control the pixclk. - pixclk is specified in picoseconds (rather than Hz) as the patch assumed. and suggests reverting the commit so do that. Without fixing this no mainline user of the driver will produce output. [akpm@linux-foundation.org: don't revert the correct bit] Signed-off-by: Mark Brown Cc: InKi Dae Cc: Kyungmin Park Cc: Krzysztof Helt Cc: Marek Szyprowski Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 800c02837ef72e60fd0d61ed3c791263d9d0dc36 Author: Eric Paris Date: Fri Jan 15 12:12:25 2010 -0500 inotify: only warn once for inotify problems commit 976ae32be45a736acd49215a7e4771ff91f161c3 upstream. inotify will WARN() if it finds that the idr and the fsnotify internals somehow got out of sync. It was only supposed to do this once but due to this stupid bug it would warn every single time a problem was detected. Signed-off-by: Eric Paris Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit cec3ad600c2395d2d018332dadea9b2fe33e6169 Author: Eric Paris Date: Fri Jan 15 12:12:24 2010 -0500 inotify: do not reuse watch descriptors commit 9e572cc9877ee6c43af60778f6b8d5ba0692d935 upstream. Since commit 7e790dd5fc937bc8d2400c30a05e32a9e9eef276 ("inotify: fix error paths in inotify_update_watch") inotify changed the manor in which it gave watch descriptors back to userspace. Previous to this commit inotify acted like the following: inotify_add_watch(X, Y, Z) = 1 inotify_rm_watch(X, 1); inotify_add_watch(X, Y, Z) = 2 but after this patch inotify would return watch descriptors like so: inotify_add_watch(X, Y, Z) = 1 inotify_rm_watch(X, 1); inotify_add_watch(X, Y, Z) = 1 which I saw as equivalent to opening an fd where open(file) = 1; close(1); open(file) = 1; seemed perfectly reasonable. The issue is that quite a bit of userspace apparently relies on the behavior in which watch descriptors will not be quickly reused. KDE relies on it, I know some selinux packages rely on it, and I have heard complaints from other random sources such as debian bug 558981. Although the man page implies what we do is ok, we broke userspace so this patch almost reverts us to the old behavior. It is still slightly racey and I have patches that would fix that, but they are rather large and this will fix it for all real world cases. The race is as follows: - task1 creates a watch and blocks in idr_new_watch() before it updates the hint. - task2 creates a watch and updates the hint. - task1 updates the hint with it's older wd - task removes the watch created by task2 - task adds a new watch and will reuse the wd originally given to task2 it requires moving some locking around the hint (last_wd) but this should solve it for the real world and be -stable safe. As a side effect this patch papers over a bug in the lib/idr code which is causing a large number WARN's to pop on people's system and many reports in kerneloops.org. I'm working on the root cause of that idr bug seperately but this should make inotify immune to that issue. Signed-off-by: Eric Paris Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 3df76730b1e135164451de3192fcf5e1166eb944 Author: Greg Kroah-Hartman Date: Mon Jan 18 10:23:35 2010 -0800 Linux 2.6.32.4 commit 5877960869333e42ebeb733e8d9d5630ff96d350 Author: David Woodhouse Date: Wed Dec 2 11:00:05 2009 +0000 agp/intel-agp: Clear entire GTT on startup commit fc61901373987ad61851ed001fe971f3ee8d96a3 upstream. Some BIOSes fail to initialise the GTT, which will cause DMA faults when the IOMMU is enabled. We need to clear the whole thing to point at the scratch page, not just the part that Linux is going to use. Signed-off-by: David Woodhouse [anholt: Note that this may also help with stability in the presence of driver bugs, by not drawing to memory we don't own] Signed-off-by: Eric Anholt Cc: Zhenyu Wang Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 5deb72edb39542650c73e3fa7bf4a4a3ef14cc63 Author: David S. Miller Date: Wed Jan 13 17:27:37 2010 -0800 ipv6: skb_dst() can be NULL in ipv6_hop_jumbo(). commit 2570a4f5428bcdb1077622342181755741e7fa60 upstream. This fixes CERT-FI FICORA #341748 Discovered by Olli Jarva and Tuomo Untinen from the CROSS project at Codenomicon Ltd. Just like in CVE-2007-4567, we can't rely upon skb_dst() being non-NULL at this point. We fixed that in commit e76b2b2567b83448c2ee85a896433b96150c92e6 ("[IPV6]: Do no rely on skb->dst before it is assigned.") However commit 483a47d2fe794328d29950fe00ce26dd405d9437 ("ipv6: added net argument to IP6_INC_STATS_BH") put a new version of the same bug into this function. Complicating analysis further, this bug can only trigger when network namespaces are enabled in the build. When namespaces are turned off, the dev_net() does not evaluate it's argument, so the dereference would not occur. So, for a long time, namespaces couldn't be turned on unless SYSFS was disabled. Therefore, this code has largely been disabled except by people turning it on explicitly for namespace development. With help from Eugene Teo Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 54f1b39ce06aaf023db558ce4cc73f1d550d0d53 Author: Rusty Russell Date: Tue Dec 15 16:28:32 2009 -0600 module: handle ppc64 relocating kcrctabs when CONFIG_RELOCATABLE=y commit d4703aefdbc8f9f347f6dcefcddd791294314eb7 upstream. powerpc applies relocations to the kcrctab. They're absolute symbols, but it's not completely unreasonable: other archs may too, but the relocation is often 0. http://lists.ozlabs.org/pipermail/linuxppc-dev/2009-November/077972.html Inspired-by: Neil Horman Signed-off-by: Rusty Russell Tested-by: Neil Horman Acked-by: Paul Mackerras Signed-off-by: Greg Kroah-Hartman commit 9ef9a7c717299c9c57cba7a246462bf1c342118a Author: Al Viro Date: Sat Dec 19 16:03:30 2009 +0000 fix more leaks in audit_tree.c tag_chunk() commit b4c30aad39805902cf5b855aa8a8b22d728ad057 upstream. Several leaks in audit_tree didn't get caught by commit 318b6d3d7ddbcad3d6867e630711b8a705d873d7, including the leak on normal exit in case of multiple rules refering to the same chunk. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit dffaea5bd7145629d54ba57a49366bbd8157ddef Author: Al Viro Date: Sat Dec 19 15:59:45 2009 +0000 fix braindamage in audit_tree.c untag_chunk() commit 6f5d51148921c242680a7a1d9913384a30ab3cbe upstream. ... aka "Al had badly fscked up when writing that thing and nobody noticed until Eric had fixed leaks that used to mask the breakage". The function essentially creates a copy of old array sans one element and replaces the references to elements of original (they are on cyclic lists) with those to corresponding elements of new one. After that the old one is fair game for freeing. First of all, there's a dumb braino: when we get to list_replace_init we use indices for wrong arrays - position in new one with the old array and vice versa. Another bug is more subtle - termination condition is wrong if the element to be excluded happens to be the last one. We shouldn't go until we fill the new array, we should go until we'd finished the old one. Otherwise the element we are trying to kill will remain on the cyclic lists... That crap used to be masked by several leaks, so it was not quite trivial to hit. Eric had fixed some of those leaks a while ago and the shit had hit the fan... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit d3b1e3bff1a2ed3a145634775588f1019bc76f5c Author: Johannes Berg Date: Thu Jan 14 20:51:53 2010 +0100 mac80211: fix skb buffering issue (and fixes to that) This is a backport of the mainline patches cf0277e714a0db302a8f80e1b85fd61c32cf00b3 045cfb71a3901005bf6dcedae98cecb3360a0bfc b49bb574e44226b332c28439999d196ddec2f643 Here is the description of the first of those patches (the other two just fixed bugs added by that patch): Since I removed the master netdev, we've been keeping internal queues only, and even before that we never told the networking stack above the virtual interfaces about congestion. This means that packets are queued in mac80211 and the upper layers never know, possibly leading to memory exhaustion and other problems. This patch makes all interfaces multiqueue and uses ndo_select_queue to put the packets into queues per AC. Additionally, when the driver stops a queue, we now stop all corresponding queues for the virtual interfaces as well. The injection case will use VO by default for non-data frames, and BE for data frames, but downgrade any data frames according to ACM. It needs to be fleshed out in the future to allow chosing the queue/AC in radiotap. Signed-off-by: Johannes Berg Cc: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 71c77079a7b5c22e01eba239f93ce38bd6126725 Author: Mike Frysinger Date: Fri Jan 8 00:40:42 2010 -0500 kernel/sysctl.c: fix stable merge error in NOMMU mmap_min_addr Stable commit 0399123f3dcce1a515d021107ec0fb4413ca3efa didn't match the original upstream commit. The CONFIG_MMU check was added much too early in the list disabling a lot of proc entries in the process. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 904e3733fd1c50e81f4726f56759343207874a95 Author: Samuel Ortiz Date: Fri Dec 18 11:36:49 2009 +0100 libertas: Remove carrier signaling from the scan code commit 659c8e5243caf14564155ad8421404f044dd8031 upstream. There is no reason to signal a carrier off when doing a 802.11 scan. Cc: Holger Schurig Signed-off-by: Samuel Ortiz Acked-by: Dan Williams Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit b9945e752afed38518d7041ae00dea25f6272a34 Author: Jesse Barnes Date: Thu Dec 17 11:11:13 2009 -0800 drm/i915: remove render reclock support commit cda9d05c499093c67b4a376a15009923acc2127a upstream. This code generally fails to adjust the render clock, and when it does, it conflicts with some other register settings and can cause problems. So remove this code altogether. I'm reworking it now to do the right thing, but the only bit it will share is the VBT check for whether reclocking is supported, so I'm leaving that bit. Reverts most of 652c393a3368af84359da37c45afc35a91144960 ("add dynamic clock frequency control"), though for many the regressions showed up in the later 181a5336d6cc836f05507410d66988c483ad0154 ("Fix render reclock availability detection"). Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 9b13cca3a8623088d95d9897d29370b4e0b9c213 Author: Felix Fietkau Date: Thu Jan 7 20:23:53 2010 +0100 mac80211: add missing sanity checks for action frames commit d79074488083ec0d7ecd15352192dc1631f25643 upstream. Various missing sanity checks caused rejected action frames to be interpreted as channel switch announcements, which can cause a client mode interface to switch away from its operating channel, thereby losing connectivity. This patch ensures that only spectrum management action frames are processed by the CSA handling function and prevents rejected action frames from getting processed by the MLME code. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 0ea5505e18a1cb8eebf3384f825840897894ceda Author: Dan Carpenter Date: Sun Jan 3 11:19:35 2010 +0200 iwl: off by one bug commit 8a9ac160e844c7ce8074f6aa531feefb4acdee7c upstream. tid is used as an array offset. agg = &priv->stations[sta_id].tid[tid].agg; iwl4965_tx_status_reply_tx(priv, agg, tx_resp, txq_id, index); It should be limitted to MAX_TID_COUNT - 1; struct iwl_tid_data tid[MAX_TID_COUNT]; regards, dan carpenter Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 724ad42667b42b363bbef867d1c31850b599fecc Author: Luis R. Rodriguez Date: Mon Jan 4 11:37:39 2010 -0500 cfg80211: fix syntax error on user regulatory hints commit e12822e1d3fface0d9e1095c5177e10141bd6bd6 upstream. This fixes a syntax error when setting up the user regulatory hint. This change yields the same exact binary object though so it ends up just being a syntax typo fix, fortunately. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit e6efac7b7c4ce45d40f5e07d3105e07704e95673 Author: Luis R. Rodriguez Date: Mon Jan 4 10:40:39 2010 -0500 ath5k: Fix eeprom checksum check for custom sized eeproms commit 359207c687cc8f4f9845c8dadd0d6dabad44e584 upstream. Commit 8bf3d79bc401ca417ccf9fc076d3295d1a71dbf5 enabled EEPROM checksum checks to avoid bogus bug reports but failed to address updating the code to consider devices with custom EEPROM sizes. Devices with custom sized EEPROMs have the upper limit size stuffed in the EEPROM. Use this as the upper limit instead of the static default size. In case of a checksum error also provide back the max size and whether or not this was the default size or a custom one. If the EEPROM is busted we add a failsafe check to ensure we don't loop forever or try to read bogus areas of hardware. This closes bug 14874 http://bugzilla.kernel.org/show_bug.cgi?id=14874 Cc: David Quan Cc: Stephen Beahm Reported-by: Joshua Covington Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit fc95845f174a07d4200a30681067d22c9e34723c Author: Zhu Yi Date: Fri Jan 8 10:04:30 2010 -0800 iwlwifi: fix iwl_queue_used bug when read_ptr == write_ptr commit c8106d7625a58ee4387cb2efe3e82320ad44b467 upstream. When txq read_ptr equals to write_ptr, iwl_queue_used should always return false. Because there is no used TFD in this case. This is a complementary fix to the fix already included in commit "iwl3945: fix panic in iwl3945 driver". Both fixes are needed to address the panic below. This problem was discussed on linux-wireless in http://thread.gmane.org/gmane.linux.kernel.wireless.general/43568 <1>[ 7290.414172] IP: [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <4>[ 7290.414205] PGD 0 <1>[ 7290.414214] Thread overran stack, or stack corrupted <0>[ 7290.414229] Oops: 0002 [#1] PREEMPT SMP <0>[ 7290.414246] last sysfs file: /sys/devices/platform/coretemp.1/temp1_input <4>[ 7290.414265] CPU 0 <4>[ 7290.414274] Modules linked in: af_packet nfsd usb_storage usb_libusual cpufreq_powersave exportfs cpufreq_conservative iwl3945 nfs cpufreq_userspace snd_hda_codec_realtek acpi_cpufreq uvcvideo lockd iwlcore snd_hda_intel joydev coretemp nfs_acl videodev snd_hda_codec mac80211 v4l1_compat snd_hwdep sbp2 v4l2_compat_ioctl32 uhci_hcd psmouse auth_rpcgss ohci1394 cfg80211 ehci_hcd video ieee1394 snd_pcm serio_raw battery ac nvidia(P) usbcore output sunrpc evdev lirc_ene0100 snd_page_alloc rfkill tg3 libphy fuse lzo lzo_decompress lzo_compress <6>[ 7290.414486] Pid: 0, comm: swapper Tainted: P 2.6.32-rc8-wl #213 Aspire 5720 <6>[ 7290.414507] RIP: 0010:[] [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <6>[ 7290.414541] RSP: 0018:ffff880002203d60 EFLAGS: 00010246 <6>[ 7290.414557] RAX: 000000000000004f RBX: ffff880064c11600 RCX: 0000000000000013 <6>[ 7290.414576] RDX: ffffffffa0ddcf20 RSI: ffff8800512b7008 RDI: 0000000000000038 <6>[ 7290.414596] RBP: ffff880002203dd0 R08: 0000000000000000 R09: 0000000000000100 <6>[ 7290.414616] R10: 0000000000000001 R11: 0000000000000000 R12: 00000000000000a0 <6>[ 7290.414635] R13: 0000000000000002 R14: 0000000000000013 R15: 0000000000020201 <6>[ 7290.414655] FS: 0000000000000000(0000) GS:ffff880002200000(0000) knlGS:0000000000000000 <6>[ 7290.414677] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b <6>[ 7290.414693] CR2: 0000000000000041 CR3: 0000000001001000 CR4: 00000000000006f0 <6>[ 7290.414712] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 <6>[ 7290.414732] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 <4>[ 7290.414752] Process swapper (pid: 0, threadinfo ffffffff81524000, task ffffffff81528b60) <0>[ 7290.414772] Stack: <4>[ 7290.414780] ffff880002203da0 0000000000000046 0000000000000000 0000000000000046 <4>[ 7290.414804] <0> 0000000000000282 0000000000000282 0000000000000282 ffff880064c12010 <4>[ 7290.414830] <0> ffff880002203db0 ffff880064c11600 ffff880064c12e50 ffff8800512b7000 <0>[ 7290.414858] Call Trace: <0>[ 7290.414867] <4>[ 7290.414884] [] iwl3945_irq_tasklet+0x657/0x1740 [iwl3945] <4>[ 7290.414910] [] ? _spin_unlock+0x30/0x60 <4>[ 7290.414931] [] tasklet_action+0x101/0x110 <4>[ 7290.414950] [] __do_softirq+0xc0/0x160 <4>[ 7290.414968] [] call_softirq+0x1c/0x30 <4>[ 7290.414986] [] do_softirq+0x75/0xb0 <4>[ 7290.415003] [] irq_exit+0x95/0xa0 <4>[ 7290.415020] [] do_IRQ+0x77/0xf0 <4>[ 7290.415038] [] ret_from_intr+0x0/0xf <0>[ 7290.415052] <4>[ 7290.415067] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415087] [] ? acpi_idle_enter_bm+0x27a/0x2a5 <4>[ 7290.415107] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415130] [] ? cpuidle_idle_call+0x93/0xf0 <4>[ 7290.415149] [] ? cpu_idle+0xa7/0x110 <4>[ 7290.415168] [] ? rest_init+0x75/0x80 <4>[ 7290.415187] [] ? start_kernel+0x3a7/0x3b3 <4>[ 7290.415206] [] ? x86_64_start_reservations+0x125/0x129 <4>[ 7290.415227] [] ? x86_64_start_kernel+0xe4/0xeb <0>[ 7290.415243] Code: 00 41 39 ce 0f 8d e8 01 00 00 48 8b 47 40 48 63 d2 48 69 d2 98 00 00 00 4c 8b 04 02 48 c7 c2 20 cf dd a0 49 8d 78 38 49 8d 40 4f 47 09 00 c6 47 0c 00 c6 47 0f 00 c6 47 12 00 c6 47 15 00 49 <1>[ 7290.415382] RIP [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <4>[ 7290.415410] RSP <0>[ 7290.415421] CR2: 0000000000000041 <4>[ 7290.415436] ---[ end trace ec46807277caa515 ]--- <0>[ 7290.415450] Kernel panic - not syncing: Fatal exception in interrupt <4>[ 7290.415468] Pid: 0, comm: swapper Tainted: P D 2.6.32-rc8-wl #213 <4>[ 7290.415486] Call Trace: <4>[ 7290.415495] [] panic+0x7d/0x13a <4>[ 7290.415519] [] oops_end+0xda/0xe0 <4>[ 7290.415538] [] no_context+0xea/0x250 <4>[ 7290.415557] [] ? select_task_rq_fair+0x511/0x780 <4>[ 7290.415578] [] __bad_area_nosemaphore+0x125/0x1e0 <4>[ 7290.415597] [] ? __enqueue_entity+0x7c/0x80 <4>[ 7290.415616] [] ? enqueue_task_fair+0x111/0x150 <4>[ 7290.415636] [] bad_area_nosemaphore+0xe/0x10 <4>[ 7290.415656] [] do_page_fault+0x26a/0x320 <4>[ 7290.415674] [] page_fault+0x1f/0x30 <4>[ 7290.415697] [] ? iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <4>[ 7290.415723] [] iwl3945_irq_tasklet+0x657/0x1740 [iwl3945] <4>[ 7290.415746] [] ? _spin_unlock+0x30/0x60 <4>[ 7290.415764] [] tasklet_action+0x101/0x110 <4>[ 7290.415783] [] __do_softirq+0xc0/0x160 <4>[ 7290.415801] [] call_softirq+0x1c/0x30 <4>[ 7290.415818] [] do_softirq+0x75/0xb0 <4>[ 7290.415835] [] irq_exit+0x95/0xa0 <4>[ 7290.415852] [] do_IRQ+0x77/0xf0 <4>[ 7290.415869] [] ret_from_intr+0x0/0xf <4>[ 7290.415883] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415911] [] ? acpi_idle_enter_bm+0x27a/0x2a5 <4>[ 7290.415931] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415952] [] ? cpuidle_idle_call+0x93/0xf0 <4>[ 7290.415971] [] ? cpu_idle+0xa7/0x110 <4>[ 7290.415989] [] ? rest_init+0x75/0x80 <4>[ 7290.416007] [] ? start_kernel+0x3a7/0x3b3 <4>[ 7290.416026] [] ? x86_64_start_reservations+0x125/0x129 <4>[ 7290.416047] [] ? x86_64_start_kernel+0xe4/0xeb Reported-by: Maxim Levitsky Tested-by: Maxim Levitsky Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit a111c28a5d47bc15ed6b644a0b7c69d748c1bdb2 Author: Ian Campbell Date: Thu Dec 17 13:57:09 2009 +0000 xen: fix hang on suspend. commit c5cae661d6cf808b6984762f763261adf35f3eb7 upstream. In 65f63384 "xen: improve error handling in do_suspend" I said: - xs_suspend()/xs_resume() and dpm_suspend_noirq()/dpm_resume_noirq() were not nested in the obvious way. and changed the ordering of the calls as so: BEFORE AFTER xs_suspend dpm_suspend_noirq dpm_suspend_noirq xs_suspend *SUSPEND* *SUSPEND* dpm_resume_noirq dpm_resume_noirq xs_resume xs_resume Clearly this is not an improvement and I was talking rubbish. In particular the new ordering is susceptible to a hang if a xenstore write is in progress at the point at which the suspend kicks in. When the suspend process calls xs_suspend it tries to take the request_mutex but if a write is in progress it could be looping in xenbus_xs.c:read_reply() waiting for something to arrive on &xs_state.reply_list while holding the request_mutex (taken in the caller of read_reply). However if we have done dpm_suspend_noirq before xs_suspend then we won't get any more xenstore interrupts and process_msg() will never be woken up to add anything to the reply_list. Fix this by calling xs_suspend before dpm_suspend_noirq. If dpm_suspend_noirq fails then make sure we go through the xs_suspend_cancel() code path. Signed-off-by: Ian Campbell Acked-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 38c4d8d579c4e752e03edcdd2e96a49787d71a3a Author: Jan Kara Date: Wed Jan 6 18:03:36 2010 +0100 quota: Fix dquot_transfer for filesystems different from ext4 commit 05b5d898235401c489c68e1f3bc5706a29ad5713 upstream. Commit fd8fbfc1 modified the way we find amount of reserved space belonging to an inode. The amount of reserved space is checked from dquot_transfer and thus inode_reserved_space gets called even for filesystems that don't provide get_reserved_space callback which results in a BUG. Fix the problem by checking get_reserved_space callback and return 0 if the filesystem does not provide it. CC: Dmitry Monakhov Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit a61dcb0c6ac2aac895a17b37dcbe57b249a3d826 Author: Roger Blofeld Date: Sun Jan 10 20:52:32 2010 +0100 hwmon: (adt7462) Fix pin 28 monitoring commit bb595c923bc51dff9cdd112de18deb57ac7945d2 upstream. The ADT7462_PIN28_VOLT value is a 4-bit field, so the corresponding shift must be 4. Signed-off-by: Roger Blofeld Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4052fbfb24712ee7bb31c4c813d551712d7a4e4e Author: Yong Wang Date: Sun Jan 10 20:52:34 2010 +0100 hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs commit 1fe63ab47a617ee95f562eaa7ddbbc59981ff8c6 upstream. The max junction temperature of Atom N450/D410/D510 CPUs is 100 degrees Celsius. Since these CPUs are always coupled with Intel NM10 chipset in one package, the best way to verify whether an Atom CPU is N450/D410/D510 is to check the host bridge device. Signed-off-by: Yong Wang Acked-by: Huaxu Wan Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 545b02070bb58430c8ce96369bdbbe15e4aef1f7 Author: Patrick McHardy Date: Thu Jan 7 18:33:18 2010 +0100 netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq() commit aaff23a95aea5f000895f50d90e91f1e2f727002 upstream. As noticed by Dan Carpenter , update_nl_seq() currently contains an out of bounds read of the seq_aft_nl array when looking for the oldest sequence number position. Fix it to only compare valid positions. Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit 635b4f931d32118a7bda1b6b7622883bc7e0dcab Author: Florian Westphal Date: Fri Jan 8 17:31:24 2010 +0100 netfilter: ebtables: enforce CAP_NET_ADMIN commit dce766af541f6605fa9889892c0280bab31c66ab upstream. normal users are currently allowed to set/modify ebtables rules. Restrict it to processes with CAP_NET_ADMIN. Note that this cannot be reproduced with unmodified ebtables binary because it uses SOCK_RAW. Signed-off-by: Florian Westphal Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit 954c8ef2187e4fd5d870ff0d2d909deebf69f90e Author: Mark Brown Date: Thu Jan 7 16:29:20 2010 +0000 ASoC: Fix WM8350 DSP mode B configuration commit 5ee518ecbcb5934e284ea51a19a939c891f5f7ea upstream. We need to set the LRCLK inversion bit to select DSP mode. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Greg Kroah-Hartman commit cf99848730bff6df4f473daa089966372c131147 Author: Daniel T Chen Date: Sun Dec 27 15:48:40 2009 -0500 ALSA: atiixp: Specify codec for Foxconn RC4107MA-RS2 commit dfb12eeb0f04b37e5eb3858864d074af4ecd2ac7 upstream. BugLink: https://bugs.launchpad.net/ubuntu/+bug/498863 This mainboard needs ac97_codec=0. Tested-by: Apoorv Parle Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 0385cc0cdb6ed37d433dcf1f2e3f4451326c7c07 Author: Daniel T Chen Date: Sat Jan 9 01:22:29 2010 -0500 ALSA: ac97: Add Dell Dimension 2400 to Headphone/Line Jack Sense blacklist commit af9a75dd1a1f8a9aa406466cc8bb16208120488a upstream. This model needs both 'Headphone Jack Sense' and 'Line Jack Sense' muted for audible playback, so just add it to the ad1981 jack sense blacklist. Tested-by: Pete Signed-off-by: Daniel T Chen Signed-off-by: Jaroslav Kysela Signed-off-by: Greg Kroah-Hartman commit 5bb4e8409e9d28cc7cf6900fd68840604480caf4 Author: Takashi Iwai Date: Tue Jan 12 14:00:11 2010 +0100 ALSA: hda - Fix ALC861-VD capture source mixer commit 9c0afc861a7228f718cb6a79fa7f9d46bf9ff300 upstream. The capture source or input source mixer element wasn't created properly for ALC861-VD codec due to the wrong NID passed to alc_auto_create_input_ctls(). References: Novell bnc#568305 http://bugzilla.novell.com/show_bug.cgi?id=568305 Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit e0abcea649db45223c7df49df5db04dc1aa3a271 Author: Adrian Hunter Date: Fri Jan 8 14:43:00 2010 -0800 mmc_block: fix queue cleanup commit 5fa83ce284a4b7cd9dcfadd01500b0ed4ab9b740 upstream. The main bug was that 'blk_cleanup_queue()' was called while the block device could still be in use, for example, because the card was removed while files were still open. In addition, to be sure that 'mmc_request()' will get called for all new requests (so it can error them out), the queue is emptied during cleanup. This is done after the worker thread is stopped to avoid racing with it. Finally, it is not a device error for this to be happening, so quiet the (sometimes very many) error messages. Signed-off-by: Adrian Hunter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 0c74f45acfacc220adfa9e035ffeb3d5e8f9f0d8 Author: Jarkko Lavinen Date: Fri Jan 8 14:42:59 2010 -0800 mmc_block: fix probe error cleanup bug commit 0a74ff29b8dd8b748f8856352f9a9b5c6cc362cc upstream. If mmc_blk_set_blksize() fails mmc_blk_probe() the request queue and its thread have been set up and they need to be shut down properly before putting the disk. Signed-off-by: Jarkko Lavinen Signed-off-by: Adrian Hunter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 0798abf9dc8157145d7136f751b6a16aaac1b1e8 Author: Anna Lemehova Date: Fri Jan 8 14:42:58 2010 -0800 mmc_block: add dev_t initialization check commit 7d92df692994472cab6045bbd9d0e2c4afa4365f upstream. When a card is removed before mmc_blk_probe() has called add_disk(), then the minor field is uninitialized and has value 0. This caused mmc_blk_put() to always release devidx 0 even if 0 was still in use. Then the next mmc_blk_probe() used the first free idx of 0, which oopses in sysfs, since it is used by another card. Signed-off-by: Anna Lemehova Signed-off-by: Adrian Hunter Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 0696a3b5e0bb2b214b4b8293ce214f3a2e113bda Author: Andi Kleen Date: Fri Jan 8 14:42:52 2010 -0800 kernel/signal.c: fix kernel information leak with print-fatal-signals=1 commit b45c6e76bc2c72f6426c14bed64fdcbc9bf37cb0 upstream. When print-fatal-signals is enabled it's possible to dump any memory reachable by the kernel to the log by simply jumping to that address from user space. Or crash the system if there's some hardware with read side effects. The fatal signals handler will dump 16 bytes at the execution address, which is fully controlled by ring 3. In addition when something jumps to a unmapped address there will be up to 16 additional useless page faults, which might be potentially slow (and at least is not very efficient) Fortunately this option is off by default and only there on i386. But fix it by checking for kernel addresses and also stopping when there's a page fault. Signed-off-by: Andi Kleen Cc: Ingo Molnar Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit ecac13f4da35b215152e8dab78470662e1b9685d Author: Krzysztof Halasa Date: Fri Jan 8 14:42:36 2010 -0800 dma-debug: allow DMA_BIDIRECTIONAL mappings to be synced with DMA_FROM_DEVICE and commit 42d53b4ff7d61487d18274ebdf1f70c1aef6f122 upstream. There is no need to perform full BIDIR sync (copying the buffers in case of swiotlb and similar schemes) if we know that the owner (CPU or device) hasn't altered the data. Addresses the false-positive reported at http://bugzilla.kernel.org/show_bug.cgi?id=14169 Signed-off-by: Krzysztof Halasa Cc: David Miller Cc: Joerg Roedel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit f21efc5709f5e0285389a10ede7e3cef54977029 Author: Sascha Hauer Date: Fri Jan 8 14:42:47 2010 -0800 lib/rational.c needs module.h commit 7ee3aebe31d2cb22c84e1c8f48182947b13a3607 upstream. lib/rational.c:62: warning: data definition has no type or storage class lib/rational.c:62: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' lib/rational.c:62: warning: parameter names (without types) in function declaration Signed-off-by: Sascha Hauer Signed-off-by: Uwe Kleine-K��nig Acked-by: WANG Cong Cc: Oskar Schirmer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 21f7654aa8eac2e3c47097497aee440c222bd9ed Author: Dave Anderson Date: Fri Jan 8 14:42:50 2010 -0800 cgroups: fix 2.6.32 regression causing BUG_ON() in cgroup_diput() commit bd4f490a079730aadfaf9a728303ea0135c01945 upstream. The LTP cgroup test suite generates a "kernel BUG at kernel/cgroup.c:790!" here in cgroup_diput(): /* * if we're getting rid of the cgroup, refcount should ensure * that there are no pidlists left. */ BUG_ON(!list_empty(&cgrp->pidlists)); The cgroup pidlist rework in 2.6.32 generates the BUG_ON, which is caused when pidlist_array_load() calls cgroup_pidlist_find(): (1) if a matching cgroup_pidlist is found, it down_write's the mutex of the pre-existing cgroup_pidlist, and increments its use_count. (2) if no matching cgroup_pidlist is found, then a new one is allocated, it down_write's its mutex, and the use_count is set to 0. (3) the matching, or new, cgroup_pidlist gets returned back to pidlist_array_load(), which increments its use_count -- regardless whether new or pre-existing -- and up_write's the mutex. So if a matching list is ever encountered by cgroup_pidlist_find() during the life of a cgroup directory, it results in an inflated use_count value, preventing it from ever getting released by cgroup_release_pid_array(). Then if the directory is subsequently removed, cgroup_diput() hits the BUG_ON() when it finds that the directory's cgroup is still populated with a pidlist. The patch simply removes the use_count increment when a matching pidlist is found by cgroup_pidlist_find(), because it gets bumped by the calling pidlist_array_load() function while still protected by the list's mutex. Signed-off-by: Dave Anderson Reviewed-by: Li Zefan Acked-by: Ben Blum Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 6abb6ac30148ca47ff66c917ecd83df975daccbf Author: Stephen Hemminger Date: Fri Jan 8 14:43:08 2010 -0800 drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3' commit 5787536edf18e33d06e2bf038bfd0910f4def213 upstream. menu: use proper 64 bit math The new menu governor is incorrectly doing a 64 bit divide. Compile tested only Signed-off-by: Stephen Hemminger Cc: Arjan van de Ven Cc: Len Brown Cc: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit fdc08951c6708ecab22102ab404322c4d9de5221 Author: OGAWA Hirofumi Date: Fri Jan 8 14:43:11 2010 -0800 rtc_cmos: convert shutdown to new pnp_driver->shutdown commit 004731b2c7c658d36bee167cb1e1a399c2cbccc9 upstream. commit abd6633c67925f90775bb74755f9c547e30f1f20 ("pnp: add a shutdown method to pnp drivers") adds shutdown method to bus driver blindly. With it, driver->shutdown is no longer valid. Use pnp_driver->shutdown instead. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14889 Signed-off-by: OGAWA Hirofumi Reported-by: Malte Schr��der Cc: "Rafael J. Wysocki" Cc: Bjorn Helgaas Cc: David Hardeman Cc: Dmitry Torokhov Cc: Alessandro Zummo Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 0c51b5c49b554e7da4c929e1ee877d9e47ba1eec Author: Andrew Morton Date: Tue Nov 17 14:08:52 2009 -0800 drm/i915: fix unused var commit 29bd0ae25f8cb96b63560c2cbccec77b425e1603 upstream. drivers/gpu/drm/i915/i915_dma.c: In function 'i915_driver_load': drivers/gpu/drm/i915/i915_dma.c:1114: warning: 'll_base' may be used uninitialized in this function Partly this is because gcc isn't smart enough. But `ll_base' does get used uninitialised in the DRM_DEBUG() call. Cc: Jesse Barnes Cc: Eric Anholt Cc: Dave Airlie Signed-off-by: Andrew Morton Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit c7e8c269f5d886064af13e7d3eff1324cd78248c Author: Zhao Yakui Date: Mon Jan 4 16:29:32 2010 +0800 drm/i915: Select the correct BPC for LVDS on Ironlake commit e5a95eb778690bc864eb330202d2c1b974caaeb4 upstream. Select the correct BPC for LVDS on Ironlake. If it is 18-bit LVDS panel, the BPC will be 6. When it is 24-bit LVDS panel, the BPC will 8. At the same time the BPC will be 8 when the output device is CRT/HDMI/DP. Signed-off-by: Zhao Yakui Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit c04fd308e3d6148c3c8bcba688c668569759b29c Author: Zhao Yakui Date: Mon Jan 4 16:29:31 2010 +0800 drm/i915: Make the BPC in FDI rx/transcoder be consistent with that in pipeconf on Ironlake commit 8faf3b317471179c02db339aa80955a2e88c036d upstream. Make the BPC in FDI rx/transcoder be consistent with that in pipeconf on Ironlake. Signed-off-by: Zhao Yakui Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit cba0270924c7a6be1f30abd854ebdb3e0df6fb81 Author: Zhao Yakui Date: Mon Jan 4 16:29:30 2010 +0800 drm/i915: Enable/disable the dithering for LVDS based on VBT setting commit 898822ce9561ab9b58a7eb60580a162a83dadecd upstream. Enable/disable the dithering for LVDS based on VBT setting. On the 965/g4x platform the dithering flag is defined in LVDS register. And on the ironlake the dithering flag is defined in pipeconf register. Signed-off-by: Zhao Yakui Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit de040919d2c6a9a6a905b629810d2139c0d5f370 Author: Zhenyu Wang Date: Tue Jan 5 11:25:05 2010 +0800 drm: remove address mask param for drm_pci_alloc() commit e6be8d9d17bd44061116f601fe2609b3ace7aa69 upstream. drm_pci_alloc() has input of address mask for setting pci dma mask on the device, which should be properly setup by drm driver. And leave it as a param for drm_pci_alloc() would cause confusion or mistake would corrupt the correct dma mask setting, as seen on intel hw which set wrong dma mask for hw status page. So remove it from drm_pci_alloc() function. Signed-off-by: Zhenyu Wang Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit c6939598243bc2dbaece589a8dadb547d9083098 Author: Chris Wilson Date: Mon Jan 4 18:57:57 2010 +0000 drm/i915: Permit pinning whilst the device is 'suspended' commit e3d8affb0d2d95f2da61e30ce86b33177feb91e8 upstream. As pinning (allocating and binding GTT memory) does not actually invoke GPU commands, it is safe, and indeed is attempted, during resumption from suspension: [drm:intel_init_clock_gating] *ERROR* failed to pin power context: -16 Signed-off-by: Chris Wilson Reported-by: Hugh Dickins Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit d241962850065fe0aabfbe947028a5e5f14ffb45 Author: Daniel Vetter Date: Tue Dec 15 17:50:00 2009 +0100 drm/i915: fix order of fence release wrt flushing commit 96b47b65594fe2365f73aede060cb5203561fed3 upstream. i915_gem_object_unbind had the ordering wrong. The other user, i915_gem_object_put_fence_reg already has the correct ordering. Results was usually corrupted pixmaps, especially garbled font glyphs after a suspend/resume (because this evicts everything). I'm still waiting for the feedback from the bug-reporters, but because this obviously fixes a bug (at least for me) I'm already submitting it. Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=25406 Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit d3e4d5f8ccd3dfb33d9f2907b5290509766352ea Author: Zhao Yakui Date: Fri Dec 11 09:26:11 2009 +0800 drm/i915: Update LVDS connector status when receiving ACPI LID event commit a2565377a5c31e25c77c7cabaf6752abe9a2d83a upstream. Dirk reports that nothing is displayed on LVDS when using ubuntu 9.1 after close/reopen the LID. And I also reproduce this issue on another laptop. After some tests and debug, it seems that it is related with that the LVDS status is not updated in time in course of suspend/resume. Now the LID state is used to check whether the LVDS is connected or disconnected. And when the LID is closed, it means that the LVDS is disconnected. When it is reopened, it means that the LVDS is connected. At the same time on some distributions the LID event is also used to put the system into suspend state. When the LID is closed, the system will enter the suspend state. When the LID is reopened, the system will be resumed. In such case when the LID is closed, user-space script will receive the LID notification event and detect the LVDS as disconnected. Then the system will enter the suspended state. When the LID is reopened, the system will be resumed. As the LVDS status is not updated in course of resume, it will cause that the LVDS connector is marked as unused and disabled. After the resume is finished,user-space script will try to configure the display mode for LVDS. But unfortunately as the LVDS status is not updated in time and it is still marked as disconnected, the LVDS and its corresponding CRTC will be disabled again in the function of drm_helper_disable_unused_functions after changing mode for LVDS. So we had better check and update the status of LVDS connector after receiving the LID notication event. Then after the system is resumed from suspended state, we can set the display mode for LVDS correctly. Signed-off-by: Zhao Yakui Reported-by: Dirk Hohndel Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 8064af147be22c82fa805c6af0695c7dc52bb9c5 Author: Jeff Layton Date: Fri Dec 18 16:28:20 2009 -0500 sunrpc: on successful gss error pipe write, don't return error commit 486bad2e40e938cd68fd853b7a9fa3115a9d3a4a upstream. When handling the gssd downcall, the kernel should distinguish between a successful downcall that contains an error code and a failed downcall (i.e. where the parsing failed or some other sort of problem occurred). In the former case, gss_pipe_downcall should be returning the number of bytes written to the pipe instead of an error. In the event of other errors, we generally want the initiating task to retry the upcall so we set msg.errno to -EAGAIN. An unexpected error code here is a bug however, so BUG() in that case. Signed-off-by: Jeff Layton Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit 8ffe94786b66c4ea4298c5ab770de2e96993c9e3 Author: Trond Myklebust Date: Fri Dec 18 16:28:12 2009 -0500 SUNRPC: Fix the return value in gss_import_sec_context() commit b891e4a05ef6beac85465295a032431577c66b16 upstream. If the context allocation fails, it will return GSS_S_FAILURE, which is neither a valid error code, nor is it even negative. Return ENOMEM instead... Reported-by: Jeff Layton Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit e64b13f62782f5e495c085e1c06e48224545617f Author: Trond Myklebust Date: Fri Dec 18 16:28:05 2009 -0500 SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos() commit 14ace024b1e16d2bb9445c8387494fbbd820a738 upstream. If the context allocation fails, the function currently returns a random error code, since the variable 'p' still points to a valid memory location. Ensure that it returns ENOMEM... Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit eb0b93d6e280e51b1056be57ea92bb6ebec01ad4 Author: Xiaotian Feng Date: Thu Dec 31 10:52:36 2009 +0800 sunrpc: fix peername failed on closed listener commit b292cf9ce70d221c3f04ff62db5ab13d9a249ca8 upstream. There're some warnings of "nfsd: peername failed (err 107)!" socket error -107 means Transport endpoint is not connected. This warning message was outputed by svc_tcp_accept() [net/sunrpc/svcsock.c], when kernel_getpeername returns -107. This means socket might be CLOSED. And svc_tcp_accept was called by svc_recv() [net/sunrpc/svc_xprt.c] if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) { newxpt = xprt->xpt_ops->xpo_accept(xprt); So this might happen when xprt->xpt_flags has both XPT_LISTENER and XPT_CLOSE. Let's take a look at commit b0401d72, this commit has moved the close processing after do recvfrom method, but this commit also introduces this warnings, if the xpt_flags has both XPT_LISTENER and XPT_CLOSED, we should close it, not accpet then close. Signed-off-by: Xiaotian Feng Cc: J. Bruce Fields Cc: Neil Brown Cc: Trond Myklebust Cc: David S. Miller Cc: Nikola Ciprich Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman commit 3aafc557edb43aa82d9a5651f071d9dae7a2638b Author: Christoph Hellwig Date: Fri Dec 25 17:44:45 2009 +0100 nfsd: make sure data is on disk before calling ->fsync commit 7211a4e859ad070b28545c06e0a6cb60b3b8aa31 upstream. nfsd is not using vfs_fsync, so I missed it when changing the calling convention during the 2.6.32 window. This patch fixes it to not only start the data writeout, but also wait for it to complete before calling into ->fsync. Signed-off-by: Christoph Hellwig Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman commit b7e5f77916291b3c80fdf34dd2a649d8d10138e8 Author: Rusty Russell Date: Tue Jan 5 12:48:49 2010 +1030 Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium" commit db677ffa5f5a4f15b9dad4d132b3477b80766d82 upstream. This reverts commit ae1b22f6e46c03cede7cea234d0bf2253b4261cf. As Linus said in 982d007a6ee: "There was something really messy about cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it carefully." This breaks lguest for those configs, but we can fix that by emulating if we have to. Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884 Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 24488113f0ee3d3fdb64734cb2364cbe2ca1ba33 Author: Boaz Harrosh Date: Sun Dec 27 17:01:42 2009 +0200 exofs: simple_write_end does not mark_inode_dirty commit efd124b999fb4d426b30675f1684521af0872789 upstream. exofs uses simple_write_end() for it's .write_end handler. But it is not enough because simple_write_end() does not call mark_inode_dirty() when it extends i_size. So even if we do call mark_inode_dirty at beginning of write out, with a very long IO and a saturated system we might get the .write_inode() called while still extend-writing to file and miss out on the last i_size updates. So override .write_end, call simple_write_end(), and afterwords if i_size was changed call mark_inode_dirty(). It stands to logic that since simple_write_end() was the one extending i_size it should also call mark_inode_dirty(). But it looks like all users of simple_write_end() are memory-bound pseudo filesystems, who could careless about mark_inode_dirty(). I might submit a warning-comment patch to simple_write_end() in future. Signed-off-by: Boaz Harrosh Signed-off-by: Greg Kroah-Hartman commit 8dfabfcf7b0c03f33f7cb945772027060de70b61 Author: Ben Hutchings Date: Sat Dec 19 14:43:01 2009 +0000 modules: Skip empty sections when exporting section notes commit 10b465aaf9536ee5a16652fa0700740183d48ec9 upstream. Commit 35dead4 "modules: don't export section names of empty sections via sysfs" changed the set of sections that have attributes, but did not change the iteration over these attributes in add_notes_attrs(). This can lead to add_notes_attrs() creating attributes with the wrong names or with null name pointers. Introduce a sect_empty() function and use it in both add_sect_attrs() and add_notes_attrs(). Reported-by: Martin Michlmayr Signed-off-by: Ben Hutchings Tested-by: Martin Michlmayr Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit efd38f42843399cd8da8a5b63b04c8917f8d83a7 Author: Guennadi Liakhovetski Date: Thu Dec 24 01:13:51 2009 +0100 ASoC: fix params_rate() macro use in several codecs commit b3172f222ab5afdc91ea058bd11c42cf169728f3 upstream. Sevelar ASoC codec drivers wrongly assume, that the params_rate() macro returns one of SNDRV_PCM_RATE_* defines instead of the actual numerical sampling rate. Fix them. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit e4dd8ca5be771aa706b0797b3284328bb595bfa1 Author: Linus Torvalds Date: Wed Dec 16 08:23:37 2009 -0800 fasync: split 'fasync_helper()' into separate add/remove functions commit 53281b6d34d44308372d16acb7fb5327609f68b6 upstream. Yes, the add and remove cases do share the same basic loop and the locking, but the compiler can inline and then CSE some of the end result anyway. And splitting it up makes the code way easier to follow, and makes it clearer exactly what the semantics are. In particular, we must make sure that the FASYNC flag in file->f_flags exactly matches the state of "is this file on any fasync list", since not only is that flag visible to user space (F_GETFL), but we also use that flag to check whether we need to remove any fasync entries on file close. We got that wrong for the case of a mixed use of file locking (which tries to remove any fasync entries for file leases) and fasync. Splitting the function up also makes it possible to do some future optimizations without making the function even messier. In particular, since the FASYNC flag has to match the state of "is this on a list", we can do the following future optimizations: - on remove, we don't even need to get the locks and traverse the list if FASYNC isn't set, since we can know a priori that there is no point (this is effectively the same optimization that we already do in __fput() wrt removing fasync on file close) - on add, we can use the FASYNC flag to decide whether we are changing an existing entry or need to allocate a new one. but this is just the cleanup + fix for the FASYNC flag. Acked-by: Al Viro Tested-by: Tavis Ormandy Cc: Jeff Dike Cc: Matt Mackall Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 1f51eb3a881359e97dc2c228e55c83fba598e349 Author: Al Viro Date: Thu Jan 14 11:39:39 2010 -0800 untangle the do_mremap() mess This backports the following upstream commits all as one patch: 54f5de709984bae0d31d823ff03de755f9dcac54 ecc1a8993751de4e82eb18640d631dae1f626bd6 1a0ef85f84feb13f07b604fcf5b90ef7c2b5c82f f106af4e90eadd76cfc0b5325f659619e08fb762 097eed103862f9c6a97f2e415e21d1134017b135 935874141df839c706cd6cdc438e85eb69d1525e 0ec62d290912bb4b989be7563851bc364ec73b56 c4caa778157dbbf04116f0ac2111e389b5cd7a29 2ea1d13f64efdf49319e86c87d9ba38c30902782 570dcf2c15463842e384eb597a87c1e39bead99b 564b3bffc619dcbdd160de597b0547a7017ea010 0067bd8a55862ac9dd212bd1c4f6f5bff1ca1301 f8b7256096a20436f6d0926747e3ac3d64c81d24 8c7b49b3ecd48923eb64ff57e07a1cdb74782970 9206de95b1ea68357996ec02be5db0638a0de2c1 2c6a10161d0b5fc047b5bd81b03693b9af99fab5 05d72faa6d13c9d857478a5d35c85db9adada685 bb52d6694002b9d632bb355f64daa045c6293a4e e77414e0aad6a1b063ba5e5750c582c75327ea6a aa65607373a4daf2010e8c3867b6317619f3c1a3 Backport done by Greg Kroah-Hartman. Only minor tweaks were needed. Cc: David S. Miller Cc: Hugh Dickins Cc: Paul Mundt Cc: Russell King Cc: Linus Torvalds Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman commit c3a8e0eaafb438d5a7e6ca55c09b921291fcc1b1 Author: Greg Kroah-Hartman Date: Wed Jan 6 15:07:45 2010 -0800 Linux 2.6.32.3 commit 84d330ec80dc467baf6cb393d9c1ee006d1c024a Author: Serge E. Hallyn Date: Tue Dec 29 14:50:19 2009 -0600 generic_permission: MAY_OPEN is not write access commit 7ea6600148c265b1fd53e521022b1d7aec81d974 upstream. generic_permission was refusing CAP_DAC_READ_SEARCH-enabled processes from opening DAC-protected files read-only, because do_filp_open adds MAY_OPEN to the open mask. Ignore MAY_OPEN. After this patch, CAP_DAC_READ_SEARCH is again sufficient to open(fname, O_RDONLY) on a file to which DAC otherwise refuses us read permission. Reported-by: Mike Kazantsev Signed-off-by: Serge E. Hallyn Tested-by: Mike Kazantsev Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 3815270b3107d31c8b7bd69461f0bb3c350ee25c Author: Gertjan van Wingerde Date: Mon Dec 14 20:33:55 2009 +0100 rt2x00: Disable powersaving for rt61pci and rt2800pci. commit 93b6bd26b74efe46b4579592560f9f1cb7b61994 upstream. We've had many reports of rt61pci failures with powersaving enabled. Therefore, as a stop-gap measure, disable powersaving of the rt61pci until we have found a proper solution. Also disable powersaving on rt2800pci as it most probably will show the same problem. Signed-off-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 8ac9e802007e99534ec66af850ef7b099df27499 Author: Hugh Dickins Date: Wed Dec 30 23:00:30 2009 +0000 ksm: fix mlockfreed to munlocked 2.6.33-rc1 commit 73848b4684e84a84cfd1555af78d41158f31e16b, adjusted to include 31e855ea7173bdb0520f9684580423a9560f66e0's movement of the unlock_page(oldpage), but omit other intervening cleanups. When KSM merges an mlocked page, it has been forgetting to munlock it: that's been left to free_page_mlock(), which reports it in /proc/vmstat as unevictable_pgs_mlockfreed instead of unevictable_pgs_munlocked, which indicates that such pages _might_ be left unevictable for long after they should be evictable. Call munlock_vma_page() to fix that. Signed-off-by: Hugh Dickins Signed-off-by: Greg Kroah-Hartman commit b2ea8cb9c8f1937cb80b9beb50548a05bfc37819 Author: Rik van Riel Date: Mon Dec 14 17:59:48 2009 -0800 vmscan: do not evict inactive pages when skipping an active list scan commit b39415b2731d7dec5e612d2d12595da82399eedf upstream. In AIM7 runs, recent kernels start swapping out anonymous pages well before they should. This is due to shrink_list falling through to shrink_inactive_list if !inactive_anon_is_low(zone, sc), when all we really wanted to do is pre-age some anonymous pages to give them extra time to be referenced while on the inactive list. The obvious fix is to make sure that shrink_list does not fall through to scanning/reclaiming inactive pages when we called it to scan one of the active lists. This change should be safe because the loop in shrink_zone ensures that we will still shrink the anon and file inactive lists whenever we should. [kosaki.motohiro@jp.fujitsu.com: inactive_file_is_low() should be inactive_anon_is_low()] Reported-by: Larry Woodman Signed-off-by: Rik van Riel Acked-by: Johannes Weiner Cc: Tomasz Chmielewski Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Rik Theys Signed-off-by: Greg Kroah-Hartman commit 370b7588553ff0dc89c8b9436a935e2b7fe0207d Author: Rusty Russell Date: Mon Jan 4 19:26:14 2010 +1030 lguest: fix bug in setting guest GDT entry commit 3e27249c84beed1c79d767b350e52ad038db9053 upstream. We kill the guest, but then we blatt random stuff. Reported-by: Dan Carpenter Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 743c078e0e10e41b8b10f3c07973068d76fcc866 Author: Fang Wenqi Date: Thu Dec 24 17:51:42 2009 -0500 ext4: Update documentation to correct the inode_readahead_blks option name commit 6d3b82f2d31f22085e5711b28dddcb9fb3d97a25 upstream. Per commit 240799cd, the option name for readahead should be inode_readahead_blks, not inode_readahead. Signed-off-by: Fang Wenqi Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit fc310225dfa4d0ca5e8d1bfe66d49367d3e1d81a Author: Peter Zijlstra Date: Mon Nov 16 10:28:09 2009 +0100 sched: Sched_rt_periodic_timer vs cpu hotplug commit 047106adcc85e3023da210143a6ab8a55df9e0fc upstream. Heiko reported a case where a timer interrupt managed to reference a root_domain structure that was already freed by a concurrent hot-un-plug operation. Solve this like the regular sched_domain stuff is also synchronized, by adding a synchronize_sched() stmt to the free path, this ensures that a root_domain stays present for any atomic section that could have observed it. Reported-by: Heiko Carstens Signed-off-by: Peter Zijlstra Acked-by: Heiko Carstens Cc: Gregory Haskins Cc: Siddha Suresh B Cc: Martin Schwidefsky LKML-Reference: <1258363873.26714.83.camel@laptop> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 9127720087953642a8308b373a76f38916577f0e Author: Borislav Petkov Date: Mon Dec 21 18:55:18 2009 +0100 amd64_edac: fix forcing module load/unload commit 43f5e68733cfe8bed3c30b5c14c4993dffb29766 upstream. Clear the override flag after force-loading the module. Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit 15383230c0603460f1479610b3dc59e70dc73611 Author: Borislav Petkov Date: Mon Dec 21 18:13:01 2009 +0100 amd64_edac: make driver loading more robust commit 56b34b91e22313294154cee0c16e294cf8a45b61 upstream. Currently, the module does not initialize fully when the DIMMs aren't ECC but remains still loaded. Propagate the error when no instance of the driver is properly initialized and prevent further loading. Reorganize and polish error handling in amd64_edac_init() while at it. Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit 44a529c6b32a9254cacc0d0c6423967883d8ebcd Author: Borislav Petkov Date: Mon Dec 21 15:15:59 2009 +0100 amd64_edac: fix driver instance freeing commit 8f68ed9728193b1f2fb53ba06031b06bd8b3d1b4 upstream. Fix use-after-free errors by pushing all memory-freeing calls to the end of amd64_remove_one_instance(). Reported-by: Darren Jenkins LKML-Reference: <1261370306.11354.52.camel@ICE-BOX> Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit 2d9e1f02c8fec8e339eddf6c92e836c18525d328 Author: Borislav Petkov Date: Thu Dec 17 00:16:25 2009 +0100 x86, msr: msrs_alloc/free for CONFIG_SMP=n commit 6ede31e03084ee084bcee073ef3d1136f68d0906 upstream. Randy Dunlap reported the following build error: "When CONFIG_SMP=n, CONFIG_X86_MSR=m: ERROR: "msrs_free" [drivers/edac/amd64_edac_mod.ko] undefined! ERROR: "msrs_alloc" [drivers/edac/amd64_edac_mod.ko] undefined!" This is due to the fact that is conditioned on CONFIG_SMP and in the UP case we have only the stubs in the header. Fork off SMP functionality into a new file (msr-smp.c) and build msrs_{alloc,free} unconditionally. Reported-by: Randy Dunlap Cc: H. Peter Anvin Signed-off-by: Borislav Petkov LKML-Reference: <20091216231625.GD27228@liondog.tnic> Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit eb21839600f406f76a63e6da241db7f361f7ff52 Author: Borislav Petkov Date: Fri Dec 11 18:14:40 2009 +0100 x86, msr: Add support for non-contiguous cpumasks commit 505422517d3f126bb939439e9d15dece94e11d2c upstream. The current rd/wrmsr_on_cpus helpers assume that the supplied cpumasks are contiguous. However, there are machines out there like some K8 multinode Opterons which have a non-contiguous core enumeration on each node (e.g. cores 0,2 on node 0 instead of 0,1), see http://www.gossamer-threads.com/lists/linux/kernel/1160268. This patch fixes out-of-bounds writes (see URL above) by adding per-CPU msr structs which are used on the respective cores. Additionally, two helpers, msrs_{alloc,free}, are provided for use by the callers of the MSR accessors. Cc: H. Peter Anvin Cc: Mauro Carvalho Chehab Cc: Aristeu Rozanski Cc: Randy Dunlap Cc: Doug Thompson Signed-off-by: Borislav Petkov LKML-Reference: <20091211171440.GD31998@aftab> Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 26eb2ac67f9296d5b66533e55e9a28a2edd05b48 Author: Borislav Petkov Date: Tue Nov 3 15:29:26 2009 +0100 amd64_edac: unify MCGCTL ECC switching commit f6d6ae965760906d79ab29bc38507608c5971549 upstream. Unify almost identical code into one function and remove NUMA-specific usage (specifically cpumask_of_node()) in favor of generic topology methods. Remove unused defines, while at it. Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit ebd2802865c7ea5f352fd5444c293d013e528922 Author: Rusty Russell Date: Tue Nov 3 14:56:35 2009 +1030 cpumask: use modern cpumask style in drivers/edac/amd64_edac.c commit ba578cb34a71fb08fff14ac0796b934a8c9991e1 upstream. cpumask_t -> struct cpumask, and don't put one on the stack. (Note: this is actually on the stack unless CONFIG_CPUMASK_OFFSTACK=y). Signed-off-by: Rusty Russell Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman commit a89a9e1d729d7f1bc0d18bea800087bdfcfe4957 Author: Borislav Petkov Date: Thu Jul 30 11:10:02 2009 +0200 x86, msr: Unify rdmsr_on_cpus/wrmsr_on_cpus commit b8a4754147d61f5359a765a3afd3eb03012aa052 upstream. Since rdmsr_on_cpus and wrmsr_on_cpus are almost identical, unify them into a common __rwmsr_on_cpus helper thus avoiding code duplication. While at it, convert cpumask_t's to const struct cpumask *. Signed-off-by: Borislav Petkov Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit b2dbc4634227483a44732e73801b804915f04969 Author: Dmitry Monakhov Date: Thu Dec 10 16:36:27 2009 +0000 ext4: fix sleep inside spinlock issue with quota and dealloc (#14739) commit 39bc680a8160bb9d6743f7873b535d553ff61058 upstream. Unlock i_block_reservation_lock before vfs_dq_reserve_block(). This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=14739 Cc: Theodore Ts'o Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit dbe5cc0045fafc8fc452fa90dba93ad957494e14 Author: Dmitry Monakhov Date: Mon Dec 14 15:21:14 2009 +0300 ext4: Convert to generic reserved quota's space management. commit a9e7f4472075fb6937c545af3f6329e9946bbe66 upstream. This patch also fixes write vs chown race condition. Acked-by: "Theodore Ts'o" Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit bbf245072d81e512cc88535379ae6edb5d08f420 Author: Dmitry Monakhov Date: Mon Dec 14 15:21:13 2009 +0300 quota: decouple fs reserved space from quota reservation commit fd8fbfc1709822bd94247c5b2ab15a5f5041e103 upstream. Currently inode_reservation is managed by fs itself and this reservation is transfered on dquot_transfer(). This means what inode_reservation must always be in sync with dquot->dq_dqb.dqb_rsvspace. Otherwise dquot_transfer() will result in incorrect quota(WARN_ON in dquot_claim_reserved_space() will be triggered) This is not easy because of complex locking order issues for example http://bugzilla.kernel.org/show_bug.cgi?id=14739 The patch introduce quota reservation field for each fs-inode (fs specific inode is used in order to prevent bloating generic vfs inode). This reservation is managed by quota code internally similar to i_blocks/i_bytes and may not be always in sync with internal fs reservation. Also perform some code rearrangement: - Unify dquot_reserve_space() and dquot_reserve_space() - Unify dquot_release_reserved_space() and dquot_free_space() - Also this patch add missing warning update to release_rsv() dquot_release_reserved_space() must call flush_warnings() as dquot_free_space() does. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit f07c88dd6cbcc8086e28759f3686068163d423ae Author: Dmitry Monakhov Date: Mon Dec 14 15:21:12 2009 +0300 Add unlocked version of inode_add_bytes() function commit b462707e7ccad058ae151e5c5b06eb5cadcb737f upstream. Quota code requires unlocked version of this function. Off course we can just copy-paste the code, but copy-pasting is always an evil. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit 0aebc28083514af318c438fccc8a7ae23b4e1ab8 Author: Jan Kara Date: Mon Nov 30 19:47:55 2009 +0100 udf: Try harder when looking for VAT inode commit e971b0b9e0dd50d9ceecb67a6a6ab80a80906033 upstream. Some disks do not contain VAT inode in the last recorded block as required by the standard but a few blocks earlier (or the number of recorded blocks is wrong). So look for the VAT inode a bit before the end of the media. Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit 3196f989c52765aa202a7917ca381aeafa509a83 Author: Andrey Borzenkov Date: Tue Dec 22 21:38:44 2009 +0300 orinoco: fix GFP_KERNEL in orinoco_set_key with interrupts disabled commit 5b0691508aa99d309101a49b4b084dc16b3d7019 upstream. orinoco_set_key is called from two places both with interrupts disabled (under orinoco_lock). Use GFP_ATOMIC instead of GFP_KERNEL. Fixes following warning: [ 77.254109] WARNING: at /home/bor/src/linux-git/kernel/lockdep.c:2465 lockdep_trace_alloc+0x9a/0xa0() [ 77.254109] Hardware name: PORTEGE 4000 [ 77.254109] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod loop nvram toshiba cryptomgr aead pcompress crypto_blkcipher michael_mic crypto_hash crypto_algapi orinoco_cs orinoco cfg80211 smsc_ircc2 pcmcia irda toshiba_acpi yenta_socket video i2c_ali1535 backlight rsrc_nonstatic ali_agp pcmcia_core psmouse output crc_ccitt i2c_core alim1535_wdt rfkill sg evdev ohci_hcd agpgart usbcore pata_ali libata reiserfs [last unloaded: scsi_wait_scan] [ 77.254109] Pid: 2296, comm: wpa_supplicant Not tainted 2.6.32-1avb #1 [ 77.254109] Call Trace: [ 77.254109] [] warn_slowpath_common+0x6d/0xa0 [ 77.254109] [] ? lockdep_trace_alloc+0x9a/0xa0 [ 77.254109] [] ? lockdep_trace_alloc+0x9a/0xa0 [ 77.254109] [] warn_slowpath_null+0x15/0x20 [ 77.254109] [] lockdep_trace_alloc+0x9a/0xa0 [ 77.254109] [] __kmalloc+0x36/0x130 [ 77.254109] [] ? orinoco_set_key+0x48/0x1c0 [orinoco] [ 77.254109] [] orinoco_set_key+0x48/0x1c0 [orinoco] [ 77.254109] [] orinoco_ioctl_set_encodeext+0x1dc/0x2d0 [orinoco] [ 77.254109] [] ioctl_standard_call+0x207/0x3b0 [ 77.254109] [] ? orinoco_ioctl_set_encodeext+0x0/0x2d0 [orinoco] [ 77.254109] [] ? rtnl_lock+0xf/0x20 [ 77.254109] [] ? rtnl_lock+0xf/0x20 [ 77.254109] [] ? __dev_get_by_name+0x85/0xb0 [ 77.254109] [] wext_handle_ioctl+0x176/0x200 [ 77.254109] [] ? orinoco_ioctl_set_encodeext+0x0/0x2d0 [orinoco] [ 77.254109] [] dev_ioctl+0x6af/0x730 [ 77.254109] [] ? move_addr_to_kernel+0x55/0x60 [ 77.254109] [] ? sys_sendto+0xe9/0x130 [ 77.254109] [] sock_ioctl+0x7e/0x250 [ 77.254109] [] ? sock_ioctl+0x0/0x250 [ 77.254109] [] vfs_ioctl+0x1c/0x70 [ 77.254109] [] do_vfs_ioctl+0x6a/0x590 [ 77.254109] [] ? might_fault+0x90/0xa0 [ 77.254109] [] ? might_fault+0x4a/0xa0 [ 77.254109] [] ? sys_socketcall+0x17e/0x280 [ 77.254109] [] sys_ioctl+0x39/0x60 [ 77.254109] [] sysenter_do_call+0x12/0x32 [ 77.254109] ---[ end trace 95ef563548d21efd ]--- Signed-off-by: Andrey Borzenkov Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit fad0c314dd0f0c3293b202c23ade933ec43e6961 Author: Paolo Bonzini Date: Wed Jul 8 12:27:39 2009 +0200 xen: wait up to 5 minutes for device connetion commit ae7888012969355a548372e99b066d9e31153b62 upstream. Increases the device timeout from 10s to 5 minutes, giving the user a visual indication during that time in case there are problems. The patch is a backport of changesets 144 and 150 in the Xenbits tree. Cc: Jeremy Fitzhardinge Signed-off-by: Paolo Bonzini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 2cfea0096f008796246646f7cb1483f9b298b1d2 Author: Paolo Bonzini Date: Wed Jul 8 12:27:38 2009 +0200 xen: improvement to wait_for_devices() commit f8dc33088febc63286b7a60e6b678de8e064de8e upstream. When printing a warning about a timed-out device, print the current state of both ends of the device connection (i.e., backend as well as frontend). This backports half of changeset 146 from the Xenbits tree. Cc: Jeremy Fitzhardinge Signed-off-by: Paolo Bonzini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit af70ddfa0a21d625f1b7ed3389ce30eeed0896c3 Author: Paolo Bonzini Date: Wed Jul 8 12:27:37 2009 +0200 xen: fix is_disconnected_device/exists_disconnected_device commit c6e1971139be1342902873181f3b80a979bfb33b upstream. The logic of is_disconnected_device/exists_disconnected_device is wrong in that they are used to test whether a device is trying to connect (i.e. connecting). For this reason the patch fixes them to not consider a Closing or Closed device to be connecting. At the same time the patch also renames the functions according to what they really do; you could say a closed device is "disconnected" (the old name), but not "connecting" (the new name). This patch is a backport of changeset 909 from the Xenbits tree. Cc: Jeremy Fitzhardinge Signed-off-by: Paolo Bonzini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 1dc51f1054ff6444540c3a3e45aad6657d130562 Author: Stefan Weinhuber Date: Mon Dec 7 12:51:48 2009 +0100 S390: dasd: support DIAG access for read-only devices commit 22825ab7693fd29769518a0d25ba43c01a50092a upstream. When a DASD device is used with the DIAG discipline, the DIAG initialization will indicate success or error with a respective return code. So far we have interpreted a return code of 4 as error, but it actually means that the initialization was successful, but the device is read-only. To allow read-only devices to be used with DIAG we need to accept a return code of 4 as success. Re-initialization of the DIAG access is also part of the DIAG error recovery. If we find that the access mode of a device has been changed from writable to read-only while the device was in use, we print an error message. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky Cc: Stephen Powell Signed-off-by: Greg Kroah-Hartman commit 4012cf67b9f1841ad582ca094c230439d98c8a4d Author: Zhao Yakui Date: Wed Dec 9 11:23:42 2009 +0800 drm: disable all the possible outputs/crtcs before entering KMS mode commit b16d9acbdb97452d1418420e069acf7381ef10bb upstream. Sometimes we will use a crtc for integerated LVDS, which is different with that assigned by BIOS. If we want to get flicker-free transitions, then we could read out the current state for it and set our current state accordingly. But it is true that if we aren't reading current state out, we do need to turn everything off before modesetting. Otherwise the clocks can get very angry and we get things worse than a flicker at boot. In fact we also do the similar thing in UMS mode. We will disable all the possible outputs/crtcs for the first modesetting. So we disable all the possible outputs/crtcs before entering the KMS mode. Before we configure connector/encoder/crtc, the function of drm_helper_disable_unused_function can disable all the possible outputs/crtcs. Signed-off-by: Zhao Yakui Reviewed-by: Eric Anholt Reviewed-by: Rafal Milecki Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 08ff73341f9d5bde2d5e54bfe4d6a3d2a3f2ee83 Author: Dave Airlie Date: Mon Dec 21 14:33:52 2009 +1000 drm/radeon/kms: fix crtc vblank update for r600 In 2.6.32.2 r600 had no IRQ support, however the patch in 500b758725314ab1b5316eb0caa5b0fa26740e6b to fix vblanks on avivo cards, needs irqs. So check for an R600 card and avoid this path if so. This is a stable only patch for 2.6.32.2 as 2.6.33 has IRQs for r600. Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit a09adfeb9ea89d22c301749a87480ac98edc2cce Author: Peter Zijlstra Date: Wed Nov 25 13:31:39 2009 +0100 sched: Fix balance vs hotplug race commit 6ad4c18884e864cf4c77f9074d3d1816063f99cd upstream. Since (e761b77: cpu hotplug, sched: Introduce cpu_active_map and redo sched domain managment) we have cpu_active_mask which is suppose to rule scheduler migration and load-balancing, except it never (fully) did. The particular problem being solved here is a crash in try_to_wake_up() where select_task_rq() ends up selecting an offline cpu because select_task_rq_fair() trusts the sched_domain tree to reflect the current state of affairs, similarly select_task_rq_rt() trusts the root_domain. However, the sched_domains are updated from CPU_DEAD, which is after the cpu is taken offline and after stop_machine is done. Therefore it can race perfectly well with code assuming the domains are right. Cure this by building the domains from cpu_active_mask on CPU_DOWN_PREPARE. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar Cc: Mike Galbraith Cc: Holger Hoffst��tte Signed-off-by: Greg Kroah-Hartman commit fb70ac4b23fc108eb92eef9434e111bbdd7fd922 Author: Geert Uytterhoeven Date: Sun Dec 13 20:21:34 2009 +0100 Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support commit a00ae4d21b2fa9379914f270ffffd8d3bec55430 upstream. As of commit ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]"), CONFIG_KEYS=y fails to build on architectures that haven't implemented TIF_NOTIFY_RESUME yet: security/keys/keyctl.c: In function 'keyctl_session_to_parent': security/keys/keyctl.c:1312: error: 'TIF_NOTIFY_RESUME' undeclared (first use in this function) security/keys/keyctl.c:1312: error: (Each undeclared identifier is reported only once security/keys/keyctl.c:1312: error: for each function it appears in.) Make KEYCTL_SESSION_TO_PARENT depend on TIF_NOTIFY_RESUME until m68k, and xtensa have implemented it. Signed-off-by: Geert Uytterhoeven Signed-off-by: James Morris Acked-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 7fcb55881eb7a15e58ccfe81b4fe35fb06b12a7e Author: Larry Finger Date: Mon Nov 23 18:40:45 2009 -0600 b43: avoid PPC fault during resume commit c2ff581acab16c6af56d9e8c1a579bf041ec00b1 upstream. The routine b43_is_hw_radio_enabled() has long been a problem. For PPC architecture with PHY Revision < 3, a read of the register B43_MMIO_HWENABLED_LO will cause a CPU fault unless b43_status() returns a value of 2 (B43_STAT_STARTED) (BUG 14181). Fixing that results in Bug 14538 in which the driver is unable to reassociate after resuming from hibernation because b43_status() returns 0. The correct fix would be to determine why the status is 0; however, I have not yet found why that happens. The correct value is found for my device, which has PHY revision >= 3. Returning TRUE when the PHY revision < 3 and b43_status() returns 0 fixes the regression for 2.6.32. This patch fixes the problem in Red Hat Bugzilla #538523. Signed-off-by: Larry Finger Tested-by: Christian Casteyde Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit a8e3ec9aa0f527e759ab056952a1cb3ed102220d Author: Jonathan Cameron Date: Wed Dec 16 21:38:28 2009 +0100 hwmon: (sht15) Off-by-one error in array index + incorrect constants commit 4235f684b66d6f00d2cd8849c884cf8f8b57ecad upstream. Fix an off-by-one error in array index + incorrect constants. Signed-off-by: Christoph Walser Signed-off-by: Jonathan Cameron Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 048a424c2826ccbeb9b08bc3a8c6bc7acbd3116d Author: Patrick McHardy Date: Tue Dec 15 16:59:59 2009 +0100 netfilter: fix crashes in bridge netfilter caused by fragment jumps commit 8fa9ff6849bb86c59cc2ea9faadf3cb2d5223497 upstream. When fragments from bridge netfilter are passed to IPv4 or IPv6 conntrack and a reassembly queue with the same fragment key already exists from reassembling a similar packet received on a different device (f.i. with multicasted fragments), the reassembled packet might continue on a different codepath than where the head fragment originated. This can cause crashes in bridge netfilter when a fragment received on a non-bridge device (and thus with skb->nf_bridge == NULL) continues through the bridge netfilter code. Add a new reassembly identifier for packets originating from bridge netfilter and use it to put those packets in insolated queues. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=14805 Reported-and-Tested-by: Chong Qiao Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit 89cf4f4c853f1f9619d58d89aa7d1fc56e24ee3a Author: Patrick McHardy Date: Tue Dec 15 16:59:18 2009 +0100 ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery commit 0b5ccb2ee250136dd7385b1c7da28417d0d4d32d upstream. Currently the same reassembly queue might be used for packets reassembled by conntrack in different positions in the stack (PREROUTING/LOCAL_OUT), as well as local delivery. This can cause "packet jumps" when the fragment completing a reassembled packet is queued from a different position in the stack than the previous ones. Add a "user" identifier to the reassembly queue key to seperate the queues of each caller, similar to what we do for IPv4. Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit ee6bfc69e69474840cacb2f665831aff29bdbb40 Author: Roger Oksanen Date: Fri Dec 18 20:18:21 2009 -0800 e100: Fix broken cbs accounting due to missing memset. commit 70abc8cb90e679d8519721e2761d8366a18212a6 upstream. Alan Stern noticed that e100 caused slab corruption. commit 98468efddb101f8a29af974101c17ba513b07be1 changed the allocation of cbs to use dma pools that don't return zeroed memory, especially the cb->status field used to track which cb to clean, causing (the visible) double freeing of skbs and a wrong free cbs count. Now the cbs are explicitly zeroed at allocation time. Reported-by: Alan Stern Tested-by: Alan Stern Signed-off-by: Roger Oksanen Acked-by: Jesse Brandeburg Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit ad46fed9c9b596b6ece5728aad3722a9c4acc8cb Author: Daisuke Nishimura Date: Tue Dec 15 16:47:12 2009 -0800 memcg: avoid oom-killing innocent task in case of use_hierarchy commit d31f56dbf8bafaacb0c617f9a6f137498d5c7aed upstream. task_in_mem_cgroup(), which is called by select_bad_process() to check whether a task can be a candidate for being oom-killed from memcg's limit, checks "curr->use_hierarchy"("curr" is the mem_cgroup the task belongs to). But this check return true(it's false positive) when: /aa use_hierarchy == 0 <- hitting limit /aa/00 use_hierarchy == 1 <- the task belongs to This leads to killing an innocent task in aa/00. This patch is a fix for this bug. And this patch also fixes the arg for mem_cgroup_print_oom_info(). We should print information of mem_cgroup which the task being killed, not current, belongs to. Signed-off-by: Daisuke Nishimura Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit b52d85562809f1e8b03d03f6ebc5aa28405d0576 Author: Linus Torvalds Date: Thu Dec 17 07:04:56 2009 -0800 x86/ptrace: make genregs[32]_get/set more robust commit 04a1e62c2cec820501f93526ad1e46073b802dc4 upstream. The loop condition is fragile: we compare an unsigned value to zero, and then decrement it by something larger than one in the loop. All the callers should be passing in appropriately aligned buffer lengths, but it's better to just not rely on it, and have some appropriate defensive loop limits. Acked-by: Roland McGrath Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 6e2aa7de04f48bd39955fe0939dc2e02b8941839 Author: Dan Carpenter Date: Thu Dec 10 16:44:51 2009 -0300 V4L/DVB (13596): ov511.c typo: lock => unlock commit 50e9d31183ed61c787b870cb3ee8f6c3db8c8a1e upstream. This was found with a static checker and has not been tested, but it seems pretty clear that the mutex_lock() was supposed to be mutex_unlock() Signed-off-by: Dan Carpenter Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab Cc: Brandon Philips Signed-off-by: Greg Kroah-Hartman commit 4b6d2635956c1ce642bc5dbfc8f460b516ed7e12 Author: WANG Cong Date: Thu Dec 17 15:27:05 2009 -0800 kernel/sysctl.c: fix the incomplete part of sysctl_max_map_count-should-be-non-negative.patch commit 3e26120cc7c819c97bc07281ca1fb9017cfe9a39 upstream. It is a mistake that we used 'proc_dointvec', it should be 'proc_dointvec_minmax', as in the original patch. Signed-off-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 3ec268a6828ccc37a15e62a7836433b081342345 Author: Amerigo Wang Date: Mon Dec 14 17:59:52 2009 -0800 'sysctl_max_map_count' should be non-negative commit 70da2340fbc68e91e701762f785479ab495a0869 upstream. Jan Engelhardt reported we have this problem: setting max_map_count to a value large enough results in programs dying at first try. This is on 2.6.31.6: 15:59 borg:/proc/sys/vm # echo $[1<<31-1] >max_map_count 15:59 borg:/proc/sys/vm # cat max_map_count 1073741824 15:59 borg:/proc/sys/vm # echo $[1<<31] >max_map_count 15:59 borg:/proc/sys/vm # cat max_map_count Killed This is because we have a chance to make 'max_map_count' negative. but it's meaningless. Make it only accept non-negative values. Reported-by: Jan Engelhardt Signed-off-by: WANG Cong Cc: Ingo Molnar Cc: Peter Zijlstra Cc: James Morris Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 0399123f3dcce1a515d021107ec0fb4413ca3efa Author: David Howells Date: Tue Dec 15 19:27:45 2009 +0000 NOMMU: Optimise away the {dac_,}mmap_min_addr tests commit 6e1415467614e854fee660ff6648bd10fa976e95 upstream. In NOMMU mode clamp dac_mmap_min_addr to zero to cause the tests on it to be skipped by the compiler. We do this as the minimum mmap address doesn't make any sense in NOMMU mode. mmap_min_addr and round_hint_to_min() can be discarded entirely in NOMMU mode. Signed-off-by: David Howells Acked-by: Eric Paris Signed-off-by: James Morris Signed-off-by: Greg Kroah-Hartman commit 1cfe005024b5c820f9b37c9045ec87ee75a8cfb6 Author: Luis R. Rodriguez Date: Thu Dec 24 15:26:09 2009 -0500 mac80211: fix race with suspend and dynamic_ps_disable_work commit b98c06b6debfe84c90200143bb1102f312f50a33 upstream. When mac80211 suspends it calls a driver's suspend callback as a last step and after that the driver assumes no calls will be made to it until we resume and its start callback is kicked. If such calls are made, however, suspend can end up throwing hardware in an unexpected state and making the device unusable upon resume. Fix this by preventing mac80211 to schedule dynamic_ps_disable_work by checking for when mac80211 starts to suspend and starts quiescing. Frames should be allowed to go through though as that is part of the quiescing steps and we do not flush the mac80211 workqueue since it was already done towards the beginning of suspend cycle. The other mac80211 issue will be hanled in the next patch. For further details see refer to the thread: http://marc.info/?t=126144866100001&r=1&w=2 Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 14b4d749ab35158853bca4868b42c0a8cb947206 Author: Reinette Chatre Date: Mon Dec 14 14:12:13 2009 -0800 iwlwifi: fix 40MHz operation setting on cards that do not allow it commit 6c3069b1e7e983e176a5f826e2edffefdd404a08 upstream. Some devices have 40MHz operation disabled entirely. Ensure that driver do not enable 40MHz operation if a channel does not allow this. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2135 Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit c4ae8aea88809050e8ae76a8c3e252ba3fe6e2cc Author: Johannes Berg Date: Mon Dec 14 14:12:09 2009 -0800 iwlwifi: fix more eeprom endian bugs commit b7bb1756cb6a610cdbac8cfdad9e79bb5670b63b upstream. I've also for a long time had a problem with the temperature calculation code, which I had fixed by byte-swapping the values, and now it turns out that was the correct fix after all. Also, any use of iwl_eeprom_query_addr() that is for more than a u8 must be cast to little endian, and some structs as well. Fix all this. Again, no real impact on platforms that already are little endian. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit df5d119f46660631b9d50b91b1b888cdb512bdb2 Author: Johannes Berg Date: Mon Dec 14 14:12:08 2009 -0800 iwlwifi: fix EEPROM/OTP reading endian annotations and a bug commit af6b8ee38833b39f70946f767740565ceb126961 upstream. The construct "le16_to_cpu((__force __le16)(r >> 16))" has always bothered me when looking through the iwlwifi code, it shouldn't be necessary to __force anything, and before this code, "r" was obtained with an ioread32, which swaps each of the two u16 values in it properly when swapping the entire u32 value. I've had arguments about this code with people before, but always conceded they were right because removing it only made things not work at all on big endian platforms. However, analysing a failure of the OTP reading code, I now finally figured out what is going on, and why my intuition about that code being wrong was right all along. It turns out that the 'priv->eeprom' u8 array really wants to have the data in it in little endian. So the force code above and all really converts *to* little endian, not from it. Cf., for instance, the function iwl_eeprom_query16() -- it reads two u8 values and combines them into a u16, in a little-endian way. And considering it more, it makes sense to have the eeprom array as on the device, after all not all values really are 16-bit values, the MAC address for instance is not. Now, what this really means is that all the annotations are completely wrong. The eeprom reading code should fill the priv->eeprom array as a __le16 array, with __le16 values. This also means that iwl_read_otp_word() should really have a __le16 pointer as the data argument, since it should be filling that in a format suitable for priv->eeprom. Propagating these changes throughout, iwl_find_otp_image() is found to be, now obviously visible, defective -- it uses the data returned by iwl_read_otp_word() directly as if it was CPU endianness. Fixing that, which is this hunk of the patch: - next_link_addr = link_value * sizeof(u16); + next_link_addr = le16_to_cpu(link_value) * sizeof(u16); is the only real change of this patch. Everything else is just fixing the sparse annotations. Also, the bug only shows up on big endian platforms with a 1000 series card. 5000 and previous series do not use OTP, and 6000 series has shadow RAM support which means we don't ever use the defective code on any cards but 1000. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 0c0cdaff83704490511b462c7ba76d3ff2d0eedb Author: Zhu Yi Date: Mon Dec 14 14:12:12 2009 -0800 iwl3945: fix panic in iwl3945 driver commit dc57a303faab8562b92e85df0d79c4a05d7e2a61 upstream. 3945 updated write_ptr without regard to read_ptr on the Tx path. This messes up our TFD on high load and result in the following: <1>[ 7290.414172] IP: [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <4>[ 7290.414205] PGD 0 <1>[ 7290.414214] Thread overran stack, or stack corrupted <0>[ 7290.414229] Oops: 0002 [#1] PREEMPT SMP <0>[ 7290.414246] last sysfs file: /sys/devices/platform/coretemp.1/temp1_input <4>[ 7290.414265] CPU 0 <4>[ 7290.414274] Modules linked in: af_packet nfsd usb_storage usb_libusual cpufreq_powersave exportfs cpufreq_conservative iwl3945 nfs cpufreq_userspace snd_hda_codec_realtek acpi_cpufreq uvcvideo lockd iwlcore snd_hda_intel joydev coretemp nfs_acl videodev snd_hda_codec mac80211 v4l1_compat snd_hwdep sbp2 v4l2_compat_ioctl32 uhci_hcd psmouse auth_rpcgss ohci1394 cfg80211 ehci_hcd video ieee1394 snd_pcm serio_raw battery ac nvidia(P) usbcore output sunrpc evdev lirc_ene0100 snd_page_alloc rfkill tg3 libphy fuse lzo lzo_decompress lzo_compress <6>[ 7290.414486] Pid: 0, comm: swapper Tainted: P 2.6.32-rc8-wl #213 Aspire 5720 <6>[ 7290.414507] RIP: 0010:[] [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <6>[ 7290.414541] RSP: 0018:ffff880002203d60 EFLAGS: 00010246 <6>[ 7290.414557] RAX: 000000000000004f RBX: ffff880064c11600 RCX: 0000000000000013 <6>[ 7290.414576] RDX: ffffffffa0ddcf20 RSI: ffff8800512b7008 RDI: 0000000000000038 <6>[ 7290.414596] RBP: ffff880002203dd0 R08: 0000000000000000 R09: 0000000000000100 <6>[ 7290.414616] R10: 0000000000000001 R11: 0000000000000000 R12: 00000000000000a0 <6>[ 7290.414635] R13: 0000000000000002 R14: 0000000000000013 R15: 0000000000020201 <6>[ 7290.414655] FS: 0000000000000000(0000) GS:ffff880002200000(0000) knlGS:0000000000000000 <6>[ 7290.414677] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b <6>[ 7290.414693] CR2: 0000000000000041 CR3: 0000000001001000 CR4: 00000000000006f0 <6>[ 7290.414712] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 <6>[ 7290.414732] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 <4>[ 7290.414752] Process swapper (pid: 0, threadinfo ffffffff81524000, task ffffffff81528b60) <0>[ 7290.414772] Stack: <4>[ 7290.414780] ffff880002203da0 0000000000000046 0000000000000000 0000000000000046 <4>[ 7290.414804] <0> 0000000000000282 0000000000000282 0000000000000282 ffff880064c12010 <4>[ 7290.414830] <0> ffff880002203db0 ffff880064c11600 ffff880064c12e50 ffff8800512b7000 <0>[ 7290.414858] Call Trace: <0>[ 7290.414867] <4>[ 7290.414884] [] iwl3945_irq_tasklet+0x657/0x1740 [iwl3945] <4>[ 7290.414910] [] ? _spin_unlock+0x30/0x60 <4>[ 7290.414931] [] tasklet_action+0x101/0x110 <4>[ 7290.414950] [] __do_softirq+0xc0/0x160 <4>[ 7290.414968] [] call_softirq+0x1c/0x30 <4>[ 7290.414986] [] do_softirq+0x75/0xb0 <4>[ 7290.415003] [] irq_exit+0x95/0xa0 <4>[ 7290.415020] [] do_IRQ+0x77/0xf0 <4>[ 7290.415038] [] ret_from_intr+0x0/0xf <0>[ 7290.415052] <4>[ 7290.415067] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415087] [] ? acpi_idle_enter_bm+0x27a/0x2a5 <4>[ 7290.415107] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415130] [] ? cpuidle_idle_call+0x93/0xf0 <4>[ 7290.415149] [] ? cpu_idle+0xa7/0x110 <4>[ 7290.415168] [] ? rest_init+0x75/0x80 <4>[ 7290.415187] [] ? start_kernel+0x3a7/0x3b3 <4>[ 7290.415206] [] ? x86_64_start_reservations+0x125/0x129 <4>[ 7290.415227] [] ? x86_64_start_kernel+0xe4/0xeb <0>[ 7290.415243] Code: 00 41 39 ce 0f 8d e8 01 00 00 48 8b 47 40 48 63 d2 48 69 d2 98 00 00 00 4c 8b 04 02 48 c7 c2 20 cf dd a0 49 8d 78 38 49 8d 40 4f 47 09 00 c6 47 0c 00 c6 47 0f 00 c6 47 12 00 c6 47 15 00 49 <1>[ 7290.415382] RIP [] iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <4>[ 7290.415410] RSP <0>[ 7290.415421] CR2: 0000000000000041 <4>[ 7290.415436] ---[ end trace ec46807277caa515 ]--- <0>[ 7290.415450] Kernel panic - not syncing: Fatal exception in interrupt <4>[ 7290.415468] Pid: 0, comm: swapper Tainted: P D 2.6.32-rc8-wl #213 <4>[ 7290.415486] Call Trace: <4>[ 7290.415495] [] panic+0x7d/0x13a <4>[ 7290.415519] [] oops_end+0xda/0xe0 <4>[ 7290.415538] [] no_context+0xea/0x250 <4>[ 7290.415557] [] ? select_task_rq_fair+0x511/0x780 <4>[ 7290.415578] [] __bad_area_nosemaphore+0x125/0x1e0 <4>[ 7290.415597] [] ? __enqueue_entity+0x7c/0x80 <4>[ 7290.415616] [] ? enqueue_task_fair+0x111/0x150 <4>[ 7290.415636] [] bad_area_nosemaphore+0xe/0x10 <4>[ 7290.415656] [] do_page_fault+0x26a/0x320 <4>[ 7290.415674] [] page_fault+0x1f/0x30 <4>[ 7290.415697] [] ? iwl3945_rx_reply_tx+0xc1/0x450 [iwl3945] <4>[ 7290.415723] [] iwl3945_irq_tasklet+0x657/0x1740 [iwl3945] <4>[ 7290.415746] [] ? _spin_unlock+0x30/0x60 <4>[ 7290.415764] [] tasklet_action+0x101/0x110 <4>[ 7290.415783] [] __do_softirq+0xc0/0x160 <4>[ 7290.415801] [] call_softirq+0x1c/0x30 <4>[ 7290.415818] [] do_softirq+0x75/0xb0 <4>[ 7290.415835] [] irq_exit+0x95/0xa0 <4>[ 7290.415852] [] do_IRQ+0x77/0xf0 <4>[ 7290.415869] [] ret_from_intr+0x0/0xf <4>[ 7290.415883] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415911] [] ? acpi_idle_enter_bm+0x27a/0x2a5 <4>[ 7290.415931] [] ? acpi_idle_enter_bm+0x270/0x2a5 <4>[ 7290.415952] [] ? cpuidle_idle_call+0x93/0xf0 <4>[ 7290.415971] [] ? cpu_idle+0xa7/0x110 <4>[ 7290.415989] [] ? rest_init+0x75/0x80 <4>[ 7290.416007] [] ? start_kernel+0x3a7/0x3b3 <4>[ 7290.416026] [] ? x86_64_start_reservations+0x125/0x129 <4>[ 7290.416047] [] ? x86_64_start_kernel+0xe4/0xeb Reported-by: Maxim Levitsky Tested-by: Maxim Levitsky Signed-off-by: Zhu Yi Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 66c9e44e5740fe9024e3ed02fd66ad6e0e57408f Author: Reinette Chatre Date: Mon Dec 14 14:12:10 2009 -0800 iwl3945: disable power save commit bc45a67079c916a9bd0a95b0b879cc0f259bac6e upstream. we see from http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2125 that power saving does not work well on 3945. Since then power saving has also been connected with association problems where an AP deathenticates a 3945 after it is unable to transmit data to it - this happens when 3945 enters power savings mode. Disable power save support until issues are resolved. Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 87d512cacd0aff44719736ef6d583cafd5c0e1be Author: Vasanthakumar Thiagarajan Date: Fri Nov 13 14:32:40 2009 +0530 ath9k_hw: Fix AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_BB and its shift value in 0x4054 commit c37919bfe0a5c1bee9a31701a31e05a2f8840936 upstream. The bit value of AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_BB is wrong, it should be 0x400 and the number of bits to be right shifted is 10. Having this wrong value in 0x4054 sometimes affects bt quality on btcoex environment. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit a6d8cc616a9058b2e08776f971febf5c84534551 Author: Vasanthakumar Thiagarajan Date: Fri Nov 13 14:32:39 2009 +0530 ath9k_hw: Fix possible OOB array indexing in gen_timer_index[] on 64-bit commit c90017dd43f0cdb42134b9229761e8be02bcd524 upstream. debruijn32 (0x077CB531) is used to index gen_timer_index[] which is an array of 32 u32. Having debruijn32 as unsigned long on a 64-bit platform will result in indexing more than 32 in gen_timer_index[] and there by causing a crash. Make it unsigned to fix this issue. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 12ba7097e0996b27d768504ae4b337ae3e892221 Author: Sujith Date: Wed Dec 23 20:03:27 2009 -0500 ath9k: fix suspend by waking device prior to stop commit 3867cf6a8c699846e928e8f5a9f31013708df192 upstream. Ensure the device is awake prior to trying to tell hardware to stop it. Impact of not doing this is we can likely leave the device in an undefined state likely causing issues with suspend and resume. This patch ensures harware is where it should be prior to suspend. Signed-off-by: Sujith Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit c965e1efdb88a1c42afb119b276d649cddb70387 Author: Luis R. Rodriguez Date: Wed Dec 23 20:03:29 2009 -0500 ath9k: wake hardware during AMPDU TX actions commit 8b685ba9de803f210936400612a32a2003f47cd3 upstream. AMDPDU actions poke hardware for TX operation, as such we want to turn hardware on for these actions. AMDPU RX operations do not require hardware on as nothing is done in hardware for those actions. Without this we cannot guarantee hardware has been programmed correctly for each AMPDU TX action. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 463a7f9b2752b659f93272c0067dcbc10bd73674 Author: Felix Fietkau Date: Thu Dec 24 14:04:32 2009 +0100 ath9k: fix missed error codes in the tx status check commit 5b479a076de091590423a9e6dfc2584126b28761 upstream. My previous change added in: commit 815833e7ecf0b9a017315cae6aef4d7cd9517681 ath9k: fix tx status reporting was not checking all possible tx error conditions. This could possibly lead to throughput issues due to slow rate control adaption or missed retransmissions of failed A-MPDU frames. This patch adds a mask for all possible error conditions and uses it in the xmit ok check. Reported-by: Bj��rn Smedman Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit bef82b626e39357fd28b8303e9f88ea5c5d1b51f Author: Sujith Date: Mon Dec 14 14:57:08 2009 +0530 ath9k: Fix TX queue draining commit e8009e9850d59000d518296af372888911a129bd upstream. When TX DMA termination has failed, the HW has to be reset completely. Doing a fast channel change in this case is insufficient. Also, change the debug level of a couple of messages to FATAL. Signed-off-by: Sujith Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 0ebbdd734f2509bae17f4340fc4fd07c530dbc59 Author: Luis R. Rodriguez Date: Wed Dec 23 20:03:28 2009 -0500 ath9k: wake hardware for interface IBSS/AP/Mesh removal commit 5f70a88f631c3480107853cae12925185eb4c598 upstream. When we remove a IBSS/AP/Mesh interface we stop DMA but to do this we should ensure hardware is on. Awaken the device prior to these calls. This should ensure DMA is stopped upon suspend and plain device removal. Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit d5086b90c5986d33308b1ee99546a86ff1571d07 Author: Bob Copeland Date: Mon Dec 21 22:26:48 2009 -0500 ath5k: fix SWI calibration interrupt storm commit 242ab7ad689accafd5e87ffd22b85cf1bf7fbbef upstream. The calibration period is now invoked by triggering a software interrupt from within the ISR by ath5k_hw_calibration_poll() instead of via a timer. However, the calibration interval isn't initialized before interrupts are enabled, so we can have a situation where an interrupt occurs before the interval is assigned, so the interval is actually negative. As a result, the ISR will arm a software interrupt to schedule the tasklet, and then rearm it when the SWI is processed, and so on, leading to a softlockup at modprobe time. Move the initialization order around so the calibration interval is set before interrupts are active. Another possible fix is to schedule the tasklet directly from the poll routine, but I think there are additional plans for the SWI. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 477702056912abc2120a18e8494fb2204ccdd958 Author: Johannes Berg Date: Wed Dec 23 13:12:05 2009 +0100 cfg80211: fix race between deauth and assoc response commit 3bdb2d48c5f58c781a4099c99044384a23620884 upstream. Joseph Nahmias reported, in http://bugs.debian.org/562016, that he was getting the following warning (with some log around the issue): ath0: direct probe to AP 00:11:95:77:e0:b0 (try 1) ath0: direct probe responded ath0: authenticate with AP 00:11:95:77:e0:b0 (try 1) ath0: authenticated ath0: associate with AP 00:11:95:77:e0:b0 (try 1) ath0: deauthenticating from 00:11:95:77:e0:b0 by local choice (reason=3) ath0: direct probe to AP 00:11:95:77:e0:b0 (try 1) ath0: RX AssocResp from 00:11:95:77:e0:b0 (capab=0x421 status=0 aid=2) ath0: associated ------------[ cut here ]------------ WARNING: at net/wireless/mlme.c:97 cfg80211_send_rx_assoc+0x14d/0x152 [cfg80211]() Hardware name: 7658CTO ... Pid: 761, comm: phy0 Not tainted 2.6.32-trunk-686 #1 Call Trace: [] ? warn_slowpath_common+0x5e/0x8a [] ? warn_slowpath_null+0xa/0xc [] ? cfg80211_send_rx_assoc+0x14d/0x152 ... ath0: link becomes ready ath0: deauthenticating from 00:11:95:77:e0:b0 by local choice (reason=3) ath0: no IPv6 routers present ath0: link is not ready ath0: direct probe to AP 00:11:95:77:e0:b0 (try 1) ath0: direct probe responded ath0: authenticate with AP 00:11:95:77:e0:b0 (try 1) ath0: authenticated ath0: associate with AP 00:11:95:77:e0:b0 (try 1) ath0: RX ReassocResp from 00:11:95:77:e0:b0 (capab=0x421 status=0 aid=2) ath0: associated It is not clear to me how the first "direct probe" here happens, but this seems to be a race condition, if the user requests to deauth after requesting assoc, but before the assoc response is received. In that case, it may happen that mac80211 tries to report the assoc success to cfg80211, but gets blocked on the wdev lock that is held because the user is requesting the deauth. The result is that we run into a warning. This is mostly harmless, but maybe cause an unexpected event to be sent to userspace; we'd send an assoc success event although userspace was no longer expecting that. To fix this, remove the warning and check whether the race happened and in that case abort processing. Reported-by: Joseph Nahmias Cc: 562016-quiet@bugs.debian.org Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 9f7028e71d940aadcdea9f777286b066971ba5da Author: Sujith Date: Mon Nov 2 12:33:23 2009 +0530 mac80211: Fix IBSS merge commit 450aae3d7b60a970f266349a837dfb30a539198b upstream. Currently, in IBSS mode, a single creator would go into a loop trying to merge/scan. This happens because the IBSS timer is rearmed on finishing a scan and the subsequent timer invocation requests another scan immediately. This patch fixes this issue by checking if we have just completed a scan run trying to merge with other IBSS networks. Signed-off-by: Sujith Signed-off-by: John W. Linville Cc: Luis Rodriguez Signed-off-by: Greg Kroah-Hartman commit 0b41c5a957e4fb2be4a8ef960e4e50c8791999f3 Author: Johannes Berg Date: Thu Dec 17 16:16:53 2009 +0100 mac80211: fix WMM AP settings application commit 0183826b58a2712ffe608bc3302447be3e6a3ab8 upstream. My commit 77fdaa12cea26c204cc12c312fe40bc0f3dcdfd8 Author: Johannes Berg Date: Tue Jul 7 03:45:17 2009 +0200 mac80211: rework MLME for multiple authentications inadvertedly broke WMM because it removed, along with a bunch of other now useless initialisations, the line initialising sdata->u.mgd.wmm_last_param_set to -1 which would make it adopt any WMM parameter set. If, as is usually the case, the AP uses WMM parameter set sequence number zero, we'd never update it until the AP changes the sequence number. Add the missing initialisation back to get the WMM settings from the AP applied locally. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 330b9373f9b62fcad200f470be7f64c99322d7ef Author: Luis R. Rodriguez Date: Thu Dec 24 15:38:22 2009 -0500 mac80211: fix propagation of failed hardware reconfigurations commit 24feda0084722189468a65e20019cdd8ef99702b upstream. mac80211 does not propagate failed hardware reconfiguration requests. For suspend and resume this is important due to all the possible issues that can come out of the suspend <-> resume cycle. Not propagating the error means cfg80211 will assume the resume for the device went through fine and mac80211 will continue on trying to poke at the hardware, enable timers, queue work, and so on for a device which is completley unfunctional. The least we can do is to propagate device start issues and warn when this occurs upon resume. A side effect of this patch is we also now propagate the start errors upon harware reconfigurations (non-suspend), but this should also be desirable anyway, there is not point in continuing to reconfigure a device if mac80211 was unable to start the device. For further details refer to the thread: http://marc.info/?t=126151038700001&r=1&w=2 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 38cf2a039fec0233c1ab81b09125e56311574016 Author: Zhu Yi Date: Mon Dec 28 14:23:11 2009 +0800 iwmc3200wifi: fix array out-of-boundary access commit 6c853da3f30c93eae847ecbcd9fdf10ba0da04c2 upstream. Allocate priv->rx_packets[IWM_RX_ID_HASH + 1] because the max array index is IWM_RX_ID_HASH according to IWM_RX_ID_GET_HASH(). Signed-off-by: Zhu Yi Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 08a93783c334ec4b42532b0dad62dc480a6ec823 Author: Daniel Mack Date: Wed Dec 16 05:12:58 2009 +0100 Libertas: fix buffer overflow in lbs_get_essid() commit 45b241689179a6065384260242637cf21dabfb2d upstream. The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions. Fix this by removing the extra write. Signed-off-by: Daniel Mack Cc: Stephen Hemminger Cc: Maithili Hinge Cc: Kiran Divekar Cc: Michael Hirsch Cc: netdev@vger.kernel.org Cc: libertas-dev@lists.infradead.org Cc: linux-wireless@lists.infradead.org Acked-by: Holger Schurig Acked-by: Dan Williams Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 3b96f9a68db8401e73955a6f6c33ec08ffed9e96 Author: Marcelo Tosatti Date: Mon Dec 14 17:37:35 2009 -0200 KVM: LAPIC: make sure IRR bitmap is scanned after vm load commit 6e24a6eff4571002cd48b99a2b92dc829ce39cb9 upstream. The vcpus are initialized with irr_pending set to false, but loading the LAPIC registers with pending IRR fails to reset the irr_pending variable. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit 3a9f99234194d5f6c987098c288f29f200dabf5e Author: Marcelo Tosatti Date: Sat Dec 5 12:34:11 2009 -0200 KVM: MMU: remove prefault from invlpg handler commit fb341f572d26e0786167cd96b90cc4febed830cf upstream. The invlpg prefault optimization breaks Windows 2008 R2 occasionally. The visible effect is that the invlpg handler instantiates a pte which is, microseconds later, written with a different gfn by another vcpu. The OS could have other mechanisms to prevent a present translation from being used, which the hypervisor is unaware of. While the documentation states that the cpu is at liberty to prefetch tlb entries, it looks like this is not heeded, so remove tlb prefetch from invlpg. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit 8b9f03819c4165799c463b14a30b23f228d13cdb Author: Dan Williams Date: Sat Dec 19 15:36:02 2009 -0700 ioat2,3: put channel hardware in known state at init commit a6d52d70677e99bdb89b6921c265d0a58c22e597 upstream. Put the ioat2 and ioat3 state machines in the halted state with all errors cleared. The ioat1 init path is not disturbed for stability, there are no reported ioat1 initiaization issues. Reported-by: Roland Dreier Tested-by: Roland Dreier Acked-by: Simon Horman Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit e05a6f0307a79b77319eed3c892a9c09613f1a28 Author: Dan Williams Date: Thu Dec 17 13:52:39 2009 -0700 ioat3: fix p-disabled q-continuation commit cd78809f6191485a90ea6c92c2b58900ab5c156f upstream. When continuing a pq calculation the driver needs 3 extra sources. The driver can perform a 3 source calculation with a single descriptor, but needs an extended descriptor to process up to 8 sources in one operation. However, in the p-disabled case only one extra source is needed. When continuing a p-disabled operation there are occasions (i.e. 0 < src_cnt % 8 < 3) where the tail operation does not need an extended descriptor. Properly account for this fact otherwise invalid 'dmacount' values will be written to hardware usually causing the channel to halt with 'invalid descriptor' errors. Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit e93166f10c741f247c7e172936811bad558b4135 Author: Joerg Roedel Date: Mon Dec 21 15:51:23 2009 +0100 x86/amd-iommu: Fix initialization failure panic commit 0f764806438d5576ac58898332e5dcf30bb8a679 upstream. The assumption that acpi_table_parse passes the return value of the hanlder function to the caller proved wrong recently. The return value of the handler function is totally ignored. This makes the initialization code for AMD IOMMU buggy in a way that could cause a kernel panic on initialization. This patch fixes the issue in the AMD IOMMU driver. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit cd7bc18e0908a287e64cf4593a480b613b07fdce Author: Jeff Layton Date: Thu Dec 3 08:09:41 2009 -0500 cifs: NULL out tcon, pSesInfo, and srvTcp pointers when chasing DFS referrals commit a2934c7b363ddcc001964f2444649f909e583bef upstream. The scenario is this: The kernel gets EREMOTE and starts chasing a DFS referral at mount time. The tcon reference is put, which puts the session reference too, but neither pointer is zeroed out. The mount gets retried (goto try_mount_again) with new mount info. Session setup fails fails and rc ends up being non-zero. The code then falls through to the end and tries to put the previously freed tcon pointer again. Oops at: cifs_put_smb_ses+0x14/0xd0 Fix this by moving the initialization of the rc variable and the tcon, pSesInfo and srvTcp pointers below the try_mount_again label. Also, add a FreeXid() before the goto to prevent xid "leaks". Signed-off-by: Jeff Layton Reported-by: Gustavo Carvalho Homem Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman commit 6cb5fcc95450e4a8e7423128dec3d43caac8f42b Author: Ingo Molnar Date: Thu Dec 31 15:16:23 2009 +0100 dma-debug: Fix bug causing build warning commit a8fe9ea200ea21421ea750423d1d4d4f7ce037cf upstream. Stephen Rothwell reported the following build warning: lib/dma-debug.c: In function 'dma_debug_device_change': lib/dma-debug.c:680: warning: 'return' with no value, in function returning non-void Introduced by commit f797d9881b62c2ddb1d2e7bd80d87141949c84aa ("dma-debug: Do not add notifier when dma debugging is disabled"). Return 0 [notify-done] when disabled. (this is standard bus notifier behavior.) Signed-off-by: Shaun Ruffell Signed-off-by: Joerg Roedel Cc: Linus Torvalds LKML-Reference: <20091231125624.GA14666@liondog.tnic> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 120dbaa5f31dfea13be03da90d90dc2cfed77841 Author: Shaun Ruffell Date: Thu Dec 17 18:00:36 2009 -0600 dma-debug: Do not add notifier when dma debugging is disabled. commit f797d9881b62c2ddb1d2e7bd80d87141949c84aa upstream. If CONFIG_HAVE_DMA_API_DEBUG is defined and "dma_debug=off" is specified on the kernel command line, when you detach a driver from a device you can cause the following NULL pointer dereference: BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] dma_debug_device_change+0x5d/0x117 The problem is that the dma_debug_device_change notifier function is added to the bus notifier chain even though the dma_entry_hash array was never initialized. If dma debugging is disabled, this patch both prevents dma_debug_device_change notifiers from being added to the chain, and additionally ensures that the dma_debug_device_change notifier function is a no-op. Signed-off-by: Shaun Ruffell Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit c4ddbba638a74b9110801026517e892e5a8db6ad Author: Nicolas Ferre Date: Wed Dec 16 16:28:03 2009 +0100 dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh' commit 4297a462f455e38f08976df7b16c849614a287da upstream. Correct a typo error in locking calls. Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman commit ed8f6eb171b6965d5372f008c3b2267f1da57a92 Author: NeilBrown Date: Wed Dec 30 12:08:49 2009 +1100 md: Fix unfortunate interaction with evms commit cbd1998377504df005302ac90d49db72a48552a6 upstream. evms configures md arrays by: open device send ioctl close device for each different ioctl needed. Since 2.6.29, the device can disappear after the 'close' unless a significant configuration has happened to the device. The change made by "SET_ARRAY_INFO" can too minor to stop the device from disappearing, but important enough that losing the change is bad. So: make sure SET_ARRAY_INFO sets mddev->ctime, and keep the device active as long as ctime is non-zero (it gets zeroed with lots of other things when the array is stopped). This is suitable for -stable kernels since 2.6.29. Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman commit acb8be461bc008fea70999310812a4f4638d9596 Author: Mike Travis Date: Mon Dec 28 13:28:25 2009 -0800 x86: SGI UV: Fix writes to led registers on remote uv hubs commit 39d30770992895d55789de64bad2349510af68d0 upstream. The wrong address was being used to write the SCIR led regs on remote hubs. Also, there was an inconsistency between how BIOS and the kernel indexed these regs. Standardize on using the lower 6 bits of the APIC ID as the index. This patch fixes the problem of writing to an errant address to a cpu # >= 64. Signed-off-by: Mike Travis Reviewed-by: Jack Steiner Cc: Robin Holt Cc: Linus Torvalds LKML-Reference: <4B3922F9.3060905@sgi.com> [ v2: fix a number of annoying checkpatch artifacts and whitespace noise ] Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 4ba51fe7d303115c0eef7cfe4a326fdff536302f Author: Julia Lawall Date: Sun Dec 13 05:47:04 2009 +0000 drivers/net/usb: Correct code taking the size of a pointer commit 6057912d7baad31be9819518674ffad349a065b1 upstream. sizeof(dev->dev_addr) is the size of a pointer. A few lines above, the size of this field is obtained using netdev->addr_len for a call to memcpy, so do the same here. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression *x; expression f; type T; @@ *f(...,(T)x,...) // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 526fed8b3c60bd7746de0df7676c83800c36b906 Author: Alan Stern Date: Tue Dec 8 15:54:44 2009 -0500 USB: fix bugs in usb_(de)authorize_device commit da307123c621b01cce147a4be313d8a754674f63 upstream. This patch (as1315) fixes some bugs in the USB core authorization code: usb_deauthorize_device() should deallocate the device strings instead of leaking them, and it should invoke usb_destroy_configuration() (which does proper reference counting) instead of freeing the config information directly. usb_authorize_device() shouldn't change the device strings until it knows that the authorization will succeed, and it should autosuspend the device at the end (having autoresumed the device at the start). Because the device strings can be changed, the sysfs routines to display the strings must protect the string pointers by locking the device. Signed-off-by: Alan Stern CC: Inaky Perez-Gonzalez Acked-by: David Vrabel Signed-off-by: Greg Kroah-Hartman commit c6d7a67b493a4bc990a2c8155787ff70903a2335 Author: Alan Stern Date: Tue Dec 8 15:50:41 2009 -0500 USB: rename usb_configure_device commit 8d8558d10806b7e805cb80df867ebb0a453d4765 upstream. This patch (as1314) renames usb_configure_device() and usb_configure_device_otg() in the hub driver. Neither name is appropriate because these routines enumerate devices, they don't configure them. That's handled by usb_choose_configuration() and usb_set_configuration(). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f661c3feba2d9455614d64ba0f73f182a1b39456 Author: Oliver Neukum Date: Wed Dec 16 19:23:43 2009 +0100 Bluetooth: Prevent ill-timed autosuspend in USB driver commit 652fd781a52ad6e24b908cd8b83d12699754f253 upstream. The device must be marked busy as it receives data. Signed-off-by: Oliver Neukum Tested-by: Matthew Garrett Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman commit b71bfa6a117e070139ce2cf23175378f276b9dd8 Author: Sergei Shtylyov Date: Tue Dec 15 13:30:01 2009 +0200 USB: musb: gadget_ep0: avoid SetupEnd interrupt commit 17be5c5f5ef99c94374e07f71effa78e93a20eda upstream. Gadget stalling a zero-length SETUP request results in this error message: SetupEnd came in a wrong ep0stage idle In order to avoid it, always set the CSR0.DataEnd bit after detecting a zero- length request. Add the missing '\n' to the error message itself as well... Signed-off-by: Sergei Shtylyov Acked-by: Anand Gadiyar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 3635acd7f7f86d7319c15f3de8be7579b41defc2 Author: pancho horrillo Date: Wed Dec 23 11:09:13 2009 +0100 USB: Fix a bug on appledisplay.c regarding signedness commit 37e9066b2f85480d99d3795373f5ef0b00ac1189 upstream. brightness status is reported by the Apple Cinema Displays as an 'unsigned char' (u8) value, but the code used 'char' instead. Note that he driver was developed on the PowerPC architecture, where the two types are synonymous, which is not always the case. Fixed that. Otherwise the driver will interpret brightness levels > 127 as negative, and fail to load. Signed-off-by: pancho horrillo Signed-off-by: Greg Kroah-Hartman commit 5a82dd5dcafaf91f894f68cbb16359a1338900f5 Author: Donny Kurnia Date: Wed Dec 23 19:03:12 2009 +0700 USB: option: support hi speed for modem Haier CE100 commit c983202bd03eb82394ef1dce5906702fcbc7bb80 upstream. I made this patch for usbserial driver to add the support for EVDO modem Haier CE100. The bugs report for this is here: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/490068 This patch based on these post: http://blankblondtank.wordpress.com/2009/09/04/mengoptimalkan-koneksi-modem-haier-ce-100-cdma-di-linux/ http://tantos.web.id/blogs/how-to-internet-connection-using-cdma-evdo-modem-and-karmic-koala-ubuntu-9-10 I hope this patch can help other that have the Haier C100 modem, mostly in my country, Indonesia. Signed-off-by: Donny Kurnia Signed-off-by: Greg Kroah-Hartman commit 702a0a0aed69a97f7001c67a652f49934ac7de0d Author: Clemens Ladisch Date: Mon Dec 21 15:36:44 2009 -0800 USB: emi62: fix crash when trying to load EMI 6|2 firmware commit ac06c06770bb8761b1f1f9bdf2f5420fa6d3e9fa upstream. While converting emi62 to use request_firmware(), the driver was also changed to use the ihex helper functions. However, this broke the loading of the FPGA firmware because the code tries to access the addr field of the EOF record which works with a plain array that has an empty last record but not with the ihex helper functions where the end of the data is signaled with a NULL record pointer, resulting in: BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] emi62_load_firmware+0x33c/0x740 [emi62] This can be fixed by changing the loop condition to test the return value of ihex_next_binrec() directly (like in emi26.c). Signed-off-by: Clemens Ladisch Reported-and-tested-by: Der Mickster Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 2d67231fb86da345be96ba212dfeb4d8c912520b Author: Dave Airlie Date: Sun Dec 20 16:08:40 2009 +1000 drm/radeon: fix build on 64-bit with some compilers. commit 794f3141a194a4f4c28c1d417b071a901f78d9bb upstream. drivers/gpu/drm/radeon/radeon_test.c:45: undefined reference to `__udivdi3' Reported-by: Mr. James W. Laferriere Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 474ae5e72b8acc3c79354f0b14e77fb9e09108ff Author: Eric Millbrandt Date: Tue Dec 22 10:13:24 2009 -0500 ASoC: Do not write to invalid registers on the wm9712. commit 48e3cbb3f67a27d9c2db075f3d0f700246c40caa upstream. This patch fixes a bug where "virtual" registers were being written to the ac97 bus. This was causing unrelated registers to become corrupted (headphone 0x04, touchscreen 0x78, etc). This patch duplicates protection that was included in the wm9713 driver. Signed-off-by: Eric Millbrandt Acked-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit d75621cbb1dfadcd6801b39c03867bab60d94dd7 Author: Neil Campbell Date: Mon Dec 14 04:08:57 2009 +0000 powerpc: Handle VSX alignment faults correctly in little-endian mode commit bb7f20b1c639606def3b91f4e4aca6daeee5d80a upstream. This patch fixes the handling of VSX alignment faults in little-endian mode (the current code assumes the processor is in big-endian mode). The patch also makes the handlers clear the top 8 bytes of the register when handling an 8 byte VSX load. This is based on 2.6.32. Signed-off-by: Neil Campbell Acked-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 8aafd7d4acb527c3dfd95d24af190528cc58326b Author: Zhao Yakui Date: Tue Dec 15 22:01:57 2009 +0800 ACPI: Use the return result of ACPI lid notifier chain correctly commit 13c199c0d0cf78b27592991129fb8cbcfc5164de upstream. On some laptops it will return NOTIFY_OK(non-zero) when calling the ACPI LID notifier. Then it is used as the result of ACPI LID resume function, which will complain the following warning message in course of suspend/resume: >PM: Device PNP0C0D:00 failed to resume: error 1 This patch is to eliminate the above warning message. http://bugzilla.kernel.org/show_bug.cgi?id=14782 Signed-off-by: Zhao Yakui Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 3872bf59ad0d88c81d7fb70ac86a5fc2f8aa6d34 Author: Alexey Starikovskiy Date: Tue Dec 22 02:42:52 2009 -0500 ACPI: EC: Fix MSI DMI detection commit 55b313f249e11b815fd0be51869f166aaf368f44 upstream. MSI strings should be ORed, not ANDed. Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14446 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 5ab8996c82fdb3fa04ca1d72b1fb388ce9c42378 Author: Stefan Bader Date: Mon Dec 21 16:20:04 2009 -0800 acerhdf: limit modalias matching to supported commit bdc731bc5fcd1794e9ac8ac80c389d302381c123 upstream. BugLink: https://bugs.launchpad.net/ubuntu/+bug/435958 The module alias currently matches any Acer computer but when loaded the BIOS checks will only succeed on Aspire One models. This causes a invalid BIOS warning for all other models (seen on Aspire 4810T). This is not fatal but worries users that see this message. Limiting the moule alias to models starting with AOA or DOA for Packard Bell. Signed-off-by: Stefan Bader Acked-by: Borislav Petkov Acked-by: Peter Feuerer Signed-off-by: Andrew Morton Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 296e9be6e548bc7ede4c6b04b1adfa1d15b8ee12 Author: Takashi Iwai Date: Thu Dec 17 15:00:26 2009 +0100 ALSA: hda - Fix missing capsrc_nids for ALC88x commit 035eb0cff0671ada49ba9f3e5c9e7b0cb950efea upstream. Some model quirks missed the corresponding capsrc_nids. This resulted in non-working capture source selection. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit aec8dc2b5d45b5b4058cfa71d3ca148fdf6c3199 Author: Clemens Ladisch Date: Fri Dec 18 09:27:24 2009 +0100 sound: sgio2audio/pdaudiocf/usb-audio: initialize PCM buffer commit 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe upstream. When allocating the PCM buffer, use vmalloc_user() instead of vmalloc(). Otherwise, it would be possible for applications to play the previous contents of the kernel memory to the speakers, or to read it directly if the buffer is exported to userspace. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit e255d3c8a816bfc9e365a39b8b00c4cd79671ee1 Author: Guennadi Liakhovetski Date: Thu Dec 17 14:51:35 2009 +0100 ASoC: wm8974: fix a wrong bit definition commit 48c03ce72f2665f79a3fe54fc6d71b8cc3d30803 upstream. The wm8974 datasheet defines BUFIOEN as bit 2. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit 1ee0552bc1fa0fe88b39743920bdd5f8715a3e47 Author: Bartlomiej Zolnierkiewicz Date: Sun Dec 20 19:22:33 2009 +0100 pata_cmd64x: fix overclocking of UDMA0-2 modes commit 509426bd46ad0903dca409803e0ee3d30f99f1e8 upstream. adev->dma_mode stores the transfer mode value not UDMA mode number so the condition in cmd64x_set_dmamode() is always true and the higher UDMA clock is always selected. This can potentially result in data corruption when UDMA33 device is used, when 40-wire cable is used or when the error recovery code decides to lower the device speed down. The issue was introduced in the commit 6a40da0 ("libata cmd64x: whack into a shape that looks like the documentation") which goes back to kernel 2.6.20. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit f31733a7aa32257dac6390f080814a7f76b419bf Author: Sergei Shtylyov Date: Thu Dec 17 01:11:27 2009 -0500 pata_hpt3x2n: fix clock turnaround commit 256ace9bbd4cdb6d48d5f55d55d42fa20527fad1 upstream. The clock turnaround code still doesn't work for several reasons: - 'USE_DPLL' flag in 'ap->host->private_data' is never initialized or updated, so the driver can only set the chip to the DPLL clock mode, not the PCI mode; - the driver doesn't serialize access to the channels depending on the current clock mode like the vendor drivers, so the clock turnaround is only executed "optionally", not always as it should be; - the wrong ports are written to when hpt3x2n_set_clock() is called for the secondary channel; - hpt3x2n_set_clock() can inadvertently enable the disabled channels when resetting the channel state machines. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit fa3f5a5c1c8e6a2cbc7e21755ea7c215f8cf0577 Author: Thomas Gleixner Date: Thu Dec 10 15:35:10 2009 +0100 clockevents: Prevent clockevent_devices list corruption on cpu hotplug commit bb6eddf7676e1c1f3e637aa93c5224488d99036f upstream. Xiaotian Feng triggered a list corruption in the clock events list on CPU hotplug and debugged the root cause. If a CPU registers more than one per cpu clock event device, then only the active clock event device is removed on CPU_DEAD. The unused devices are kept in the clock events device list. On CPU up the clock event devices are registered again, which means that we list_add an already enqueued list_head. That results in list corruption. Resolve this by removing all devices which are associated to the dead CPU on CPU_DEAD. Reported-by: Xiaotian Feng Signed-off-by: Thomas Gleixner Tested-by: Xiaotian Feng Signed-off-by: Greg Kroah-Hartman commit 8e04c81a2240ac2fc5d9efe804388526331ccac7 Author: Peter Zijlstra Date: Wed Dec 16 18:04:34 2009 +0100 sched: Select_task_rq_fair() must honour SD_LOAD_BALANCE commit e4f4288842ee12747e10c354d72be7d424c0b627 upstream. We should skip !SD_LOAD_BALANCE domains. Signed-off-by: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20091216170517.653578430@chello.nl> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit c9ac6a9e841f2c82cb2a1f3adeb00858acc1c5c7 Author: Suresh Siddha Date: Wed Dec 16 16:25:42 2009 -0800 x86, cpuid: Add "volatile" to asm in native_cpuid() commit 45a94d7cd45ed991914011919e7d40eb6d2546d1 upstream. xsave_cntxt_init() does something like: cpuid(0xd, ..); // find out what features FP/SSE/.. etc are supported xsetbv(); // enable the features known to OS cpuid(0xd, ..); // find out the size of the context for features enabled Depending on what features get enabled in xsetbv(), value of the cpuid.eax=0xd.ecx=0.ebx changes correspondingly (representing the size of the context that is enabled). As we don't have volatile keyword for native_cpuid(), gcc 4.1.2 optimizes away the second cpuid and the kernel continues to use the cpuid information obtained before xsetbv(), ultimately leading to kernel crash on processors supporting more state than the legacy FP/SSE. Add "volatile" for native_cpuid(). Signed-off-by: Suresh Siddha LKML-Reference: <1261009542.2745.55.camel@sbs-t61.sc.intel.com> Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 14ae08205860c0a902639ed2c0a601eef9c6d171 Author: Peter Zijlstra Date: Wed Dec 16 18:04:33 2009 +0100 sched: Fix task_hot() test order commit e6c8fba7771563b2f3dfb96a78f36ec17e15bdf0 upstream. Make sure not to access sched_fair fields before verifying it is indeed a sched_fair task. Signed-off-by: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20091216170517.577998058@chello.nl> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit fdf26751111406e31e5fcb3eb8b06f299ce3a06b Author: Mike Christie Date: Tue Nov 17 21:25:16 2009 -0600 SCSI: fc class: fix fc_transport_init error handling commit 48de68a40aef032a2e198437f4781a83bfb938db upstream. If transport_class_register fails we should unregister any registered classes, or we will leak memory or other resources. I did a quick modprobe of scsi_transport_fc to test the patch. Signed-off-by: Mike Christie Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 1ab0714daac27c962256b969823e3d82c67e4b52 Author: FUJITA Tomonori Date: Thu Nov 26 09:24:13 2009 +0900 SCSI: st: fix mdata->page_order handling commit c982c368bb90adbd312faa05d0cfd842e9ab45a7 upstream. dio transfer always resets mdata->page_order to zero. It breaks high-order pages previously allocated for non-dio transfer. This patches adds reserved_page_order to st_buffer structure to save page order for non-dio transfer. http://bugzilla.kernel.org/show_bug.cgi?id=14563 When enlarge_buffer() allocates 524288 from 0, st uses six-order page allocation. So mdata->page_order is 6 and frp_seg is 2. After that, if st uses dio, sgl_map_user_pages() sets mdata->page_order to 0 for st_do_scsi(). After that, when we call normalize_buffer(), it frees only free frp_seg * PAGE_SIZE (2 * 4096) though we should free frp_seg * PAGE_SIZE << 6 (2 * 4096 << 6). So we see buffer_size is set to 516096 (524288 - 8192). Reported-by: Joachim Breuer Tested-by: Joachim Breuer Acked-by: Kai Makisara Signed-off-by: FUJITA Tomonori Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 9f63d27c1b21cb24b7c2e9f79196a4f72f7b193e Author: Michael Reed Date: Wed Dec 2 09:11:16 2009 -0600 SCSI: qla2xxx: dpc thread can execute before scsi host has been added commit 1486400f7edd009d49550da968d5744e246dc7f8 upstream. Fix crash in qla2x00_fdmi_register() due to the dpc thread executing before the scsi host has been fully added. Unable to handle kernel NULL pointer dereference (address 00000000000001d0) qla2xxx_7_dpc[4140]: Oops 8813272891392 [1] Call Trace: [] show_stack+0x50/0xa0 sp=e00000b07c59f930 bsp=e00000b07c591400 [] show_regs+0x820/0x860 sp=e00000b07c59fb00 bsp=e00000b07c5913a0 [] die+0x1a0/0x2e0 sp=e00000b07c59fb00 bsp=e00000b07c591360 [] ia64_do_page_fault+0x8c0/0x9e0 sp=e00000b07c59fb00 bsp=e00000b07c591310 [] ia64_native_leave_kernel+0x0/0x270 sp=e00000b07c59fb90 bsp=e00000b07c591310 [] qla2x00_fdmi_register+0x850/0xbe0 [qla2xxx] sp=e00000b07c59fd60 bsp=e00000b07c591290 [] qla2x00_configure_loop+0x1930/0x34c0 [qla2xxx] sp=e00000b07c59fd60 bsp=e00000b07c591128 [] qla2x00_loop_resync+0x1b0/0x2e0 [qla2xxx] sp=e00000b07c59fdf0 bsp=e00000b07c5910c0 [] qla2x00_do_dpc+0x9a0/0xce0 [qla2xxx] sp=e00000b07c59fdf0 bsp=e00000b07c590fa0 [] kthread+0x110/0x140 sp=e00000b07c59fe00 bsp=e00000b07c590f68 [] kernel_thread_helper+0xd0/0x100 sp=e00000b07c59fe30 bsp=e00000b07c590f40 [] start_kernel_thread+0x20/0x40 sp=e00000b07c59fe30 bsp=e00000b07c590f40 crash> dis a000000207197350 0xa000000207197350 : [MMI] ld1 r45=[r14];; crash> scsi_qla_host.host 0xe00000b058c73ff8 host = 0xe00000b058c73be0, crash> Scsi_Host.shost_data 0xe00000b058c73be0 shost_data = 0x0, <<<<<<<<<<< The fc_transport fc_* workqueue threads have yet to be created. crash> ps | grep _7 3891 2 2 e00000b075c80000 IN 0.0 0 0 [scsi_eh_7] 4140 2 3 e00000b07c590000 RU 0.0 0 0 [qla2xxx_7_dpc] The thread creating adding the Scsi_Host is blocked due to other activity in sysfs. crash> bt 3762 PID: 3762 TASK: e00000b071e70000 CPU: 3 COMMAND: "modprobe" #0 [BSP:e00000b071e71548] schedule at a000000100727e00 #1 [BSP:e00000b071e714c8] __mutex_lock_slowpath at a0000001007295a0 #2 [BSP:e00000b071e714a8] mutex_lock at a000000100729830 #3 [BSP:e00000b071e71478] sysfs_addrm_start at a0000001002584f0 #4 [BSP:e00000b071e71440] create_dir at a000000100259350 #5 [BSP:e00000b071e71410] sysfs_create_subdir at a000000100259510 #6 [BSP:e00000b071e713b0] internal_create_group at a00000010025c880 #7 [BSP:e00000b071e71388] sysfs_create_group at a00000010025cc50 #8 [BSP:e00000b071e71368] dpm_sysfs_add at a000000100425050 #9 [BSP:e00000b071e71310] device_add at a000000100417d90 #10 [BSP:e00000b071e712d8] scsi_add_host at a00000010045a380 #11 [BSP:e00000b071e71268] qla2x00_probe_one at a0000002071be950 #12 [BSP:e00000b071e71248] local_pci_probe at a00000010032e490 #13 [BSP:e00000b071e71218] pci_device_probe at a00000010032ecd0 #14 [BSP:e00000b071e711d8] driver_probe_device at a00000010041d480 #15 [BSP:e00000b071e711a8] __driver_attach at a00000010041d6e0 #16 [BSP:e00000b071e71170] bus_for_each_dev at a00000010041c240 #17 [BSP:e00000b071e71150] driver_attach at a00000010041d0a0 #18 [BSP:e00000b071e71108] bus_add_driver at a00000010041b080 #19 [BSP:e00000b071e710c0] driver_register at a00000010041dea0 #20 [BSP:e00000b071e71088] __pci_register_driver at a00000010032f610 #21 [BSP:e00000b071e71058] (unknown) at a000000207200270 #22 [BSP:e00000b071e71018] do_one_initcall at a00000010000a9c0 #23 [BSP:e00000b071e70f98] sys_init_module at a0000001000fef00 #24 [BSP:e00000b071e70f98] ia64_ret_from_syscall at a00000010000c740 So, it appears that qla2xxx dpc thread is moving forward before the scsi host has been completely added. This patch moves the setting of the init_done (and online) flag to after the call to scsi_add_host() to hold off the dpc thread. Found via large lun count testing using 2.6.31. Signed-off-by: Michael Reed Acked-by: Giridhar Malavali Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit c1d17da3cf8a961254fd18f4ddc8bbb743a33ab7 Author: Kleber Sacilotto de Souza Date: Wed Nov 25 20:13:43 2009 -0200 SCSI: ipr: fix EEH recovery commit 99c965dd9ee1a004efc083c3d760ba982bb76adf upstream. After commits c82f63e411f1b58427c103bd95af2863b1c96dd1 (PCI: check saved state before restore) and 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff (PCI: Clear saved_state after the state has been restored) PCI drivers are prevented from restoring the device standard configuration registers twice in a row. These changes introduced a regression on ipr EEH recovery. The ipr device driver saves the PCI state only during the device probe and restores it on ipr_reset_restore_cfg_space() during IOA resets. This behavior is causing the EEH recovery to fail after the second error detected, since the registers are not being restored. One possible solution would be saving the registers after restoring them. The problem with this approach is that while recovering from an EEH error if pci_save_state() results in an EEH error, the adapter/slot will be reset, and end up back in ipr_reset_restore_cfg_space(), but it won't have a valid saved state to restore, so pci_restore_state() will fail. The following patch introduces a workaround for this problem, hacking around the PCI API by setting pdev->state_saved = true before we do the restore. It fixes the EEH regression and prevents that we hit another EEH error during EEH recovery. [jejb: fix is a hack ... Jesse and Rafael will fix properly] Signed-off-by: Kleber Sacilotto de Souza Acked-by: Brian King Cc: Jesse Barnes Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit a1092bf3809c7ec7b730d0cca3bdba964a813147 Author: Greg Kroah-Hartman Date: Fri Dec 18 14:27:07 2009 -0800 Linux 2.6.32.2 commit 80c0299b8cfdf7aa31b88118b75de6b7bb1aba63 Author: Luck, Tony Date: Mon Dec 14 20:00:36 2009 +0000 implement early_io{re,un}map for ia64 commit cd7bcf32d42b15891620b3f1387a00178b54291a upstream. Needed for commit 2c992208 ("intel-iommu: Detect DMAR in hyperspace at probe time.) to build on IA64. Signed-off-by: Tony Luck Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 517361c51d4a762531e669ebb2c081a1e678455a Author: Paul Mackerras Date: Tue Dec 15 19:40:32 2009 +1100 perf_event: Fix incorrect range check on cpu number commit 0f624e7e5625f4c30c836b7a5decfe2553582391 upstream. It is quite legitimate for CPUs to be numbered sparsely, meaning that it possible for an online CPU to have a number which is greater than the total count of possible CPUs. Currently find_get_context() has a sanity check on the cpu number where it checks it against num_possible_cpus(). This test can fail for a legitimate cpu number if the cpu_possible_mask is sparsely populated. This fixes the problem by checking the CPU number against nr_cpumask_bits instead, since that is the appropriate check to ensure that the cpu number is same to pass to cpu_isset() subsequently. Reported-by: Michael Neuling Signed-off-by: Paul Mackerras Tested-by: Michael Neuling Acked-by: Peter Zijlstra LKML-Reference: <20091215084032.GA18661@brick.ozlabs.ibm.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 60a48f8c19f1de13a99ad6d1972bbde8d193f3bd Author: Jan Engelhardt Date: Mon Dec 14 14:52:10 2009 +0100 netfilter: xtables: document minimal required version commit 7a92263705435d046d37a0990d0edfcb517f7ad3 upstream. For both .33 and .32-stable. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit acb724d43ade7509f3dcec679243f88e2902c237 Author: Chris Wright Date: Wed Dec 2 12:06:34 2009 -0800 intel-iommu: ignore page table validation in pass through mode commit 1672af1164d3d50ba8908014fd34cc0b58afdc1e upstream. We are seeing a bug when booting w/ iommu=pt with current upstream (bisect blames 19943b0e30b05d42e494ae6fef78156ebc8c637e "intel-iommu: Unify hardware and software passthrough support). The issue is specific to this loop during identity map initialization of each device: domain_context_mapping_one(si_domain, ..., CONTEXT_TT_PASS_THROUGH) ... /* Skip top levels of page tables for * iommu which has less agaw than default. */ for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { pgd = phys_to_virt(dma_pte_addr(pgd)); if (!dma_pte_present(pgd)) { <------ failing here spin_unlock_irqrestore(&iommu->lock, flags); return -ENOMEM; } This box has 2 iommu's in it. The catchall iommu has MGAW == 48, and SAGAW == 4. The other iommu has MGAW == 39, SAGAW == 2. The device that's failing the above pgd test is the only device connected to the non-catchall iommu, which has a smaller address width than the domain default. This test is not necessary since the context is in PT mode and the ASR is ignored. Thanks to Don Dutile for discovering and debugging this one. Signed-off-by: Chris Wright Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 020d1eecf345422d34bec8fb4a45299dcc0dcc3f Author: David Woodhouse Date: Wed Dec 2 10:18:30 2009 +0000 intel-iommu: Fix oops with intel_iommu=igfx_off commit 44cd613c0e4cd93079ea2a93aa06649d8ca0830a upstream. The hotplug notifier will call find_domain() to see if the device in question has been assigned an IOMMU domain. However, this should never be called for devices with a "dummy" domain, such as graphics devices when intel_iommu=igfx_off is set and the corresponding IOMMU isn't even initialised. If you do that, it'll oops as it dereferences the (-1) pointer. The notifier function should check iommu_no_mapping() for the device before doing anything else. Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 39035f9c09699eea2dd154d170919dcd41c6885d Author: David Woodhouse Date: Wed Dec 2 09:21:55 2009 +0000 intel-iommu: Check for an RMRR which ends before it starts. commit 5595b528b49a702c0428c0762bab60999648254c upstream. Some HP BIOSes report an RMRR region (a region which needs a 1:1 mapping in the IOMMU for a given device) which has an end address lower than its start address. Detect that and warn, rather than triggering the BUG() in dma_pte_clear_range(). Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit b02375be25be8895f1fdb63a0962fd465d88f998 Author: David Woodhouse Date: Wed Dec 2 09:20:27 2009 +0000 intel-iommu: Apply BIOS sanity checks for interrupt remapping too. commit 6ecbf01c7ce4c0f4c3bdfa0e64ac6258328fda6c upstream. The BIOS errors where an IOMMU is reported either at zero or a bogus address are causing problems even when the IOMMU is disabled -- because interrupt remapping uses the same hardware. Ensure that the checks get applied for the interrupt remapping initialisation too. Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 518cdfa0f604c285cdb71e1f2e2e14773f80bb01 Author: Chris Wright Date: Wed Dec 2 09:17:13 2009 +0000 intel-iommu: Detect DMAR in hyperspace at probe time. commit 2c99220810c1c79322034628b993573b088ff2da upstream. Many BIOSes will lie to us about the existence of an IOMMU, and claim that there is one at an address which actually returns all 0xFF. We need to detect this early, so that we know we don't have a viable IOMMU and can set up swiotlb before it's too late. Signed-off-by: Chris Wright Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 3a03456dc34ff703e5b7c718b78713577f832116 Author: David Woodhouse Date: Wed Dec 16 03:27:20 2009 +0000 jffs2: Fix long-standing bug with symlink garbage collection. commit 2e16cfca6e17ae37ae21feca080a6f2eca9087dc upstream. Ever since jffs2_garbage_collect_metadata() was first half-written in February 2001, it's been broken on architectures where 'char' is signed. When garbage collecting a symlink with target length above 127, the payload length would end up negative, causing interesting and bad things to happen. Signed-off-by: David Woodhouse Signed-off-by: Greg Kroah-Hartman commit 75bc75ed15405655d795a163856158aa2ff9bdbc Author: Simon Horman Date: Tue Dec 15 17:01:25 2009 +0100 ipvs: zero usvc and udest commit 258c889362aa95d0ab534b38ce8c15d3009705b1 upstream. Make sure that any otherwise uninitialised fields of usvc are zero. This has been obvserved to cause a problem whereby the port of fwmark services may end up as a non-zero value which causes scheduling of a destination server to fail for persisitent services. As observed by Deon van der Merwe . This fix suggested by Julian Anastasov . For good measure also zero udest. Cc: Deon van der Merwe Acked-by: Julian Anastasov Signed-off-by: Simon Horman Signed-off-by: Patrick McHardy Signed-off-by: Greg Kroah-Hartman commit 1c723eb018de64d2159e9ce66ec6df0d1798e1e3 Author: Hugh Dickins Date: Mon Dec 14 17:59:04 2009 -0800 mm: sigbus instead of abusing oom commit d99be1a8ecf377c2c9b3372d36411ad6547bbd4c upstream. When do_nonlinear_fault() realizes that the page table must have been corrupted for it to have been called, it does print_bad_pte() and returns ... VM_FAULT_OOM, which is hard to understand. It made some sense when I did it for 2.6.15, when do_page_fault() just killed the current process; but nowadays it lets the OOM killer decide who to kill - so page table corruption in one process would be liable to kill another. Change it to return VM_FAULT_SIGBUS instead: that doesn't guarantee that the process will be killed, but is good enough for such a rare abnormality, accompanied as it is by the "BUG: Bad page map" message. And recent HWPOISON work has copied that code into do_swap_page(), when it finds an impossible swap entry: fix that to VM_FAULT_SIGBUS too. Signed-off-by: Hugh Dickins Cc: Izik Eidus Cc: Andrea Arcangeli Cc: Nick Piggin Reviewed-by: KOSAKI Motohiro Cc: Rik van Riel Cc: Lee Schermerhorn Cc: Andi Kleen Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Wu Fengguang Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit ac34851f4dac996125b1cf7c5acdb14310b0f525 Author: Zhenyu Wang Date: Wed Nov 25 13:09:38 2009 +0800 drm/i915: Fix LVDS stability issue on Ironlake commit 1b3c7a47f993bf9ab6c4c7cc3bbf5588052b58f4 upstream. In disable sequence, all output ports on PCH have to be disabled before PCH transcoder, but LVDS port was left always enabled. This one fixes that by disable LVDS port properly during pipe disable process, and resolved stability issue seen on Ironlake. Also move panel fitting disable time just after pipe disable to align with the spec. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit fb79085d52de31fa0e2fe6cb9d1aab332caec16a Author: Zhenyu Wang Date: Fri Nov 27 11:44:36 2009 +0800 drm/i915: PineView only has LVDS and CRT ports commit 103a196f4224dc6872081305cf7f82ebf67aa7bd upstream. PineView only has 2 ports for LVDS and CRT. Don't enable other ports for it. Cc: Shaohua Li Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 452a68706c276224ce1c91fff9ca88158d53c426 Author: Chris Wilson Date: Fri Nov 27 13:06:56 2009 +0000 drm/i915: Avoid NULL dereference with component_only tv_modes commit d271817baecbccb47da0d9f28c285a0dae8a06b7 upstream. In commit d2d9f2324, the guard for a valid video mode was removed. This caused the regression: kernel crash during kms graphic boot on Intel GM4500 platform https://bugzilla.redhat.com/show_bug.cgi?id=540218 This patches changes the logic slightly not to rely on a coupled variable, but to just check whether the video_modes is valid before dereferencing. Signed-off-by: Chris Wilson Cc: David Woodhouse Cc: Zhenyu Wang [ickle: Actually reference the correct bug report] Acked-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 21fc7b8d8c49b0f6ce7a45ae44361d31e93e629a Author: Yong Wang Date: Wed Dec 16 12:58:46 2009 +0800 x86: Under BIOS control, restore AP's APIC_LVTTHMR to the BSP value Upstream commit a2202aa29289db64ca7988b12343158b67b27f10. On platforms where bios handles the thermal monitor interrupt, APIC_LVTTHMR on each logical CPU is programmed to generate a SMI and OS can't touch it. Unfortunately AP bringup sequence using INIT-SIPI-SIPI clear all the LVT entries except the mask bit. Essentially this results in all LVT entries including the thermal monitoring interrupt set to masked (clearing the bios programmed value for APIC_LVTTHMR). And this leads to kernel take over the thermal monitoring interrupt on AP's but not on BSP (leaving the bios programmed value only on BSP). As a result of this, we have seen system hangs when the thermal monitoring interrupt is generated. Fix this by reading the initial value of thermal LVT entry on BSP and if bios has taken over the control, then program the same value on all AP's and leave the thermal monitoring interrupt control on all the logical cpu's to the bios. Signed-off-by: Yong Wang Reviewed-by: Suresh Siddha Cc: Borislav Petkov Cc: Arjan van de Ven LKML-Reference: <20091110013824.GA24940@ywang-moblin2.bj.intel.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 2e20f8fadd921fa3d664bb120f99b380a1b05cbd Author: Florian Fainelli Date: Tue Dec 15 06:45:06 2009 +0000 bcm63xx_enet: fix compilation failure after get_stats_count removal commit a3f92eea04101d9a8e14d50f8048cc5b7bca07a8 upstream. This patch converts bcm63xx_enet to uset get_sset_count like the other drivers do. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 21bcbffae11d48b81ca7b4fd0c873e4d8607de34 Author: Rafal Milecki Date: Fri Oct 2 03:54:44 2009 -0300 V4L/DVB (13116): gspca - ov519: Webcam 041e:4067 added. commit 518c8df77c21b7d1690dd8b96eb0e54c4ec1c9c1 upstream. Signed-off-by: Rafal Milecki Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab Cc: Surbhi Palande Signed-off-by: Greg Kroah-Hartman commit 62965d8347a071c72f4dae96e65be5fb68dd052f Author: Jan Kara Date: Tue Dec 1 16:53:06 2009 +0100 ext3: Fix data / filesystem corruption when write fails to copy data commit 68eb3db08344286733adac48304d9fb7a0e53b27 upstream. When ext3_write_begin fails after allocating some blocks or generic_perform_write fails to copy data to write, we truncate blocks already instantiated beyond i_size. Although these blocks were never inside i_size, we have to truncate pagecache of these blocks so that corresponding buffers get unmapped. Otherwise subsequent __block_prepare_write (called because we are retrying the write) will find the buffers mapped, not call ->get_block, and thus the page will be backed by already freed blocks leading to filesystem and data corruption. Reported-by: James Y Knight Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman commit ad496b34c6835a89dd3a8f6c07dfcf8a0dd7c277 Author: Eric W. Biederman Date: Sun Dec 13 22:39:28 2009 -0800 net: Fix userspace RTM_NEWLINK notifications. commit d90a909e1f3e006a1d57fe11fd417173b6494701 upstream. I received some bug reports about userspace programs having problems because after RTM_NEWLINK was received they could not immeidate access files under /proc/sys/net/ because they had not been registered yet. The problem was trivailly fixed by moving the userspace notification from rtnetlink_event to the end of register_netdevice. Signed-off-by: Eric W. Biederman Cc: David Miller Signed-off-by: Greg Kroah-Hartman commit 383073d49fc78aa793c51018e29253c83410401e Author: Zhao Yakui Date: Fri Dec 11 15:17:20 2009 +0800 ACPI: Use the ARB_DISABLE for the CPU which model id is less than 0x0f. commit 03a05ed1152944000151d57b71000de287a1eb02 upstream. Currently, ARB_DISABLE is a NOP on all of the recent Intel platforms. For such platforms, reduce contention on c3_lock by skipping the fake ARB_DISABLE. The cpu model id on one laptop is 14. If we disable ARB_DISABLE on this box, the box can't be booted correctly. But if we still enable ARB_DISABLE on this box, the box can be booted correctly. So we still use the ARB_DISABLE for the cpu which mode id is less than 0x0f. http://bugzilla.kernel.org/show_bug.cgi?id=14700 Signed-off-by: Zhao Yakui Acked-by: Venkatesh Pallipadi Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit f0cc8412be0a164f9472f161dfd74fc1ca6ac284 Author: Tejun Heo Date: Thu Dec 10 08:43:16 2009 +0900 vmalloc: conditionalize build of pcpu_get_vm_areas() No matching upstream commit as it was resolved differently there. pcpu_get_vm_areas() is used only when dynamic percpu allocator is used by the architecture. In 2.6.32, ia64 doesn't use dynamic percpu allocator and has a macro which makes pcpu_get_vm_areas() buggy via local/global variable aliasing and triggers compile warning. The problem is fixed in upstream and ia64 uses dynamic percpu allocators, so the only left issue is inclusion of unnecessary code and compile warning on ia64 on 2.6.32. Don't build pcpu_get_vm_areas() if legacy percpu allocator is in use. Signed-off-by: Tejun Heo Reported-by: Jan Beulich Signed-off-by: Greg Kroah-Hartman commit f996ff1a936f66ea00ecc760ab19e5f663579278 Author: Corentin Chary Date: Mon Dec 7 22:05:50 2009 +0100 asus-laptop: change light sens default values. commit d951d4cc84e8b5ddb8e0ab81cf6a72cc73fdd668 upstream. The light sensor disable brightness key and /sys/class/backlight/ control. There was a lot of report from users who didn't understand why they couldn't change their brightness, including: https://bugs.launchpad.net/bugs/222171 https://bugzilla.novell.com/show_bug.cgi?id=514747 http://bugzilla.kernel.org/show_bug.cgi?id=13671 http://bugzilla.kernel.org/show_bug.cgi?id=14432 Now the light sensor is disabled, and if the user want to enable it, the level should be ok. The funny thing is that comments where ok, not code. Cc: stable@kernel.org Cc: Thomas Renninger Cc: Peter K��ppers Cc: Michael Franzl Cc: Ian Turner Signed-off-by: Corentin Chary Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 9bcfc6c08e4c9c29b24311307d7d4714572810ec Author: Peter Feuerer Date: Tue Nov 17 14:27:37 2009 -0800 acerhdf: add new BIOS versions commit 360657463679dee44f0b167ffa61f563b4fee101 upstream. Added new BIOS versions for following netbooks: Acer 1410, Gateway LT31, Packard Bell DOA150. As the Gateway LT31 machines have different register values for setting and checking the off-state, the "cmd_off" variable has been splitted up to "cmd_off" and "chk_off". Signed-off-by: Peter Feuerer Cc: Borislav Petkov Cc: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 6088ca9288f87655ceac3bde1dbb921bf4ce5d86 Author: Alan Cox Date: Tue Dec 15 16:46:40 2009 -0800 matroxfb: fix problems with display stability commit 8c651311a3a08c1e4815de6933e00a760e498dae upstream. Regression caused in 2.6.23 and then despite repeated requests never fixed or dealt with (Petr promised to sort it in 2008 but seems to have forgotten). Enough is enough - remove the problem line that was added. If it upsets someone they've had two years to deal with it and at the very least it'll rattle their cage and wake them up. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=9709 Signed-off-by: Alan Cox Reported-by: Damon Tested-by: Ruud van Melick Cc: Petr Vandrovec Cc: Pekka Enberg Cc: Paul A. Clarke Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 67f3bf7f5b9ae151ef227b31d343c677d1f9b789 Author: Zhu Yi Date: Wed Dec 2 14:24:37 2009 +0800 ipw2100: fix rebooting hang with driver loaded commit 52ce3e9a7db754b78cf2cbabc87013f921b25b28 upstream. Add PCI .shutdown method so that we can disable the device during shutdown or reboot. Without this, the reboot doesn't work well on some platforms. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2124 Tested-by: pablo Signed-off-by: Zhu Yi Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 1794daecdb3e628cb1fcb8aee8d3ac30571aa753 Author: Henrique de Moraes Holschuh Date: Wed Dec 9 01:36:22 2009 +0000 thinkpad-acpi: preserve rfkill state across suspend/resume commit 208b996b6c460285650d39b2330f8ef82c007d10 upstream. Since the rfkill rework in 2.6.31, the driver is always resuming with the radios disabled. Change thinkpad-acpi to ask the firmware to resume with the radios in the last state. This fixes the Bluetooth and WWAN rfkill switches. Note that it means we respect the firmware's oddities. Should the user toggle the hardware rfkill switch on and off, it might cause the radios to resume enabled. UWB is an unknown quantity since it has nowhere the same level of firmware support (no control over state storage in NVRAM, for example), and might need further fixing. Testers welcome. This change fixes a regression from 2.6.30. Reported-by: Jerone Young Reported-by: Ian Molton Signed-off-by: Henrique de Moraes Holschuh Tested-by: Ian Molton Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 5279bfc6293bd98c3adaf94e5861e9001669c432 Author: Henrique de Moraes Holschuh Date: Wed Dec 9 01:36:21 2009 +0000 thinkpad-acpi: fix default brightness_mode for R50e/R51 commit a9f8eacca4e9e8693de9b896c1fa7aadaa9402e8 upstream. According to a report, the R50e wants EC-based brightness control, even if it uses an Intel GPU. The current driver default was reported to not work at all. This bug can be worked around by the "brightness_mode=3" module parameter. Change the default of the R50e and R51 2xxx models (which use the same EC firmware, 1V) to TPACPI_BRGHT_Q_EC, but keep TPACPI_BRGHT_Q_ASK set for now, as I'd like to get more reports. This fixes a regression caused by commit 59fe4fe34d7afdf63208124f313be9056feaa2f4, "thinkpad-acpi: fix incorrect use of TPACPI_BRGHT_MODE_ECNVRAM" Kernel 2.6.31 also needs this fix. Reported-by: Ferenc Wagner Tested-by: Ferenc Wagner Signed-off-by: Henrique de Moraes Holschuh Cc: stable@kernel.org Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman commit 3dac78c65b4c503199f1ef157e2934eea33425e8 Author: Kirill A. Shutemov Date: Tue Dec 15 16:47:01 2009 -0800 memcg: fix memory.memsw.usage_in_bytes for root cgroup commit cd9b45b78a61e8df250e69385c74e729e5b66abf upstream. A memory cgroup has a memory.memsw.usage_in_bytes file. It shows the sum of the usage of pages and swapents in the cgroup. Presently the root cgroup's memsw.usage_in_bytes shows the wrong value - the number of swapents are not added. So take MEM_CGROUP_STAT_SWAPOUT into account. Signed-off-by: Kirill A. Shutemov Reviewed-by: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit e8d9252227536dc8bd4e2d254d16b5feef542496 Author: Li Peng Date: Wed Dec 16 16:33:25 2009 +0100 drm/i915: Fix sync to vblank when VGA output is turned off commit 778c902640530371a169ad1c03566e7c51b09874 upstream In current vblank-wait implementation, if we turn off VGA output, drm_wait_vblank will still wait on the disabled pipe until timeout, because vblank on the pipe is assumed be enabled. This would cause slow system response on some system such as moblin. This patch resolve the issue by adding a drm helper function drm_vblank_off which explicitly clear vblank_enabled[crtc], wake up any waiting queue and save last vblank counter before turning off crtc. It also slightly change drm_vblank_get to ensure that we will will return immediately if trying to wait on a disabled pipe. Signed-off-by: Li Peng Reviewed-by: Jesse Barnes [anholt: hand-applied for conflicts with overlay changes] Signed-off-by: Eric Anholt Cc: Stefan Bader Signed-off-by: Greg Kroah-Hartman commit 58cd74bafb36b884abe67998cdef4203ae01769f Author: Vivek Natarajan Date: Wed Dec 16 11:51:45 2009 -0500 mac80211: Fix dynamic power save for scanning. Upstream commit: 7c3f4bbedc241ddcd3abe1f419c356e625231da1 Not only ps_sdata but also IEEE80211_CONF_PS is to be considered before restoring PS in scan_ps_disable(). For instance, when ps_sdata is set but CONF_PS is not set just because the dynamic timer is still running, a sw scan leads to setting of CONF_PS in scan_ps_disable instead of restarting the dynamic PS timer. Also for the above case, a null data frame is to be sent after returning to operating channel which was not happening with the current implementation. This patch fixes this too. Signed-off-by: Vivek Natarajan Reviewed-by: Kalle Valo Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 0f77b958dccf9d3b59d986ea160f84b50c646712 Author: Felix Fietkau Date: Wed Dec 16 11:51:44 2009 -0500 ath9k: fix tx status reporting This is a backport of upstream commit: e8c6342d989e241513baeba4b05a04b6b1f3bc8b This patch fixes a bug in ath9k's tx status check, which caused mac80211 to consider regularly transmitted unicast frames as un-acked. When checking the ts_status field for errors, it needs to be masked with ATH9K_TXERR_FILT, because this field also contains other fields like ATH9K_TX_ACKED. Without this patch, AP mode is pretty much unusable, as hostapd checks the ACK status for the frames that it injects. Signed-off-by: Felix Fietkau Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit e82a3a2db53b6df3a211c7b90c793d61fcb6ddae Author: Luis R. Rodriguez Date: Wed Dec 16 11:51:43 2009 -0500 ath9k: Fix maximum tx fifo settings for single stream devices This is a backport of upstream commit: f4709fdf683e1ed37b321c258b614ebe39752bf3 Atheros single stream AR9285 and AR9271 have half the PCU TX FIFO buffer size of that of dual stream devices. Dual stream devices have a max PCU TX FIFO size of 8 KB while single stream devices have 4 KB. Single stream devices have an issue though and require hardware only to use half of the amount of its capable PCU TX FIFO size, 2 KB and this requires a change in software. Technically a change would not have been required (except for frame burst considerations of 128 bytes) if these devices would have been able to use the full 4 KB of the PCU TX FIFO size but our systems engineers recommend 2 KB to be used only. We enforce this through software by reducing the max frame triggger level to 2 KB. Fixing the max frame trigger level should then have a few benefits: * The PER will now be adjusted as designed for underruns when the max trigger level is reached. This should help alleviate the bus as the rate control algorithm chooses a slower rate which should ensure frames are transmitted properly under high system bus load. * The poll we use on our TX queues should now trigger and work as designed for single stream devices. The hardware passes data from each TX queue on the PCU TX FIFO queue respecting each queue's priority. The new trigger level ensures this seeding of the PCU TX FIFO queue occurs as designed which could mean avoiding false resets and actually reseting hw correctly when a TX queue is indeed stuck. * Some undocumented / unsupported behaviour could have been triggered when the max trigger level level was being set to 4 KB on single stream devices. Its not clear what this issue was to me yet. Cc: Kyungwan Nam Cc: Bennyam Malavazi Cc: Stephen Chen Cc: Shan Palanisamy Cc: Paul Shaw Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 022fe0eb677b07aa37a3f88eab5ed47be2faffb5 Author: Luis R. Rodriguez Date: Wed Dec 16 11:51:42 2009 -0500 ath9k: fix processing of TX PS null data frames This is a backport of upstream commit: e7824a50662f7f79b1a739f705b4d906c31cf221 When mac80211 was telling us to go into Powersave we listened and immediately turned RX off. This meant hardware would not see the ACKs from the AP we're associated with and hardware we'd end up retransmiting the null data frame in a loop helplessly. Fix this by keeping track of the transmitted nullfunc frames and only when we are sure the AP has sent back an ACK do we go ahead and shut RX off. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Vivek Natarajan Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 978962f22c95c70f9018a9181c73525d26f0f3bd Author: Sujith Date: Wed Dec 16 11:51:41 2009 -0500 ath9k: Fix TX hang poll routine This is a backport of upstream commit: 332c556633b8c5fb4e890b1783122f2315526590 When TX is hung, the chip is reset. Ensure that the chip is awake by using the PS wrappers. Signed-off-by: Sujith Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman commit 7847a351aaaa21696dd07f412c493786b53a1999 Author: Johannes Berg Date: Fri Nov 13 23:40:09 2009 +0100 tracing: Fix event format export commit 811cb50baf63461ce0bdb234927046131fc7fa8b upstream. For some reason the export of the event print format to userspace uses '#fmt' which breaks if the format string is anything but a plain string, for example if it is built with macros then the macro names are exported instead of their contents. Use "\"%s\"", fmt instead of "%s", #fmt to export the string and not the way it is built. For example, in net/mac80211/driver-trace.h for the trace event drv_start there is: TP_printk( LOCAL_PR_FMT, LOCAL_PR_ARG ) Which use to produce: print fmt: LOCAL_PR_FMT, REC->wiphy_name Now produces: print fmt: "%s", REC->wiphy_name Signed-off-by: Johannes Berg LKML-Reference: <20091113224009.GB23942@elte.hu> Signed-off-by: Steven Rostedt Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit e75a313897fa83be86afb38a6e4415e923cdca80 Author: Larry Finger Date: Mon Nov 23 18:42:36 2009 -0600 b43legacy: avoid PPC fault during resume commit 316a4d966cae3c2dec83ebb1ee1a3515f97b30ff upstream. For PPC architecture with PHY Revision < 3, a read of the register B43_MMIO_HWENABLED_LO will cause a CPU fault unless b43legacy_status() returns a value of 2 (B43legacy_STAT_STARTED); however, one finds that the driver is unable to associate after resuming from hibernation unless this routine returns 1. To satisfy both conditions, the routine is rewritten to return TRUE whenever b43legacy_status() returns a value < 2. This patch fixes the second problem listed in the postings for Red Hat Bugzilla #538523. Signed-off-by: Larry Finger Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 3263c617570ed7c7292ea484d1fdf31687d110ee Author: David S. Miller Date: Sat Dec 5 17:17:55 2009 -0800 sparc: Set UTS_MACHINE correctly. [ Upstream commit 7f5620a5fcd658f219e85831d3691908f1eccbde ] "ARCH" can be just about anything, so we shouldn't end up with UTS_MACHINE of "sparc" in a 64-bit kernel build just because someone set the personality using 'sparc32' or similar. CONFIG_SPARC64 drives the compilation and therefore provides the definitive value, not "ARCH". This mirrors commit 8c6531f7a99f29ba8817ffb12cc9ecf190049bd6 (x86: correctly set UTS_MACHINE for "make ARCH=x86") Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 6ec683e0dc39688557189eed2153367d0acf61e2 Author: David S. Miller Date: Wed Dec 9 01:43:45 2009 -0800 sparc64: Fix stack debugging IRQ stack regression. [ Upstream commit 166e553a575f09485f6d0df8a1ef3c5991f7d953 ] Commit 4f70f7a91bffdcc39f088748dc678953eb9a3fbd (sparc64: Implement IRQ stacks.) has two bugs. First, the softirq range check forgets to subtract STACK_BIAS before comparing with %sp. Next, on failure the wrong label is jumped to, resulting in a bogus stack being loaded. Reported-by: Igor Kovalenko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit c141dab88c2afe8a1d43b64f55db11523cc4ec2d Author: David S. Miller Date: Wed Dec 9 01:39:09 2009 -0800 sparc64: Fix overly strict range type matching for PCI devices. [ Upstream commit 4230fa3b89ea1c413766bd411a8315a3d05aa6c7 ] When we are trying to see if a range property entry applies to a given address, we are overly strict about the type. We should only allow I/O ranges for I/O addresses, and only allow CONFIG space ranges for CONFIG space address. However for MEM ranges, they come in 32-bit and 64-bit flavors. And a lack of an exact match is OK if the range is 32-bit and the address is 64-bit. We can assign a 64-bit address properly into a 32-bit parent range just fine. So allow it. Reported-by: Patrick Finnegan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 257abc89a7765c57137811419caac5efca2e7b2d Author: David S. Miller Date: Wed Dec 9 23:44:43 2009 -0800 sparc64: Don't specify IRQF_SHARED for LDC interrupts. [ Upstream commit 08a036d583409e3517e3d15b7478d029b25f2cf2 ] IRQF_SHARED and IRQF_DISABLED don't mix. Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 599343ebd4b057e35955915d73410ea0b987875a Author: Stanislav Brabec Date: Tue Dec 8 21:00:22 2009 -0800 b44 WOL setup: one-bit-off stack corruption kernel panic fix [ Upstream commit: e0188829cb724e7d12a2d4e343b368ff1d6e1471 ] About 50% of shutdowns of b44 Ethernet adapter ends by kernel panic with kernels compiled with stack-protector. Checking b44_magic_pattern() return values, one call of b44_magic_pattern() returns 127. It means, that set_bit(128, pmask) was called on line 1509. It means that bit 0 of 17th byte of pmask was overwritten. But pmask has only 16 bytes. Stack corruption happens. It seems that set_bit() on line 1509 always writes one bit off. The fix does not only solve the stack corruption, but also makes Wake On LAN working on my onboard B44 on Asus A7V-333X mainboard. It seems that this problem affects all kernel versions since commit 725ad800 ([PATCH] b44: add wol for old nic) on 2006-06-20. Signed-off-by: Stanislav Brabec Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 42d8bd7737a65b535d3247392b11fcd0f32303fe Author: Patrick McHardy Date: Tue Dec 1 15:53:57 2009 -0800 ip_fragment: also adjust skb->truesize for packets not owned by a socket [ Upstream commit b2722b1c3a893ec6021508da15b32282ec79f4da ] When a large packet gets reassembled by ip_defrag(), the head skb accounts for all the fragments in skb->truesize. If this packet is refragmented again, skb->truesize is not re-adjusted to reflect only the head size since its not owned by a socket. If the head fragment then gets recycled and reused for another received fragment, it might exceed the defragmentation limits due to its large truesize value. skb_recycle_check() explicitly checks for linear skbs, so any recycled skb should reflect its true size in skb->truesize. Change ip_fragment() to also adjust the truesize value of skbs not owned by a socket. Reported-and-tested-by: Ben Menchaca Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 0d975c7ebdebbdf559100c0b09e037679062f052 Author: Damian Lukowski Date: Mon Dec 7 06:06:15 2009 +0000 tcp: Stalling connections: Fix timeout calculation routine [ Upstream commit 07f29bc5bbae4e53e982ab956fed7207990a7786 ] This patch fixes a problem in the TCP connection timeout calculation. Currently, timeout decisions are made on the basis of the current tcp_time_stamp and retrans_stamp, which is usually set at the first retransmission. However, if the retransmission fails in tcp_retransmit_skb(), retrans_stamp is not updated and remains zero. This leads to wrong decisions in retransmits_timed_out() if tcp_time_stamp is larger than the specified timeout, which is very likely. In this case, the TCP connection dies after the first attempted (and unsuccessful) retransmission. With this patch, tcp_skb_cb->when is used instead, when retrans_stamp is not available. This bug has been introduced together with retransmits_timed_out() in 2.6.32, as the number of retransmissions has been used for timeout decisions before. The corresponding commit was 6fa12c85031485dff38ce550c24f10da23b0adaa (Revert Backoff [v3]: Calculate TCP's connection close threshold as a time value.). Thanks to Ilpo J��rvinen for code suggestions and Frederic Leroy for testing. Reported-by: Frederic Leroy Signed-off-by: Damian Lukowski Acked-by: Ilpo J��rvinen Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit a02d9614bab2896760c01477162a5657e06be7ed Author: Bartlomiej Zolnierkiewicz Date: Mon Nov 30 08:55:18 2009 +0000 slc90e66: fix UDMA handling [ Upstream commit ee31527a02b0a8e1aa4a5e4084d2db5fa34737ed ] Fix checking of the currently programmed UDMA mode. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 80b337ebf9ff4e06cd4185b31d8972193a985262 Author: Milan Broz Date: Thu Dec 10 23:51:57 2009 +0000 dm crypt: make wipe message also wipe essiv key commit 542da317668c35036e8471822a564b609d05af66 upstream. The "wipe key" message is used to wipe the volume key from memory temporarily, for example when suspending to RAM. But the initialisation vector in ESSIV mode is calculated from the hashed volume key, so the wipe message should wipe this IV key too and reinitialise it when the volume key is reinstated. This patch adds an IV wipe method called from a wipe message callback. ESSIV is then reinitialised using the init function added by the last patch. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 7d41627824496f9c69ab2da972a72521ebeebf7a Author: Milan Broz Date: Thu Dec 10 23:51:56 2009 +0000 dm crypt: separate essiv allocation from initialisation commit b95bf2d3d5a48b095bffe2a0cd8c40453cf59557 upstream. This patch separates the construction of IV from its initialisation. (For ESSIV it is a hash calculation based on volume key.) Constructor code now preallocates hash tfm and salt array and saves it in a private IV structure. The next patch requires this to reinitialise the wiped IV without reallocating memory when resuming a suspended device. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 8419ee8215942d6bf3814391730421a4897fc410 Author: Mikulas Patocka Date: Thu Dec 10 23:51:54 2009 +0000 dm snapshot: cope with chunk size larger than origin commit 8e87b9b81b3c370f7e53c1ab6e1c3519ef37a644 upstream. Under some special conditions the snapshot hash_size is calculated as zero. This patch instead sets a minimum value of 64, the same as for the pending exception table. rounddown_pow_of_two(0) is an undefined operation (it expands to shift by -1). init_exception_table with an argument of 0 would fail with -ENOMEM. The way to trigger the problem is to create a snapshot with a chunk size that is larger than the origin device. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 0bca4a5b78ad922624e9a76a7e86453f1fec7239 Author: Mikulas Patocka Date: Thu Dec 10 23:51:52 2009 +0000 dm: avoid _hash_lock deadlock commit 6076905b5ef39e0ea58db32583c9e0036c05e47b upstream. Fix a reported deadlock if there are still unprocessed multipath events on a device that is being removed. _hash_lock is held during dev_remove while trying to send the outstanding events. Sending the events requests the _hash_lock again in dm_copy_name_and_uuid. This patch introduces a separate lock around regions that modify the link to the hash table (dm_set_mdptr) or the name or uuid so that dm_copy_name_and_uuid no longer needs _hash_lock. Additionally, dm_copy_name_and_uuid can only be called if md exists so we can drop the dm_get() and dm_put() which can lead to a BUG() while md is being freed. The deadlock: #0 [ffff8106298dfb48] schedule at ffffffff80063035 #1 [ffff8106298dfc20] __down_read at ffffffff8006475d #2 [ffff8106298dfc60] dm_copy_name_and_uuid at ffffffff8824f740 #3 [ffff8106298dfc90] dm_send_uevents at ffffffff88252685 #4 [ffff8106298dfcd0] event_callback at ffffffff8824c678 #5 [ffff8106298dfd00] dm_table_event at ffffffff8824dd01 #6 [ffff8106298dfd10] __hash_remove at ffffffff882507ad #7 [ffff8106298dfd30] dev_remove at ffffffff88250865 #8 [ffff8106298dfd60] ctl_ioctl at ffffffff88250d80 #9 [ffff8106298dfee0] do_ioctl at ffffffff800418c4 #10 [ffff8106298dff00] vfs_ioctl at ffffffff8002fab9 #11 [ffff8106298dff40] sys_ioctl at ffffffff8004bdaf #12 [ffff8106298dff80] tracesys at ffffffff8005d28d (via system_call) Reported-by: guy keren Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit c22d66f16eaeec0d3c4df607f425f4ebf2b8d238 Author: Milan Broz Date: Thu Dec 10 23:51:56 2009 +0000 dm crypt: restructure essiv error path commit 5861f1be00b3b70f8ab5e5a81392a6cf69666cd2 upstream. Use kzfree for salt deallocation because it is derived from the volume key. Use a common error path in ESSIV constructor. Required by a later patch which fixes the way key material is wiped from memory. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit c7f27e82997f9c835b4c241d1f302501d0cdcc9e Author: Milan Broz Date: Thu Dec 10 23:51:55 2009 +0000 dm crypt: move private iv fields to structs commit 6047359277517c4e56d8bfd6ea4966d7a3924151 upstream. Define private structures for IV so it's easy to add further attributes in a following patch which fixes the way key material is wiped from memory. Also move ESSIV destructor and remove unnecessary 'status' operation. There are no functional changes in this patch. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 5f5d50a0f5530e5a6df52755c74ec5a47829f8cc Author: Mikulas Patocka Date: Thu Dec 10 23:51:53 2009 +0000 dm snapshot: only take lock for statustype info not table commit 94e76572b5dd37b1f0f4b3742ee8a565daead932 upstream. Take snapshot lock only for STATUSTYPE_INFO, not STATUSTYPE_TABLE. Commit 4c6fff445d7aa753957856278d4d93bcad6e2c14 (dm-snapshot-lock-snapshot-while-supplying-status.patch) introduced this use of the lock, but userspace applications using libdevmapper have been found to request STATUSTYPE_TABLE while the device is suspended and the lock is already held, leading to deadlock. Since the lock is not necessary in this case, don't try to take it. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 5db89cf4ea748e1c2d29d52175b2bace466078c7 Author: Julia Lawall Date: Thu Dec 10 23:51:52 2009 +0000 dm exception store: free tmp_store on persistent flag error commit 613978f8711c7fd4d0aa856872375d2abd7c92ff upstream. Error handling code following a kmalloc should free the allocated data. Signed-off-by: Julia Lawall Signed-off-by: Alasdair G Kergon Signed-off-by: Greg Kroah-Hartman commit 1e75ccef288b75a3b207c1b1be4baf5ae5ac0ffb Author: Ian Campbell Date: Fri Jun 5 11:58:37 2009 +0100 xen: try harder to balloon up under memory pressure. commit bc2c0303226ec716854d3c208c7f84fe7aa35cd7 upstream. Currently if the balloon driver is unable to increase the guest's reservation it assumes the failure was due to reaching its full allocation, gives up on the ballooning operation and records the limit it reached as the "hard limit". The driver will not try again until the target is set again (even to the same value). However it is possible that ballooning has in fact failed due to memory pressure in the host and therefore it is desirable to keep attempting to reach the target in case memory becomes available. The most likely scenario is that some guests are ballooning down while others are ballooning up and therefore there is temporary memory pressure while things stabilise. You would not expect a well behaved toolstack to ask a domain to balloon to more than its allocation nor would you expect it to deliberately over-commit memory by setting balloon targets which exceed the total host memory. This patch drops the concept of a hard limit and causes the balloon driver to retry increasing the reservation on a timer in the same manner as when decreasing the reservation. Also if we partially succeed in increasing the reservation (i.e. receive less pages than we asked for) then we may as well keep those pages rather than returning them to Xen. Signed-off-by: Ian Campbell Signed-off-by: Greg Kroah-Hartman commit 910965b03f3c8930db26378bd9ab06ea74b91bdb Author: Gianluca Guida Date: Thu Jul 30 22:54:36 2009 +0100 Xen balloon: fix totalram_pages counting. commit 3d65c9488cadd2f11bd4d60c7266e639ece5d0d6 upstream. Change totalram_pages when a single page is added/removed to the ballooned list. This avoid totalram_pages to be set erroneously to max_pfn at boot. Signed-off-by: Gianluca Guida Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 7a0eb0721ef8015e1d17fb1cc017179eedf8cc2c Author: Ian Campbell Date: Tue Dec 1 11:47:15 2009 +0000 xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region. commit b4606f2165153833247823e8c04c5e88cb3d298b upstream. I have observed cases where the implicit stop_machine_destroy() done by stop_machine() hangs while destroying the workqueues, specifically in kthread_stop(). This seems to be because timer ticks are not restarted until after stop_machine() returns. Fortunately stop_machine provides a facility to pre-create/post-destroy the workqueues so use this to ensure that workqueues are only destroyed after everything is really up and running again. I only actually observed this failure with 2.6.30. It seems that newer kernels are somehow more robust against doing kthread_stop() without timer interrupts (I tried some backports of some likely looking candidates but did not track down the commit which added this robustness). However this change seems like a reasonable belt&braces thing to do. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit ebe5f3b81f1d3677882b5b1c382321096c7d1851 Author: Jeremy Fitzhardinge Date: Wed Nov 25 13:15:38 2009 -0800 xen: use iret for return from 64b kernel to 32b usermode commit 6aaf5d633bb6cead81b396d861d7bae4b9a0ba7e upstream. If Xen wants to return to a 32b usermode with sysret it must use the right form. When using VCGF_in_syscall to trigger this, it looks at the code segment and does a 32b sysret if it is FLAT_USER_CS32. However, this is different from __USER32_CS, so it fails to return properly if we use the normal Linux segment. So avoid the whole mess by dropping VCGF_in_syscall and simply use plain iret to return to usermode. Signed-off-by: Jeremy Fitzhardinge Acked-by: Jan Beulich Signed-off-by: Greg Kroah-Hartman commit 98a0174b42a81685c342a230a8a8755a9df9bcd6 Author: Ian Campbell Date: Tue Dec 1 16:15:30 2009 +0000 xen: don't leak IRQs over suspend/resume. commit fed5ea87e02aaf902ff38c65b4514233db03dc09 upstream. On resume irq_info[*].evtchn is reset to 0 since event channel mappings are not preserved over suspend/resume. The other contents of irq_info is preserved to allow rebind_evtchn_irq() to function. However when a device resumes it will try to unbind from the previous IRQ (e.g. blkfront goes blkfront_resume() -> blkif_free() -> unbind_from_irqhandler() -> unbind_from_irq()). This will fail due to the check for VALID_EVTCHN in unbind_from_irq() and the IRQ is leaked. The device will then continue to resume and allocate a new IRQ, eventually leading to find_unbound_irq() panic()ing. Fix this by changing unbind_from_irq() to handle teardown of interrupts which have type!=IRQT_UNBOUND but are not currently bound to a specific event channel. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit f180b871d6cbcaaf9349075afb515081de073acb Author: Ian Campbell Date: Tue Dec 1 11:47:14 2009 +0000 xen: improve error handling in do_suspend. commit 65f63384b391bf4d384327d8a7c6de9860290b5c upstream. The existing error handling has a few issues: - If freeze_processes() fails it exits with shutting_down = SHUTDOWN_SUSPEND. - If dpm_suspend_noirq() fails it exits without resuming xenbus. - If stop_machine() fails it exits without resuming xenbus or calling dpm_resume_end(). - xs_suspend()/xs_resume() and dpm_suspend_noirq()/dpm_resume_noirq() were not nested in the obvious way. Fix by ensuring each failure case goto's the correct label. Treat a failure of stop_machine() as a cancelled suspend in order to follow the correct resume path. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 0bf7bb9861a419c63055293ddec67329165f8d84 Author: Ian Campbell Date: Wed Nov 25 14:12:08 2009 +0000 xen: call clock resume notifier on all CPUs commit f6eafe3665bcc374c66775d58312d1c06c55303f upstream. tick_resume() is never called on secondary processors. Presumably this is because they are offlined for suspend on native and so this is normally taken care of in the CPU onlining path. Under Xen we keep all CPUs online over a suspend. This patch papers over the issue for me but I will investigate a more generic, less hacky, way of doing to the same. tick_suspend is also only called on the boot CPU which I presume should be fixed too. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Cc: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit c7092102563af5c81bd8d08582fdbe4529cbcf17 Author: Jeremy Fitzhardinge Date: Tue Nov 24 09:38:25 2009 -0800 xen: register runstate info for boot CPU early commit 499d19b82b586aef18727b9ae1437f8f37b66e91 upstream. printk timestamping uses sched_clock, which in turn relies on runstate info under Xen. So make sure we set it up before any printks can be called. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 8fd7520c678cc3d8af422bca9f22149731520f1b Author: Jeremy Fitzhardinge Date: Tue Nov 24 09:58:49 2009 -0800 xen: don't call dpm_resume_noirq() with interrupts disabled. commit 922cc38ab71d1360978e65207e4a4f4988987127 upstream. dpm_resume_noirq() takes a mutex, so it can't be called from a no-interrupt context. Don't call it from within the stop-machine function, but just afterwards, since we're resuming anyway, regardless of what happened. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 25fa3416973b064c4a156340301a5b97301af602 Author: Ian Campbell Date: Tue Nov 24 09:32:48 2009 -0800 xen: register runstate on secondary CPUs commit 028896721ac04f6fa0697f3ecac3f98761746363 upstream. The commit "xen: re-register runstate area earlier on resume" caused us to never try and setup the runstate area for secondary CPUs. Ensure that we do this... Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit d7b1aedc1a241dcde39a8a35757b6b0797eac5ff Author: Ian Campbell Date: Tue Nov 24 10:16:23 2009 +0000 xen: register timer interrupt with IRQF_TIMER commit f350c7922faad3397c98c81a9e5658f5a1ef0214 upstream. Otherwise the timer is disabled by dpm_suspend_noirq() which in turn prevents correct operation of stop_machine on multi-processor systems and breaks suspend. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit b6172e046931fd39a53b3607af40155eadbbecc2 Author: Ian Campbell Date: Sat Nov 21 11:32:49 2009 +0000 xen: correctly restore pfn_to_mfn_list_list after resume commit fa24ba62ea2869308ffc9f0b286ac9650b4ca6cb upstream. pvops kernels >= 2.6.30 can currently only be saved and restored once. The second attempt to save results in: ERROR Internal error: Frame# in pfn-to-mfn frame list is not in pseudophys ERROR Internal error: entry 0: p2m_frame_list[0] is 0xf2c2c2c2, max 0x120000 ERROR Internal error: Failed to map/save the p2m frame list I finally narrowed it down to: commit cdaead6b4e657f960d6d6f9f380e7dfeedc6a09b Author: Jeremy Fitzhardinge Date: Fri Feb 27 15:34:59 2009 -0800 xen: split construction of p2m mfn tables from registration Build the p2m_mfn_list_list early with the rest of the p2m table, but register it later when the real shared_info structure is in place. Signed-off-by: Jeremy Fitzhardinge The unforeseen side-effect of this change was to cause the mfn list list to not be rebuilt on resume. Prior to this change it would have been rebuilt via xen_post_suspend() -> xen_setup_shared_info() -> xen_setup_mfn_list_list(). Fix by explicitly calling xen_build_mfn_list_list() from xen_post_suspend(). Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit b6c73e8a66cd9f54bfc0d2267afd10eaf44157e1 Author: Jeremy Fitzhardinge Date: Sat Nov 21 08:46:29 2009 +0800 xen: restore runstate_info even if !have_vcpu_info_placement commit 3905bb2aa7bb801b31946b37a4635ebac4009051 upstream. Even if have_vcpu_info_placement is not set, we still need to set up the runstate area on each resumed vcpu. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit e27d65dec237be523c3e3c8b193007243367aad9 Author: Ian Campbell Date: Sat Nov 21 08:35:55 2009 +0800 xen: re-register runstate area earlier on resume. commit be012920ecba161ad20303a3f6d9e96c58cf97c7 upstream. This is necessary to ensure the runstate area is available to xen_sched_clock before any calls to printk which will require it in order to provide a timestamp. I chose to pull the xen_setup_runstate_info out of xen_time_init into the caller in order to maintain parity with calling xen_setup_runstate_info separately from calling xen_time_resume. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit fd28fac739e3a2e2be8138fb10ce554f74a50cae Author: Jeremy Fitzhardinge Date: Tue Nov 24 16:41:47 2009 -0800 xen/xenbus: make DEVICE_ATTR()s static commit db05fed0ad72f264e39bcb366795f7367384ec92 upstream. They don't need to be global, and may cause linker clashes. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 14173dbee479f3c9560f303040488505d7ae5381 Author: Zhao Yakui Date: Wed Dec 2 10:03:33 2009 +0800 drm/i915: Add the missing clonemask for display port on Ironlake commit 652af9d74e1a3a10bb10f0d8e8f42ddac26bbc1a upstream. Add the missing clonemask for display port on Ironlake. Signed-off-by: Zhao Yakui Reviewed-by: Zhenyu Wang Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 739f9e4f0c9ede0209e874ed223b297d04483358 Author: Chris Wilson Date: Wed Dec 2 15:15:30 2009 +0000 drm/i915: Set the error code after failing to insert new offset into mm ht. commit 5618ca6abc2d6f475b258badc017a5254cf43d1b upstream. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman commit 4a6ab40474d859a218e326550c2192f384527f81 Author: Martin Michlmayr Date: Thu Nov 19 16:29:45 2009 +0000 drm/ttm: Fix build failure due to missing struct page commit c3a73ba13bac7fd96030f39202b2d37fb19c46a6 upstream. drm/ttm fails to build on MIPS because "struct page" is not known: | In file included from drivers/gpu/drm/ttm/ttm_memory.c:28: | include/drm/ttm/ttm_memory.h:154: warning: 'struct page' declared inside parameter list | include/drm/ttm/ttm_memory.h:154: warning: its scope is only this definition or declaration, which is probably not what you want | include/drm/ttm/ttm_memory.h:156: warning: 'struct page' declared inside parameter list | drivers/gpu/drm/ttm/ttm_memory.c:540: error: conflicting types for 'ttm_mem_global_alloc_page' | include/drm/ttm/ttm_memory.h:154: error: previous declaration of 'ttm_mem_global_alloc_page' was here | drivers/gpu/drm/ttm/ttm_memory.c:561: error: conflicting types for 'ttm_mem_global_free_page' | include/drm/ttm/ttm_memory.h:156: error: previous declaration of 'ttm_mem_global_free_page' was here Signed-off-by: Martin Michlmayr Acked-by: Thomas Hellstrom Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit e582ed67311ec17b343f21b82fc40de4d35fff3e Author: Alex Deucher Date: Thu Dec 3 16:28:02 2009 -0500 drm/radeon/kms: rs6xx/rs740: clamp vram to aperture size commit 0088dbdb809e8799cb8f26da5ac64b15201fa99d upstream. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 3234b70ff908ed6479481027456fdd9826f56937 Author: Alex Deucher Date: Thu Dec 3 16:18:19 2009 -0500 drm/radeon/kms: fix vram setup on rs600 commit 722f29434e72188b2d20f9b41f4b5952073ed568 upstream. also fix up rs690 mem width. should fix fdo bug 25408 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 48198675919e94a9a8d5185a8312789eae2ea9a0 Author: Alex Deucher Date: Thu Dec 3 12:15:54 2009 -0500 drm/radeon/kms: fix legacy crtc2 dpms commit 8de21525439e6b5bb8d8c81e49094d867bf82f6d upstream. noticed by Matthijs Kooijman on fdo bug 22140 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 373b9483b6b1cc9ec21080ba29c90e9968102aa8 Author: Alex Deucher Date: Wed Dec 2 11:46:52 2009 -0500 drm/radeon/kms: handle vblanks properly with dpms on commit 500b758725314ab1b5316eb0caa5b0fa26740e6b upstream. avivo chips Copied from pre-avivo code. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 5c5c0d7335f6cc65a7f18b09e473c346d20edc83 Author: Alex Deucher Date: Tue Dec 1 14:49:50 2009 -0500 drm/radeon/kms: Add quirk for HIS X1300 board commit 4e3f9b78ff917cc5c833858fdb5d96bc262e0bf3 upstream. Board is DVI+VGA, not DVI+DVI Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 49e6aacefc4ba11f7515391659a6e2f316a6e1ae Author: Benjamin Herrenschmidt Date: Tue Dec 8 18:45:45 2009 +0000 powerpc: Fix usage of 64-bit instruction in 32-bit altivec code commit e090aa80321b64c3b793f3b047e31ecf1af9538d upstream. e821ea70f3b4873b50056a1e0f74befed1014c09 introduced a bug by copying some 64-bit originated code as-is to be used by both 32 and 64-bit but this code contains a 64-bit ony "cmpdi" instruction. This changes it to cmpwi, which is fine since VRSAVE can only contains a 32-bit value anyway. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 6b3f68aeeae30d18186a844c92bf3269e3226f51 Author: Darrick J. Wong Date: Thu Dec 3 16:19:59 2009 +0000 powerpc/therm_adt746x: Record pwm invert bit at module load time] commit 1496e89ae2a0962748e55165a590fa3209c6f158 upstream. In commit 0512a9a8e277a9de2820211eef964473b714ae65, we unilaterally zero the "pwm invert" bit in the fan behavior configuration register. On my PowerBook G4, this results in the fans going to full speed at low temperature and shutting off at high temperature because the pwm invert bit is supposed to be set. Therefore, record the pwm invert bit at driver load time, and write the bit into the fan behavior control register. This restores correct behavior on my PBG4 and should work around the bit being set to the wrong value after suspend/resume (which is what the original patch was trying to fix). It also fixes a minor omission where the pwm invert bit correction is NOT performed when switching into automatic mode. Signed-off-by: Darrick J. Wong Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit d5f60d19405b2b8c338be1c70f013d39a40d049d Author: Bolko Maass Date: Fri Nov 27 05:44:33 2009 +0000 powerpc/windfarm: Add detection for second cpu pump commit 529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb upstream. Windfarm SMU control is explicitly missing support for a second CPU pump in G5 PowerMacs. Such machines actually exist (specifically Quads with a second pump), so this patch adds detection for it. Signed-off by: Bolko Maass Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman commit 0a0fa09874289cbfce7e94bc1b61b57e7751a63f Author: Naoya Horiguchi Date: Mon Dec 14 17:59:59 2009 -0800 mm: hugetlb: fix hugepage memory leak in walk_page_range() commit d33b9f45bd24a6391bc05e2b5a13c1b5787ca9c2 upstream. Most callers of pmd_none_or_clear_bad() check whether the target page is in a hugepage or not, but walk_page_range() do not check it. So if we read /proc/pid/pagemap for the hugepage on x86 machine, the hugepage memory is leaked as shown below. This patch fixes it. Details ======= My test program (leak_pagemap) works as follows: - creat() and mmap() a file on hugetlbfs (file size is 200MB == 100 hugepages,) - read()/write() something on it, - call page-types with option -p (walk around the page tables), - munmap() and unlink() the file on hugetlbfs Without my patches ------------------ $ cat /proc/meminfo |grep "HugePage" HugePages_Total: 1000 HugePages_Free: 1000 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ./leak_pagemap [snip output] $ cat /proc/meminfo |grep "HugePage" HugePages_Total: 1000 HugePages_Free: 900 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ls /hugetlbfs/ $ 100 hugepages are accounted as used while there is no file on hugetlbfs. With my patches --------------- $ cat /proc/meminfo |grep "HugePage" HugePages_Total: 1000 HugePages_Free: 1000 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ./leak_pagemap [snip output] $ cat /proc/meminfo |grep "HugePage" HugePages_Total: 1000 HugePages_Free: 1000 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ls /hugetlbfs $ No memory leaks. Signed-off-by: Naoya Horiguchi Cc: Andi Kleen Cc: Wu Fengguang Cc: Hugh Dickins Cc: Mel Gorman Cc: Lee Schermerhorn Cc: Andy Whitcroft Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 23022aab1a90cc3117b3816c79aea3977bce09ff Author: Naoya Horiguchi Date: Mon Dec 14 17:59:58 2009 -0800 mm: hugetlb: fix hugepage memory leak in mincore() commit 4f16fc107d9c9b8a72aa19b189a9216e90a7aaef upstream. Most callers of pmd_none_or_clear_bad() check whether the target page is in a hugepage or not, but mincore() and walk_page_range() do not check it. So if we use mincore() on a hugepage on x86 machine, the hugepage memory is leaked as shown below. This patch fixes it by extending mincore() system call to support hugepages. Details ======= My test program (leak_mincore) works as follows: - creat() and mmap() a file on hugetlbfs (file size is 200MB == 100 hugepages,) - read()/write() something on it, - call mincore() for first ten pages and printf() the values of *vec - munmap() and unlink() the file on hugetlbfs Without my patch ---------------- $ cat /proc/meminfo| grep "HugePage" HugePages_Total: 1000 HugePages_Free: 1000 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ./leak_mincore vec[0] 0 vec[1] 0 vec[2] 0 vec[3] 0 vec[4] 0 vec[5] 0 vec[6] 0 vec[7] 0 vec[8] 0 vec[9] 0 $ cat /proc/meminfo |grep "HugePage" HugePages_Total: 1000 HugePages_Free: 999 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ls /hugetlbfs/ $ Return values in *vec from mincore() are set to 0, while the hugepage should be in memory, and 1 hugepage is still accounted as used while there is no file on hugetlbfs. With my patch ------------- $ cat /proc/meminfo| grep "HugePage" HugePages_Total: 1000 HugePages_Free: 1000 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ./leak_mincore vec[0] 1 vec[1] 1 vec[2] 1 vec[3] 1 vec[4] 1 vec[5] 1 vec[6] 1 vec[7] 1 vec[8] 1 vec[9] 1 $ cat /proc/meminfo |grep "HugePage" HugePages_Total: 1000 HugePages_Free: 1000 HugePages_Rsvd: 0 HugePages_Surp: 0 $ ls /hugetlbfs/ $ Return value in *vec set to 1 and no memory leaks. [akpm@linux-foundation.org: cleanup] [akpm@linux-foundation.org: build fix] Signed-off-by: Naoya Horiguchi Cc: Andi Kleen Cc: Wu Fengguang Cc: Hugh Dickins Cc: Mel Gorman Cc: Lee Schermerhorn Cc: Andy Whitcroft Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit b3e1b060b2a4079723332d9d98a5891d670b9f8e Author: Thomas Gleixner Date: Mon Dec 7 12:59:46 2009 +0100 x86: Fix bogus warning in apic_noop.apic_write() commit a946d8f11f0da9cfc714248036fcfd3a794d1e27 upstream. apic_noop is used to provide dummy apic functions. It's installed when the CPU has no APIC or when the APIC is disabled on the kernel command line. The apic_noop implementation of apic_write() warns when the CPU has an APIC or when the APIC is not disabled. That's bogus. The warning should only happen when the CPU has an APIC _AND_ the APIC is not disabled. apic_noop.apic_read() has the correct check. Signed-off-by: Thomas Gleixner Cc: Cyrill Gorcunov LKML-Reference: Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 7fd943643cc5aef6546ca3d8914e01d4298ee769 Author: Larry Finger Date: Sat Dec 5 19:25:22 2009 -0600 rtl8187: Fix wrong rfkill switch mask for some models commit 70d57139f932b9ca21026253d02af71cf53d764a upstream. There are different bits used to convey the setting of the rfkill switch to the driver. The current driver only supports one of these possibilities. These changes were derived from the latest version of the vendor driver. This patch fixes the regression noted in kernel Bugzilla #14743. Signed-off-by: Larry Finger Reported-and-tested-by: Antti Kaijanm��ki Tested-by: Hin-Tak Leung Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 8cf6359fa10996157bd8030b572ac6050dff2580 Author: John W. Linville Date: Tue Dec 8 17:10:13 2009 -0500 wireless: correctly report signal value for IEEE80211_HW_SIGNAL_UNSPEC commit 19deffbeba930030cfaf000b920333c6ba99ad52 upstream. This part was missed in "cfg80211: implement get_wireless_stats", probably because sta_set_sinfo already existed and was only handling dBm signals. Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 22731c4b03371594e3bfdf032a64ee3cc6e61365 Author: Johannes Berg Date: Sat Oct 31 07:44:08 2009 +0100 mac80211: fix scan abort sanity checks commit 6d3560d4fc9c5b9fe1a07a63926ea70512c69c32 upstream. Since sometimes mac80211 queues up a scan request to only act on it later, it must be allowed to (internally) cancel a not-yet-running scan, e.g. when the interface is taken down. This condition was missing since we always checked only the local->scanning variable which isn't yet set in that situation. Reported-by: Luis R. Rodriguez Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit c04c99abc6754fa92d428915ac4215994fe95609 Author: Javier Cardona Date: Wed Dec 9 18:43:01 2009 -0800 mac80211: Revert 'Use correct sign for mesh active path refresh' commit 7b324d28a94dac5a451e8cba66e8d324601e5b9a upstream. The patch ("mac80211: Use correct sign for mesh active path refresh.") was actually a bug. Reverted it and improved the explanation of how mesh path refresh works. Signed-off-by: Javier Cardona Signed-off-by: Andrey Yurovsky Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit dde24b6c58b10e27c296f2d343e9512ec0dce874 Author: Javier Cardona Date: Wed Dec 9 18:43:00 2009 -0800 mac80211: Fixed bug in mesh portal paths commit 5d618cb81aeea19879975cd1f9a1e707694dfd7c upstream. Paths to mesh portals were being timed out immediately after each use in intermediate forwarding nodes. mppath->exp_time is set to the expiration time so assigning it to jiffies was marking the path as expired. Signed-off-by: Javier Cardona Signed-off-by: Andrey Yurovsky Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit fb0f7048cfa072125c98dc11884a96d1e03c0f9a Author: Vasanthakumar Thiagarajan Date: Fri Dec 4 17:41:34 2009 +0530 mac80211: Fix bug in computing crc over dynamic IEs in beacon commit 1814077fd12a9cdf478c10076e9c42094e9d9250 upstream. On a 32-bit machine, BIT() macro does not give the required bit value if the bit is mroe than 31. In ieee802_11_parse_elems_crc(), BIT() is suppossed to get the bit value more than 31 (42 (id of ERP_INFO_IE), 37 (CHANNEL_SWITCH_IE), (42), 32 (POWER_CONSTRAINT_IE), 45 (HT_CAP_IE), 61 (HT_INFO_IE)). As we do not get the required bit value for the above IEs, crc over these IEs are never calculated, so any dynamic change in these IEs after the association is not really handled on 32-bit platforms. This patch fixes this issue. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit a4b8b8eb2533da448fcaaef2467a1cc4489057b9 Author: Ian Jackson Date: Wed Nov 18 11:08:11 2009 +0100 Serial: Do not read IIR in serial8250_start_tx when UART_BUG_TXEN commit 68cb4f8e246bbbc649980be0628cae9265870a91 upstream. Do not read IIR in serial8250_start_tx when UART_BUG_TXEN Reading the IIR clears some oustanding interrupts so it is not safe. Instead, simply transmit immediately if the buffer is empty without regard to IIR. Signed-off-by: Ian Jackson Reviewed-by: Markus Armbruster Reviewed-by: Jiri Kosina Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit fa8e26457e28606446f9afd6566cead9d0418b73 Author: Alan Stern Date: Fri Dec 4 11:06:57 2009 -0500 Driver core: fix race in dev_driver_string commit 3589972e51fac1e02d0aaa576fa47f568cb94d40 upstream. This patch (as1310) works around a race in dev_driver_string(). If the device is unbound while the function is running, dev->driver might become NULL after we test it and before we dereference it. Signed-off-by: Alan Stern Cc: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 9f2813ec1f4868d07d8a16f4a9c4932819fc5d8e Author: Mathieu Desnoyers Date: Tue Nov 17 14:40:26 2009 -0800 debugfs: fix create mutex racy fops and private data commit d3a3b0adad0865c12e39b712ca89efbd0a3a0dbc upstream. Setting fops and private data outside of the mutex at debugfs file creation introduces a race where the files can be opened with the wrong file operations and private data. It is easy to trigger with a process waiting on file creation notification. Signed-off-by: Mathieu Desnoyers Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 5451f13711a2af1fffdfe0d1e2faf02449fdab28 Author: Sukadev Bhattiprolu Date: Tue Nov 17 18:35:43 2009 -0800 devpts_get_tty() should validate inode commit edfacdd6f81119b9005615593f2cbd94b8c7e2d8 upstream. devpts_get_tty() assumes that the inode passed in is associated with a valid pty. But if the only reference to the pty is via a bind-mount, the inode passed to devpts_get_tty() while valid, would refer to a pty that no longer exists. With a lot of debug effort, Grzegorz Nosek developed a small program (see below) to reproduce a crash on recent kernels. This crash is a regression introduced by the commit: commit 527b3e4773628b30d03323a2cb5fb0d84441990f Author: Sukadev Bhattiprolu Date: Mon Oct 13 10:43:08 2008 +0100 To fix, ensure that the dentry associated with the inode has not yet been deleted/unhashed by devpts_pty_kill(). See also: https://lists.linux-foundation.org/pipermail/containers/2009-July/019273.html tty-bug.c: #define _GNU_SOURCE #include #include #include #include #include #include #include #include void dummy(int sig) { } static int child(void *unused) { int fd; signal(SIGINT, dummy); signal(SIGHUP, dummy); pause(); /* cheesy synchronisation to wait for /dev/pts/0 to appear */ mount("/dev/pts/0", "/dev/console", NULL, MS_BIND, NULL); sleep(2); fd = open("/dev/console", O_RDWR); dup(0); dup(0); write(1, "Hello world!\n", sizeof("Hello world!\n")-1); return 0; } int main(void) { pid_t pid; char *stack; stack = malloc(16384); pid = clone(child, stack+16384, CLONE_NEWNS|SIGCHLD, NULL); open("/dev/ptmx", O_RDWR|O_NOCTTY|O_NONBLOCK); unlockpt(fd); grantpt(fd); sleep(2); kill(pid, SIGHUP); sleep(1); return 0; /* exit before child opens /dev/console */ } Reported-by: Grzegorz Nosek Signed-off-by: Sukadev Bhattiprolu Tested-by: Serge Hallyn Signed-off-by: Greg Kroah-Hartman commit bb2fb5d6a16840cf98af1a5d405a583c200d87a8 Author: Andi Kleen Date: Tue Dec 8 13:19:42 2009 +0100 futex: Take mmap_sem for get_user_pages in fault_in_user_writeable commit 722d0172377a5697919b9f7e5beb95165b1dec4e upstream. get_user_pages() must be called with mmap_sem held. Signed-off-by: Andi Kleen Cc: Andrew Morton Cc: Nick Piggin Cc: Darren Hart Cc: Peter Zijlstra LKML-Reference: <20091208121942.GA21298@basil.fritz.box> Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit f1416ea0278b4bb6629d160e81e61ef8b6bffb4a Author: NeilBrown Date: Mon Dec 14 12:49:46 2009 +1100 md/bitmap: protect against bitmap removal while being updated. commit aa5cbd103887011b4830355f88fb055f9ad2d556 upstream. A write intent bitmap can be removed from an array while the array is active. When this happens, all IO is suspended and flushed before the bitmap is removed. However it is possible that bitmap_daemon_work is still running to clear old bits from the bitmap. If it is, it can dereference the bitmap after it has been freed. So introduce a new mutex to protect bitmap_daemon_work and get it before destroying a bitmap. This is suitable for any current -stable kernel. Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman commit e4f676cea796e170fcd8561c8e2a234724d05f35 Author: Trond Myklebust Date: Thu Dec 10 09:05:55 2009 -0500 NFS: Fix nfs_migrate_page() commit 190f38e5cedc910940b1da9015f00458c18f97b4 upstream. The call to migrate_page() will cause the page->private field to be cleared. Also fix up the locking around the page->private transfer, so that we ensure that calls to nfs_page_find_request() don't end up racing. Finally, fix up a double free bug: nfs_unlock_request() already calls nfs_release_request() for us... Reported-by: Wu Fengguang Tested-by: Andi Kleen Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit b9058d460800ee672e90d09f7419117baa64f045 Author: Roel Kluin Date: Tue Dec 8 13:13:03 2009 -0500 SUNRPC: IS_ERR/PTR_ERR confusion commit 480e3243df156e39eea6c91057e2ae612a6bbe19 upstream. IS_ERR returns 1 or 0, PTR_ERR returns the error value. Signed-off-by: Roel Kluin Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman commit 037b7867ec53baa0dea5d05d4201e4fbf2405fc3 Author: Amerigo Wang Date: Mon Dec 14 17:57:37 2009 -0800 hfs: fix a potential buffer overflow commit ec81aecb29668ad71f699f4e7b96ec46691895b6 upstream. A specially-crafted Hierarchical File System (HFS) filesystem could cause a buffer overflow to occur in a process's kernel stack during a memcpy() call within the hfs_bnode_read() function (at fs/hfs/bnode.c:24). The attacker can provide the source buffer and length, and the destination buffer is a local variable of a fixed length. This local variable (passed as "&entry" from fs/hfs/dir.c:112 and allocated on line 60) is stored in the stack frame of hfs_bnode_read()'s caller, which is hfs_readdir(). Because the hfs_readdir() function executes upon any attempt to read a directory on the filesystem, it gets called whenever a user attempts to inspect any filesystem contents. [amwang@redhat.com: modify this patch and fix coding style problems] Signed-off-by: WANG Cong Cc: Eugene Teo Cc: Roman Zippel Cc: Al Viro Cc: Christoph Hellwig Cc: Alexey Dobriyan Cc: Dave Anderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 08d05bad84c4cc91a92ac9aa8c3106610cc0584b Author: Igor Grinberg Date: Sun Dec 6 15:45:43 2009 +0200 pxa/em-x270: fix usb hub power up/reset sequence commit 1b82e4c32fba96d8805b1e2126ba5382e56fac32 upstream. Signed-off-by: Igor Grinberg Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao Signed-off-by: Greg Kroah-Hartman commit 61039163321943e3279b89f18e7662e5e596c3d9 Author: Russ Dill Date: Mon Dec 14 21:45:35 2009 -0700 USB: Close usb_find_interface race v3 commit c2d284ee04ab6f6718de2ddcf1b43160e046c41d upstream. USB drivers that create character devices call usb_register_dev in their probe function. This associates the usb_interface device with that minor number and creates the character device and announces it to the world. However, the driver's probe function is called before the new usb_interface is added to the driver's klist_devices. This is a problem because userspace will respond to the character device creation announcement by opening the character device. The driver's open function will the call usb_find_interface to find the usb_interface associated with that minor number. usb_find_interface will walk the driver's list of devices and find the usb_interface with the matching minor number. Because the announcement happens before the usb_interface is added to the driver's klist_devices, a race condition exists. A straightforward fix is to walk the list of devices on usb_bus_type instead since the device is added to that list before the announcement occurs. bus_find_device calls get_device to bump the reference count on the found device. It is arguable that the reference count should be dropped by the caller of usb_find_interface instead of usb_find_interface, however, the current users of usb_find_interface do not expect this. The original version of this patch only matched against minor number instead of driver and minor number. This version matches against both. Signed-off-by: Russ Dill Signed-off-by: Greg Kroah-Hartman commit 3d5536bccf57b761f41f0ac1d7453e9997b4fdbf Author: Alan Stern Date: Mon Dec 7 16:39:16 2009 -0500 USB: usb-storage: add BAD_SENSE flag commit a0bb108112a872c0b0c4b3ef4974f95fb75b155d upstream. This patch (as1311) fixes a problem in usb-storage: Some devices are pretty broken when it comes to reporting sense data. The information they send back indicates that they have more than 18 bytes of sense data available, but when the system asks for more than 18 they fail or hang. The symptom is that probing fails with multiple resets. The patch adds a new BAD_SENSE flag to indicate that usb-storage should never ask for more than 18 bytes of sense data. The flag can be set in an unusual_devs entry or via the "quirks=" module parameter, and it is set automatically whenever a REQUEST SENSE command for more than 18 bytes fails or times out. An unusual_devs entry is added for the Agfa photo frame, which uses a Prolific chip having this bug. Signed-off-by: Alan Stern Tested-by: Daniel Kukula Signed-off-by: Greg Kroah-Hartman commit f4c0cf18d2b21dd614662c3b95ce0ffd0a4aa881 Author: Andre Herms Date: Thu Nov 19 18:14:49 2009 +0100 USB: usbtmc: repeat usb_bulk_msg until whole message is transfered commit ec412b92dbe3ea839716853eea058d1bcc5e6ca4 upstream. usb_bulk_msg() transfers only bytes up to the maximum packet size. It must be repeated by the usbtmc driver until all bytes of a TMC message are transfered. Without this patch, ETIMEDOUT is reported when writing TMC messages larger than the maximum USB bulk size and the transfer remains incomplete. The user will notice that the device hangs and must be reset by either closing the application or pulling the plug. Signed-off-by: Andre Herms Signed-off-by: Greg Kroah-Hartman commit fdc28ded337a4eab23e4326924686f127d7a9cf8 Author: Zhang Le Date: Tue Nov 17 14:53:42 2009 -0800 USB: option.c: add support for D-Link DWM-162-U5 commit 54a8e144acad6506920f385f4ef2779664f05b21 upstream. Add D-Link DWM-162-U5 device id 1e0e:ce16 into option driver. The device has 4 interfaces, of which 1 is handled by storage and the other 3 by option driver. The device appears first as CD-only 05c6:2100 device and must be switched to 1e0e:ce16 mode either by using "eject CD" or usb_modeswitch. The MessageContent for usb_modeswitch.conf is: "55534243e0c26a85000000000000061b000000020000000000000000000000" Signed-off-by: Zhang Le Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d25997311e1bf8c338db97558666b7642919b820 Author: Sergei Shtylyov Date: Mon Nov 16 16:24:05 2009 +0530 USB: musb_gadget_ep0: fix unhandled endpoint 0 IRQs, again commit 196f1b7a387546f425df2f1fad26772e3d513aea upstream. Commit a5073b52833e4df8e16c93dc4cbb7e0c558c74a2 (musb_gadget: fix unhandled endpoint 0 IRQs) somehow missed its key change: "The gadget EP0 code routinely ignores an interrupt at end of the data phase because of musb_g_ep0_giveback() resetting the state machine to "idle, waiting for SETUP" phase prematurely." So, the majority of the cases of unhandled IRQs is still unfixed... Signed-off-by: Sergei Shtylyov Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 7f0d909acd1644a1eb313c7f67f17f9aa58c9ac6 Author: Sarah Sharp Date: Tue Dec 1 10:37:07 2009 -0800 USB: xhci: Add correct email and files to MAINTAINERS entry. commit 36d0344c254a7b333272757f858c403ea3a2d29f upstream. Add the xHCI driver files to its MAINTAINERS entry so that I'm Cc'd on cleanup patches. Update the email address to one I actually use for sending patches and responding to Linux mailing list emails. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit b71a005bac02d0f68ba2d93f47cd58afcd563149 Author: Theodore Ts'o Date: Sun Nov 15 15:31:37 2009 -0500 jbd2: don't wipe the journal on a failed journal checksum commit e6a47428de84e19fda52f21ab73fde2906c40d09 upstream. If there is a failed journal checksum, don't reset the journal. This allows for userspace programs to decide how to recover from this situation. It may be that ignoring the journal checksum failure might be a better way of recovering the file system. Once we add per-block checksums, we can definitely do better. Until then, a system administrator can try backing up the file system image (or taking a snapshot) and and trying to determine experimentally whether ignoring the checksum failure or aborting the journal replay results in less data loss. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 943e167cb3e8fb191894bde8a4a75db78531a7c8 Author: Sebastian Andrzej Siewior Date: Sun Nov 29 19:46:02 2009 +0100 UBI: flush wl before clearing update marker commit 6afaf8a484cbbfd2ccf58a4e5396d1f280469789 upstream. ubiupdatevol -t does the following: - ubi_start_update() - set_update_marker() - for all LEBs ubi_eba_unmap_leb() - clear_update_marker() - ubi_wl_flush() ubi_wl_flush() physically erases all PEB, once it returns all PEBs are empty. clear_update_marker() has the update marker written after return. If there is a power cut between the last two functions then the UBI volume has no longer the "update" marker set and may have some valid LEBs while some of them may be gone. If that volume in question happens to be a UBIFS volume, then mount will fail with |UBIFS error (pid 1361): ubifs_read_node: bad node type (255 but expected 6) |UBIFS error (pid 1361): ubifs_read_node: bad node at LEB 0:0 |Not a node, first 24 bytes: |00000000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff if there is at least one valid LEB and the wear-leveling worker managed to clear LEB 0. The patch waits for the wl worker to finish prior clearing the "update" marker on flash. The two new LEB which are scheduled for erasing after clear_update_marker() should not matter because they are only visible to UBI. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Artem Bityutskiy Signed-off-by: Greg Kroah-Hartman commit 220d5b50cab3a384584f767075b02bdfc53c8c77 Author: Alexey Dobriyan Date: Mon Dec 14 17:57:34 2009 -0800 bsdacct: fix uid/gid misreporting commit 4b731d50ff3df6b9141a6c12b088e8eb0109e83c upstream. commit d8e180dcd5bbbab9cd3ff2e779efcf70692ef541 "bsdacct: switch credentials for writing to the accounting file" introduced credential switching during final acct data collecting. However, uid/gid pair continued to be collected from current which became credentials of who created acct file, not who exits. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14676 Signed-off-by: Alexey Dobriyan Reported-by: Juho K. Juopperi Acked-by: Serge Hallyn Acked-by: David Howells Reviewed-by: Michal Schmidt Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 839646ece349e6ac42ecae95200c9e950c14e4de Author: Roel Kluin Date: Fri Nov 20 15:34:13 2009 -0300 V4L/DVB: Fix test in copy_reg_bits() commit c95a419a5604ec8a23cd73f61e9bb151e8cbe89b upstream. The reg_pair2[j].reg was tested twice. Signed-off-by: Roel Kluin Acked-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman commit ea76a1295e44ace82062690bca71436f03b26c39 Author: Hendrik Brueckner Date: Mon Dec 7 12:44:42 2009 +0100 s390: clear high-order bits of registers after sam64 commit cf87b7439ec81b9374e7772e44e9cb2eb9e57160 upstream. When the kernel is IPLed without the CLEAR option and switches to 64-bit, the high-order half of the registers might contain random values. This can cause addressing exceptions and the kernel enters an interrupt loop. Initialize the high-order half of the general purpose registers with zeros after switching to 64-bit mode. Signed-off-by: Hendrik Brueckner Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman commit effa97cc19cf828bc21c950c1c19e2deef11e874 Author: Sergei Shtylyov Date: Fri Nov 27 22:29:02 2009 +0400 pata_hpt{37x|3x2n}: fix timing register masks (take 2) commit 5600c70e576199a7552e1c0fff43f3fe16f5566e upstream. These drivers inherited from the older 'hpt366' IDE driver the buggy timing register masks in their set_piomode() metods. As a result, too low command cycle active time is programmed for slow PIO modes. Quite fortunately, it's later "fixed up" by the set_dmamode() methods which also "helpfully" reprogram the command timings, usually to PIO mode 4; unfortunately, setting an UltraDMA mode #N also reprograms already set PIO data timings, usually to MWDMA mode # max(N, 2) timings... However, the drivers added some breakage of their own too: the bit that they set/clear to control the FIFO is sometimes wrong -- it's actually the MSB of the command cycle setup time; also, setting it in DMA mode is wrong as this bit is only for PIO actually and clearing it for PIO modes is not needed as no mode in any timing table has it set... Fix all this, inverting the masks while at it, like in the 'hpt366' and 'pata_hpt366' drivers; bump the drivers' versions, accounting for recent patches that forgot to do it... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik Signed-off-by: Greg Kroah-Hartman commit dff8a48a124bd07016f5900061bdf6f4cef6a953 Author: Dave Jones Date: Tue Nov 10 15:01:20 2009 -0500 x86: Fix typo in Intel CPU cache size descriptor commit e02e0e1a130b9ca37c5186d38ad4b3aaf58bb149 upstream. I double-checked the datasheet. One of the existing descriptors has a typo: it should be 2MB not 2038 KB. Signed-off-by: Dave Jones LKML-Reference: <20091110200120.GA27090@redhat.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 04071db2c1079698a87d371fd67aef4ad6cd6db1 Author: Dave Jones Date: Tue Nov 10 13:49:24 2009 -0500 x86: Add new Intel CPU cache size descriptors commit 85160b92fbd35321104819283c91bfed2b553e3c upstream. The latest rev of Intel doc AP-485 details new cache descriptors that we don't yet support. 12MB, 18MB and 24MB 24-way assoc L3 caches. Signed-off-by: Dave Jones LKML-Reference: <20091110184924.GA20337@redhat.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit cf8b14f356f1ab35c88209c7efb3050bbb473946 Author: Cliff Wickman Date: Fri Dec 11 11:36:18 2009 -0600 x86: Fix duplicated UV BAU interrupt vector commit 1d865fb728bd6bbcdfbd6ec1e2b8ade3b4805641 upstream. Interrupt vector 0xec has been doubly defined in irq_vectors.h It seems arbitrary whether LOCAL_PENDING_VECTOR or UV_BAU_MESSAGE is the higher number. As long as they are unique. If they are not unique we'll hit a BUG in alloc_system_vector(). Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 3715cace63b4751445181cefcb2eba77b30d8525 Author: Cliff Wickman Date: Thu Nov 19 17:12:43 2009 -0600 x86: SGI UV: Fix BAU initialization commit e38e2af1c57c3eb5211331a5b4fcaae0c4a2a918 upstream. A memory mapped register that affects the SGI UV Broadcast Assist Unit's interrupt handling may sometimes be unintialized. Remove the condition on its initialization, as that condition can be randomly satisfied by a hardware reset. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit e8aab284380017e1aee419ab45e87d89eff8cf00 Author: Jan Beulich Date: Tue Dec 8 11:21:37 2009 +0900 x86/mce: Set up timer unconditionally commit bc09effabf0c5c6c7021e5ef9af15a23579b32a8 upstream. mce_timer must be passed to setup_timer() in all cases, no matter whether it is going to be actually used. Otherwise, when the CPU gets brought down, its call to del_timer_sync() will never return, as the timer won't have a base associated, and hence lock_timer_base() will loop infinitely. Signed-off-by: Jan Beulich Signed-off-by: Hidetoshi Seto LKML-Reference: <4B1DB831.2030801@jp.fujitsu.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 05217134d25f399adb7bb3db195e7dc64ad77289 Author: Hidetoshi Seto Date: Thu Dec 3 11:33:08 2009 +0900 x86, mce: don't restart timer if disabled commit fe5ed91ddce85a0ed0e4f92c10b099873ef62167 upstream. Even it is in error path unlikely taken, add_timer_on() at CPU_DOWN_FAILED* needs to be skipped if mce_timer is disabled. Signed-off-by: Hidetoshi Seto Cc: Andi Kleen Cc: Huang Ying Cc: Jan Beulich Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit ceb9c79365c6eb4971effbb28c118874ae83410e Author: Thomas Gleixner Date: Sat Nov 28 15:03:03 2009 +0100 x86: Use -maccumulate-outgoing-args for sane mcount prologues commit b8b7d791a8ff01d2380089279a69afa99115fb23 upstream. commit 746357d (x86: Prevent GCC 4.4.x (pentium-mmx et al) function prologue wreckage) uses -mtune=generic to work around the function prologue problem with mcount on -march=pentium-mmx and others. Jakub pointed out that we can use -maccumulate-outgoing-args instead which is selected by -mtune=generic and prevents the problem without losing the -march specific optimizations. Pointed-out-by: Jakub Jelinek Signed-off-by: Thomas Gleixner Cc: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit 8de7f4a42cbdaa15a05b22fcfa01d38b6f8e0f5b Author: Thomas Gleixner Date: Fri Nov 20 12:01:43 2009 +0100 x86: Prevent GCC 4.4.x (pentium-mmx et al) function prologue wreckage commit 746357d6a526d6da9d89a2ec645b28406e959c2e upstream. When the kernel is compiled with -pg for tracing GCC 4.4.x inserts stack alignment of a function _before_ the mcount prologue if the -march=pentium-mmx is set and -mtune=generic is not set. This breaks the assumption of the function graph tracer which expects that the mcount prologue push %ebp mov %esp, %ebp is the first stack operation in a function because it needs to modify the function return address on the stack to trap into the tracer before returning to the real caller. The generated code is: push %edi lea 0x8(%esp),%edi and $0xfffffff0,%esp pushl -0x4(%edi) push %ebp mov %esp,%ebp so the tracer modifies the copy of the return address which is stored after the stack alignment and therefor does not trap the return which in turn breaks the call chain logic of the tracer and leads to a kernel panic. Aside of the fact that the generated code is horrible for no good reason other -march -mtune options generate the expected: push %ebp mov %esp,%ebp and $0xfffffff0,%esp which does the same and keeps everything intact. After some experimenting we found out that this problem is restricted to gcc4.4.x and to the following -march settings: i586, pentium, pentium-mmx, k6, k6-2, k6-3, winchip-c6, winchip2, c3, geode By adding -mtune=generic the code generator produces always the expected code. So forcing -mtune=generic when CONFIG_FUNCTION_GRAPH_TRACER=y is not pretty, but at the moment the only way to prevent that the kernel trips over gcc-shrooms induced code madness. Most distro kernels have CONFIG_X86_GENERIC=y anyway which forces -mtune=generic as well so it will not impact those. References: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42109 http://lkml.org/lkml/2009/11/19/17 Signed-off-by: Thomas Gleixner LKML-Reference: Cc: Linus Torvalds Cc: Andrew Morton Cc: Ingo Molnar Cc: Peter Zijlstra Cc: H. Peter Anvin Cc: Steven Rostedt Cc: Frederic Weisbecker , Cc: Jeff Law Cc: gcc@gcc.gnu.org Cc: David Daney Cc: Andrew Haley Cc: Richard Guenther Signed-off-by: Greg Kroah-Hartman commit a55770ccda90d9c1ed3b2408ea93f346278e6522 Author: Glauber Costa Date: Tue Oct 6 13:24:50 2009 -0400 KVM: x86: include pvclock MSRs in msrs_to_save commit e3267cbbbfbcbe9c18833e89b10beabb1117cb55 upstream. For a while now, we are issuing a rdmsr instruction to find out which msrs in our save list are really supported by the underlying machine. However, it fails to account for kvm-specific msrs, such as the pvclock ones. This patch moves then to the beginning of the list, and skip testing them. Signed-off-by: Glauber Costa Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit 310c1a04807321c666445292db4b9147f1174c08 Author: Marcelo Tosatti Date: Sat Oct 17 22:47:23 2009 -0300 KVM: fix irq_source_id size verification commit cd5a2685de4a642fd0bd763e8c19711ef08dbe27 upstream. find_first_zero_bit works with bit numbers, not bytes. Fixes https://sourceforge.net/tracker/?func=detail&aid=2847560&group_id=180599&atid=893831 Reported-by: "Xu, Jiajun" Signed-off-by: Marcelo Tosatti Signed-off-by: Greg Kroah-Hartman commit fff7d05d83d41107dd1c8740cfbfd50fe3ce87e8 Author: Carsten Otte Date: Thu Nov 19 14:21:16 2009 +0100 KVM: s390: Make psw available on all exits, not just a subset commit d7b0b5eb3000c6fb902f08c619fcd673a23d8fab upstream. This patch moves s390 processor status word into the base kvm_run struct and keeps it up-to date on all userspace exits. The userspace ABI is broken by this, however there are no applications in the wild using this. A capability check is provided so users can verify the updated API exists. Signed-off-by: Carsten Otte Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit f7b0fd208527e8f755e06411821efb5cc89c0868 Author: Carsten Otte Date: Mon Nov 30 17:14:41 2009 +0100 KVM: s390: Fix prefix register checking in arch/s390/kvm/sigp.c commit f50146bd7bdb75435638e60d4960edd9bcdf88b8 upstream. This patch corrects the checking of the new address for the prefix register. On s390, the prefix register is used to address the cpu's lowcore (address 0...8k). This check is supposed to verify that the memory is readable and present. copy_from_guest is a helper function, that can be used to read from guest memory. It applies prefixing, adds the start address of the guest memory in user, and then calls copy_from_user. Previous code was obviously broken for two reasons: - prefixing should not be applied here. The current prefix register is going to be updated soon, and the address we're looking for will be 0..8k after we've updated the register - we're adding the guest origin (gmsor) twice: once in subject code and once in copy_from_guest With kuli, we did not hit this problem because (a) we were lucky with previous prefix register content, and (b) our guest memory was mmaped very low into user address space. Signed-off-by: Carsten Otte Reported-by: Alexander Graf Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit b63569376aeca6300e10bf9e5ccfc49758407dbf Author: Avi Kivity Date: Tue Nov 24 15:20:15 2009 +0200 KVM: x86 emulator: limit instructions to 15 bytes commit eb3c79e64a70fb8f7473e30fa07e89c1ecc2c9bb upstream. While we are never normally passed an instruction that exceeds 15 bytes, smp games can cause us to attempt to interpret one, which will cause large latencies in non-preempt hosts. Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman commit 7cb056b8203edc77c0b69431cf1312805a008484 Author: Jaroslav Kysela Date: Wed Dec 9 10:44:47 2009 +0100 ALSA: hda - Terradici HDA controllers does not support 64-bit mode commit 396087eaead95fcb29eb36f1e59517aeb58c545e upstream. Confirmed from vendor and tests in RedHat bugzilla #536782 . Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit f6f725781c331351cdcaaec322706d342e285122 Author: Takashi Iwai Date: Fri Dec 11 12:51:05 2009 +0100 ALSA: hrtimer - Fix lock-up commit fcfdebe70759c74e2e701f69aaa7f0e5e32cf5a6 upstream. The timer stop callback can be called from snd_timer_interrupt(), which is called from the hrtimer callback. Since hrtimer_cancel() waits for the callback completion, this eventually results in a lock-up. This patch fixes the problem by just toggling a flag at stop callback and call hrtimer_cancel() later. Reported-and-tested-by: Wojtek Zabolotny Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 630d0a27ad4eabede5defec0595b8a703d5b6b71 Author: Feng Tang Date: Thu Sep 3 16:32:53 2009 +0800 hrtimer: Fix /proc/timer_list regression commit 8629ea2eaba8ca0de2e38ce1b4a825e16255976e upstream. commit 507e1231 (timer stats: Optimize by adding quick check to avoid function calls) introduced a regression in /proc/timer_list. /proc/timer_list shows now #0: , tick_sched_timer, S:01, <(null)>, /-1 instead of #0: , tick_sched_timer, S:01, hrtimer_start, swapper/0 Revert the hrtimer quick check for now. The optimization needs more thought, but this is neither 2.6.32-rc7 nor stable material. [ tglx: - Removed unrelated changes from the original patch - Prevent unneccesary call to timer_stats_update_stats - massaged the changelog ] Signed-off-by: Feng Tang LKML-Reference: Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit 8bf3d79bc401ca417ccf9fc076d3295d1a71dbf5 Author: Luis R. Rodriguez Date: Wed Nov 25 17:23:26 2009 -0500 ath5k: enable EEPROM checksum check commit 512414b0bed0d376ac4d5ec1dd6f0b1a3551febc upstream. Without this we have no gaurantee of the integrity of the EEPROM and are likely to encounter a lot of bogus bug reports due to actual issues on the EEPROM. With the EEPROM checksum check in place we can easily rule those issues out. If you run patch during a revert *you* have a card with a busted EEPROM and only older kernel will support that concoction. This patch is a trade off between not accepitng bogus EEPROMs and avoiding bogus bug reports allowing developers to focus instead on real concrete issues. If stable keeps bogus bug reports because of a possibly busted EEPROM feel free to apply this there too. Tested on an AR5414 Cc: jirislaby@gmail.com Cc: akpm@linux-foundation.org Cc: rjw@sisk.pl Cc: me@bobcopeland.com Cc: david.quan@atheros.com Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit f0da7d9ab2ab222669e51f0404dc9b4e2fef9944 Author: Bob Copeland Date: Mon Nov 16 08:30:29 2009 -0500 ath5k: allow setting txpower to 0 commit 2eb2fa67e5462a36e98172fb92c78bc405b3035f upstream. As a holdover from earlier code when we used to set the power limit to '0' after a reset to configure the default transmit power, ath5k interprets txpower=0 as 12.5 dBm. Fix that by just passing 0 through. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=14567 Reported-by: Daniel Folkers Tested-by: Daniel Folkers Signed-off-by: Bob Copeland Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit ee17dd1efa301f6d113f461db7e2b9c06655f3fb Author: Michael Buesch Date: Mon Nov 23 20:58:06 2009 +0100 ssb: Fix range check in sprom write commit e33761e6f23881de9f3ee77cc2204ab2e26f3d9a upstream. The range check in the sprom image parser hex2sprom() is broken. One sprom word is 4 hex characters. This fixes the check and also adds much better sanity checks to the code. We better make sure the image is OK by doing some sanity checks to avoid bricking the device by accident. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit 8224532f94891bab12398b06c6359f0ce148a285 Author: Mikael Pettersson Date: Thu Dec 3 15:52:44 2009 +0100 x86, apic: Enable lapic nmi watchdog on AMD Family 11h commit 7d1849aff6687a135a8da3a75e32a00e3137a5e2 upstream. The x86 lapic nmi watchdog does not recognize AMD Family 11h, resulting in: NMI watchdog: CPU not supported As far as I can see from available documentation (the BKDM), family 11h looks identical to family 10h as far as the PMU is concerned. Extending the check to accept family 11h results in: Testing NMI watchdog ... OK. I've been running with this change on a Turion X2 Ultra ZM-82 laptop for a couple of weeks now without problems. Signed-off-by: Mikael Pettersson Cc: Andreas Herrmann Cc: Joerg Roedel LKML-Reference: <19223.53436.931768.278021@pilspetsen.it.uu.se> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 78a794f462df2a701b754fd17415a88b8bf1bc61 Author: Leann Ogasawara Date: Fri Dec 4 15:42:22 2009 -0800 x86: ASUS P4S800 reboot=bios quirk commit 4832ddda2ec4df96ea1eed334ae2dbd65fc1f541 upstream. Bug reporter noted their system with an ASUS P4S800 motherboard would hang when rebooting unless reboot=b was specified. Their dmidecode didn't contain descriptive System Information for Manufacturer or Product Name, so I used their Base Board Information to create a reboot quirk patch. The bug reporter confirmed this patch resolves the reboot hang. Handle 0x0001, DMI type 1, 25 bytes System Information Manufacturer: System Manufacturer Product Name: System Name Version: System Version Serial Number: SYS-1234567890 UUID: E0BFCD8B-7948-D911-A953-E486B4EEB67F Wake-up Type: Power Switch Handle 0x0002, DMI type 2, 8 bytes Base Board Information Manufacturer: ASUSTeK Computer INC. Product Name: P4S800 Version: REV 1.xx Serial Number: xxxxxxxxxxx BugLink: http://bugs.launchpad.net/bugs/366682 ASUS P4S800 will hang when rebooting unless reboot=b is specified. Add a quirk to reboot through the bios. Signed-off-by: Leann Ogasawara LKML-Reference: <1259972107.4629.275.camel@emiko> Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 900f42a14f80f9bbb8e8695bb2fe38c310af656e Author: Joe Perches Date: Mon Nov 9 17:58:50 2009 -0800 x86: GART: pci-gart_64.c: Use correct length in strncmp commit 41855b77547fa18d90ed6a5d322983d3fdab1959 upstream. Signed-off-by: Joe Perches LKML-Reference: <1257818330.12852.72.camel@Joe-Laptop.home> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 704c528bee45fc37546542bf578181cec0845a67 Author: Tejun Heo Date: Mon Oct 26 15:41:46 2009 +0100 x86: Fix iommu=nodac parameter handling commit 2ae8bb75db1f3de422eb5898f2a063c46c36dba8 upstream. iommu=nodac should forbid dac instead of enabling it. Fix it. Signed-off-by: Tejun Heo Acked-by: FUJITA Tomonori Cc: Matteo Frigo LKML-Reference: <4AE5B52A.4050408@kernel.org> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 7da88e8e91d39462ca08393de81b78b9507f8281 Author: Darrick J. Wong Date: Wed Dec 2 15:05:56 2009 -0800 x86, Calgary IOMMU quirk: Find nearest matching Calgary while walking up the PCI tree commit 4528752f49c1f4025473d12bc5fa9181085c3f22 upstream. On a multi-node x3950M2 system, there's a slight oddity in the PCI device tree for all secondary nodes: 30:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1) \-33:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01) \-34:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04) ...as compared to the primary node: 00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev e1) \-01:00.0 VGA compatible controller: ATI Technologies Inc ES1000 (rev 02) 03:00.0 PCI bridge: IBM CalIOC2 PCI-E Root Port (rev 01) \-04:00.0 RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS 1078 (rev 04) In both nodes, the LSI RAID controller hangs off a CalIOC2 device, but on the secondary nodes, the BIOS hides the VGA device and substitutes the device tree ending with the disk controller. It would seem that Calgary devices don't necessarily appear at the top of the PCI tree, which means that the current code to find the Calgary IOMMU that goes with a particular device is buggy. Rather than walk all the way to the top of the PCI device tree and try to match bus number with Calgary descriptor, the code needs to examine each parent of the particular device; if it encounters a Calgary with a matching bus number, simply use that. Otherwise, we BUG() when the bus number of the Calgary doesn't match the bus number of whatever's at the top of the device tree. Extra note: This patch appears to work correctly for the x3950 that came before the x3950 M2. Signed-off-by: Darrick J. Wong Acked-by: Muli Ben-Yehuda Cc: FUJITA Tomonori Cc: Joerg Roedel Cc: Yinghai Lu Cc: Jon D. Mason Cc: Corinna Schultz LKML-Reference: <20091202230556.GG10295@tux1.beaverton.ibm.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit e81ccb78036da2a31adc51ed676dbf2f158374f7 Author: Joerg Roedel Date: Mon Nov 23 12:45:25 2009 +0100 x86/amd-iommu: un__init iommu_setup_msi commit 9f800de38b05d84809e89f16671d636a140eede7 upstream. This function may be called on the resume path and can not be dropped after booting. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit 430b6ab743b6448873d4d9382af6c3f860dfdbb4 Author: Joerg Roedel Date: Mon Nov 23 12:50:00 2009 +0100 x86/amd-iommu: attach devices to pre-allocated domains early commit be831297716036de5b24308447ecb69f1706a846 upstream. For some devices the ACPI table may define unity map requirements which must me met when the IOMMU is enabled. So we need to attach devices to their domains as early as possible so that these mappings are in place when needed. This patch assigns the domains right after they are allocated. Otherwise this can result in I/O page faults before a driver binds to a device and BIOS is still using it. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman commit 35c1ee3e78766d5666f418af638def9c67e63ecb Author: Mike Galbraith Date: Tue Nov 10 03:50:02 2009 +0100 sched: Fix and clean up rate-limit newidle code commit eae0c9dfb534cb3449888b9601228efa6480fdb5 upstream. Commit 1b9508f, "Rate-limit newidle" has been confirmed to fix the netperf UDP loopback regression reported by Alex Shi. This is a cleanup and a fix: - moved to a more out of the way spot - fix to ensure that balancing doesn't try to balance runqueues which haven't gone online yet, which can mess up CPU enumeration during boot. Reported-by: Alex Shi Reported-by: Zhang, Yanmin Signed-off-by: Mike Galbraith Acked-by: Peter Zijlstra LKML-Reference: <1257821402.5648.17.camel@marge.simson.net> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 37ed2d7007a65874850f3e357c095806c3756330 Author: Mike Galbraith Date: Wed Nov 4 17:53:50 2009 +0100 sched: Rate-limit newidle commit 1b9508f6831e10d53256825de8904caa22d1ca2c upstream. Rate limit newidle to migration_cost. It's a win for all stages of sysbench oltp tests. Signed-off-by: Mike Galbraith Cc: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit ece125459cc4ea8ec5344a2d12cee4b42602b822 Author: Mike Galbraith Date: Thu Nov 5 10:57:46 2009 +0100 sched: Fix affinity logic in select_task_rq_fair() commit fd210738f6601d0fb462df9a2fe5a41896ff6a8f upstream. Ingo Molnar reported: [ 26.804000] BUG: using smp_processor_id() in preemptible [00000000] code: events/1/10 [ 26.808000] caller is vmstat_update+0x26/0x70 [ 26.812000] Pid: 10, comm: events/1 Not tainted 2.6.32-rc5 #6887 [ 26.816000] Call Trace: [ 26.820000] [] ? printk+0x28/0x3c [ 26.824000] [] debug_smp_processor_id+0xf0/0x110 [ 26.824000] mount used greatest stack depth: 1464 bytes left [ 26.828000] [] vmstat_update+0x26/0x70 [ 26.832000] [] worker_thread+0x188/0x310 [ 26.836000] [] ? worker_thread+0x127/0x310 [ 26.840000] [] ? autoremove_wake_function+0x0/0x60 [ 26.844000] [] ? worker_thread+0x0/0x310 [ 26.848000] [] kthread+0x7c/0x90 [ 26.852000] [] ? kthread+0x0/0x90 [ 26.856000] [] kernel_thread_helper+0x7/0x10 [ 26.860000] BUG: using smp_processor_id() in preemptible [00000000] code: events/1/10 [ 26.864000] caller is vmstat_update+0x3c/0x70 Because this commit: a1f84a3: sched: Check for an idle shared cache in select_task_rq_fair() broke ->cpus_allowed. Signed-off-by: Mike Galbraith Cc: Peter Zijlstra Cc: arjan@infradead.org LKML-Reference: <1257415066.12867.1.camel@marge.simson.net> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit c2f1953231c6e99777633761c3bc0d2ca7ead20a Author: Mike Galbraith Date: Tue Oct 27 15:35:38 2009 +0100 sched: Check for an idle shared cache in select_task_rq_fair() commit a1f84a3ab8e002159498814eaa7e48c33752b04b upstream. When waking affine, check for an idle shared cache, and if found, wake to that CPU/sibling instead of the waker's CPU. This improves pgsql+oltp ramp up by roughly 8%. Possibly more for other loads, depending on overlap. The trade-off is a roughly 1% peak downturn if tasks are truly synchronous. Signed-off-by: Mike Galbraith Cc: Arjan van de Ven Cc: Peter Zijlstra LKML-Reference: <1256654138.17752.7.camel@marge.simson.net> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 7f112f35f0da073a10d4d3bfdfcef2955555e4f7 Author: Rafael J. Wysocki Date: Thu Dec 3 20:21:21 2009 +0100 PM / Runtime: Fix lockdep warning in __pm_runtime_set_status() commit bab636b921017f0db6e0c2979438f50b898a9808 upstream. Lockdep complains about taking the parent lock in __pm_runtime_set_status(), so mark it as nested. Signed-off-by: Rafael J. Wysocki Reported-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9f3bb2b1e8f891b008ab3d74d789444cab5ef695 Author: Kristian H��gsberg Date: Tue Dec 1 15:05:01 2009 -0500 perf: Don't free perf_mmap_data until work has been done commit ec70ccd806111ba3caf596def91a8580138b12db upstream. In the CONFIG_PERF_USE_VMALLOC case, perf_mmap_data_free() only schedules the cleanup of the perf_mmap_data struct. In that case we have to wait until the work has been done before we free data. Signed-off-by: Kristian H��gsberg Cc: David S. Miller Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Frederic Weisbecker LKML-Reference: <1259697901-1747-1-git-send-email-krh@bitplanet.net> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit b7b4aef82aeef0d9408951c8d1e7a2a6dd359921 Author: Xiao Guangrong Date: Tue Dec 1 17:30:08 2009 +0800 perf_event: Initialize data.period in perf_swevent_hrtimer() commit 59d069eb5ae9b033ed1c124c92e1532c4a958991 upstream. In current code in perf_swevent_hrtimer(), data.period is not initialized, The result is obvious wrong: # ./perf record -f -e cpu-clock make # ./perf report # Samples: 1740 # # Overhead Command ...... # ........ ........ .......................................... # 1025422183050275328.00% sh libc-2.9.90.so ... 1025422183050275328.00% perl libperl.so ... 1025422168240043264.00% perl [kernel] ... 1025422030011210752.00% perl [kernel] ... Signed-off-by: Xiao Guangrong Acked-by: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <4B14E220.2050107@cn.fujitsu.com> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit c64d2a3d2c5f192d859374e943968439afb0f995 Author: Arjan van de Ven Date: Fri Nov 13 21:47:33 2009 -0800 perf_event: Fix invalid type in ioctl definition commit 4c49b12853fbb5eff4849b7b6a1e895776f027a1 upstream. u64 is invalid in userspace headers, including ioctl definitions; use __u64 instead Signed-off-by: Arjan van de Ven LKML-Reference: <20091113214733.7cd76be9@infradead.org> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit b87444a84534cba3ba85536cabfcaf364c0fa940 Author: Paul E. McKenney Date: Tue Nov 10 13:37:19 2009 -0800 rcu: Remove inline from forward-referenced functions commit dbe01350fa8ce0c11948ab7d6be71a4d901be151 upstream. Some variants of gcc are reputed to dislike forward references to functions declared "inline". Remove the "inline" keyword from such functions. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca 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: Benjamin Gilbert LKML-Reference: <12578890422402-git-send-email-> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit c541f7c75c5d41c9a3f2c7599ee425547cc49a42 Author: Paul E. McKenney Date: Mon Nov 2 13:52:29 2009 -0800 rcu: Fix note_new_gpnum() uses of ->gpnum commit 9160306e6f5b68bb64630c9031c517ca1cf463db upstream. Impose a clear locking design on the note_new_gpnum() function's use of the ->gpnum counter. This is done by updating rdp->gpnum only from the corresponding leaf rcu_node structure's rnp->gpnum field, and even then only under the protection of that same rcu_node structure's ->lock field. Performance and scalability are maintained using a form of double-checked locking, and excessive spinning is avoided by use of the spin_trylock() function. The use of spin_trylock() is safe due to the fact that CPUs who fail to acquire this lock will try again later. The hierarchical nature of the rcu_node data structure limits contention (which could be limited further if need be using the RCU_FANOUT kernel parameter). Without this patch, obscure but quite possible races could result in a quiescent state that occurred during one grace period to be accounted to the following grace period, causing this following grace period to end prematurely. Not good! Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca 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 LKML-Reference: <12571987492350-git-send-email-> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 1a0d7df3352d775ae3e034b1f2658ea493055a30 Author: Paul E. McKenney Date: Mon Nov 2 13:52:28 2009 -0800 rcu: Fix synchronization for rcu_process_gp_end() uses of ->completed counter commit d09b62dfa336447c52a5ec9bb88adbc479b0f3b8 upstream. Impose a clear locking design on the rcu_process_gp_end() function's use of the ->completed counter. This is done by creating a ->completed field in the rcu_node structure, which can safely be accessed under the protection of that structure's lock. Performance and scalability are maintained by using a form of double-checked locking, so that rcu_process_gp_end() only acquires the leaf rcu_node structure's ->lock if a grace period has recently ended. This fix reduces rcutorture failure rate by at least two orders of magnitude under heavy stress with force_quiescent_state() being invoked artificially often. Without this fix, unsynchronized access to the ->completed field can cause rcu_process_gp_end() to advance callbacks whose grace period has not yet expired. (Bad idea!) Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca 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 LKML-Reference: <12571987494069-git-send-email-> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit 1aab3863fee66343b420cb1e5d268c3ee8da27a6 Author: Paul E. McKenney Date: Mon Nov 2 13:52:27 2009 -0800 rcu: Prepare for synchronization fixes: clean up for non-NO_HZ handling of ->completed counter commit 281d150c5f8892f158747594ab49ce2823fd8b8c upstream. Impose a clear locking design on non-NO_HZ handling of the ->completed counter. This increases the distance between the RCU and the CPU-hotplug mechanisms. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca 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 LKML-Reference: <12571987491353-git-send-email-> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit e39b7b492b646e803941117e5d879e49f40bb92f Author: Jay Fenlason Date: Fri Dec 11 14:23:58 2009 -0500 firewire: ohci: handle receive packets with a data length of zero commit 8c0c0cc2d9f4c523fde04bdfe41e4380dec8ee54 upstream. Queueing to receive an ISO packet with a payload length of zero silently does nothing in dualbuffer mode, and crashes the kernel in packet-per-buffer mode. Return an error in dualbuffer mode, because the DMA controller won't let us do what we want, and work correctly in packet-per-buffer mode. Signed-off-by: Jay Fenlason Signed-off-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman commit be58b8712a2309b71d1c99ae648bca2d34c55781 Author: zhao.ming9@zte.com.cn Date: Mon Dec 7 11:36:34 2009 +0800 USB: option: add pid for ZTE commit 8d87cacda7c8db5c131bfcaaa1d90bfe918c2ebc upstream. This patch adds ZTE modem devices. Signed-off-by: Ming Zhao Signed-off-by: Greg Kroah-Hartman commit 5a2ec9e5ec191d610d56433f3801b7fb9e250872 Author: Alan Stern Date: Mon Dec 7 16:47:43 2009 -0500 USB: usb-storage: fix bug in fill_inquiry commit f3f6faa9edf67c1018270793e0547b0f81abb47e upstream. This patch (as1312) fixes a minor bug in usb-storage. The fill_inquiry() routine neglects to pre-load the inquiry data buffer with spaces. As a result, if the vendor name is shorter than 8 characters or the product name is shorter than 16, the remainder will be filled with garbage. The patch also removes some unnecessary calls to strlen(). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit acb34e4d6b5d0601530e1dd10121a1ae209e3a44 Author: Greg Kroah-Hartman Date: Mon Dec 14 09:47:25 2009 -0800 Linux 2.6.32.1 commit abb247066f9769e90df87ab65e5c2bb4dbdb529c Author: Theodore Ts'o Date: Wed Dec 9 21:30:02 2009 -0500 ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem) (cherry picked from commit fab3a549e204172236779f502eccb4f9bf0dc87d) Fix the following potential circular locking dependency between mm->mmap_sem and ei->i_data_sem: ======================================================= [ INFO: possible circular locking dependency detected ] 2.6.32-04115-gec044c5 #37 ------------------------------------------------------- ureadahead/1855 is trying to acquire lock: (&mm->mmap_sem){++++++}, at: [] might_fault+0x5c/0xac but task is already holding lock: (&ei->i_data_sem){++++..}, at: [] ext4_fiemap+0x11b/0x159 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&ei->i_data_sem){++++..}: [] __lock_acquire+0xb67/0xd0f [] lock_acquire+0xdc/0x102 [] down_read+0x51/0x84 [] ext4_get_blocks+0x50/0x2a5 [] ext4_get_block+0xab/0xef [] do_mpage_readpage+0x198/0x48d [] mpage_readpages+0xd0/0x114 [] ext4_readpages+0x1d/0x1f [] __do_page_cache_readahead+0x12f/0x1bc [] ra_submit+0x21/0x25 [] filemap_fault+0x19f/0x32c [] __do_fault+0x55/0x3a2 [] handle_mm_fault+0x327/0x734 [] do_page_fault+0x292/0x2aa [] page_fault+0x25/0x30 [] clear_user+0x38/0x3c [] padzero+0x20/0x31 [] load_elf_binary+0x8bc/0x17ed [] search_binary_handler+0xc2/0x259 [] load_script+0x1b8/0x1cc [] search_binary_handler+0xc2/0x259 [] do_execve+0x1ce/0x2cf [] sys_execve+0x43/0x5a [] stub_execve+0x6a/0xc0 -> #0 (&mm->mmap_sem){++++++}: [] __lock_acquire+0xa11/0xd0f [] lock_acquire+0xdc/0x102 [] might_fault+0x89/0xac [] fiemap_fill_next_extent+0x95/0xda [] ext4_ext_fiemap_cb+0x138/0x157 [] ext4_ext_walk_space+0x178/0x1f1 [] ext4_fiemap+0x13c/0x159 [] do_vfs_ioctl+0x348/0x4d6 [] sys_ioctl+0x56/0x79 [] system_call_fastpath+0x16/0x1b other info that might help us debug this: 1 lock held by ureadahead/1855: #0: (&ei->i_data_sem){++++..}, at: [] ext4_fiemap+0x11b/0x159 stack backtrace: Pid: 1855, comm: ureadahead Not tainted 2.6.32-04115-gec044c5 #37 Call Trace: [] print_circular_bug+0xa8/0xb7 [] __lock_acquire+0xa11/0xd0f [] ? sched_clock+0x9/0xd [] lock_acquire+0xdc/0x102 [] ? might_fault+0x5c/0xac [] might_fault+0x89/0xac [] ? might_fault+0x5c/0xac [] ? __kmalloc+0x13b/0x18c [] fiemap_fill_next_extent+0x95/0xda [] ext4_ext_fiemap_cb+0x138/0x157 [] ? ext4_ext_fiemap_cb+0x0/0x157 [] ext4_ext_walk_space+0x178/0x1f1 [] ext4_fiemap+0x13c/0x159 [] ? might_fault+0x5c/0xac [] do_vfs_ioctl+0x348/0x4d6 [] ? __up_read+0x8d/0x95 [] ? retint_swapgs+0x13/0x1b [] sys_ioctl+0x56/0x79 [] system_call_fastpath+0x16/0x1b Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 0fd023ecf102ab0bd070d5affd73b18e6704ff0f Author: Akira Fujita Date: Sun Dec 6 23:38:31 2009 -0500 ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT (cherry picked from commit 4a58579b9e4e2a35d57e6c9c8483e52f6f1b7fd6) This patch fixes three problems in the handling of the EXT4_IOC_MOVE_EXT ioctl: 1. In current EXT4_IOC_MOVE_EXT, there are read access mode checks for original and donor files, but they allow the illegal write access to donor file, since donor file is overwritten by original file data. To fix this problem, change access mode checks of original (r->r/w) and donor (r->w) files. 2. Disallow the use of donor files that have a setuid or setgid bits. 3. Call mnt_want_write() and mnt_drop_write() before and after ext4_move_extents() calling to get write access to a mount. Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit eebb744d30006474a8f63af098bc71f0cb209677 Author: Jan Kara Date: Tue Dec 8 23:51:10 2009 -0500 ext4: Wait for proper transaction commit on fsync (cherry picked from commit b436b9bef84de6893e86346d8fbf7104bc520645) We cannot rely on buffer dirty bits during fsync because pdflush can come before fsync is called and clear dirty bits without forcing a transaction commit. What we do is that we track which transaction has last changed the inode and which transaction last changed allocation and force it to disk on fsync. Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit caa305aa349212c285ad9564b9ff2ffa040b193c Author: Dmitry Monakhov Date: Tue Dec 8 22:42:28 2009 -0500 ext4: fix incorrect block reservation on quota transfer. (cherry picked from commit 194074acacebc169ded90a4657193f5180015051) Inside ->setattr() call both ATTR_UID and ATTR_GID may be valid This means that we may end-up with transferring all quotas. Add we have to reserve QUOTA_DEL_BLOCKS for all quotas, as we do in case of QUOTA_INIT_BLOCKS. Signed-off-by: Dmitry Monakhov Reviewed-by: Mingming Cao Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit da2068b384bbfaae98ff55f1424be88c65bf801b Author: Dmitry Monakhov Date: Tue Dec 8 22:42:15 2009 -0500 ext4: quota macros cleanup (cherry picked from commit 5aca07eb7d8f14d90c740834d15ca15277f4820c) Currently all quota block reservation macros contains hard-coded "2" aka MAXQUOTAS value. This is no good because in some places it is not obvious to understand what does this digit represent. Let's introduce new macro with self descriptive name. Signed-off-by: Dmitry Monakhov Acked-by: Mingming Cao Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 6798788a72ee430761aa41c02f770ee3afb9c212 Author: Dmitry Monakhov Date: Tue Dec 8 22:41:52 2009 -0500 ext4: ext4_get_reserved_space() must return bytes instead of blocks (cherry picked from commit 8aa6790f876e81f5a2211fe1711a5fe3fe2d7b20) Signed-off-by: Dmitry Monakhov Reviewed-by: Eric Sandeen Acked-by: Mingming Cao Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 637b13106b744398b530fe916eb1556aeb7f6bca Author: Curt Wohlgemuth Date: Tue Dec 8 22:18:25 2009 -0500 ext4: remove blocks from inode prealloc list on failure (cherry picked from commit b844167edc7fcafda9623955c05e4c1b3c32ebc7) This fixes a leak of blocks in an inode prealloc list if device failures cause ext4_mb_mark_diskspace_used() to fail. Signed-off-by: Curt Wohlgemuth Acked-by: Aneesh Kumar K.V Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 1cd3f1980ce02bd814879ce1ac9cde5eaceb5f13 Author: Josef Bacik Date: Tue Dec 8 21:48:58 2009 -0500 ext4: wait for log to commit when umounting (cherry picked from commit d4edac314e9ad0b21ba20ba8bc61b61f186f79e1) There is a potential race when a transaction is committing right when the file system is being umounting. This could reduce in a race because EXT4_SB(sb)->s_group_info could be freed in ext4_put_super before the commit code calls a callback so the mballoc code can release freed blocks in the transaction, resulting in a panic trying to access the freed s_group_info. The fix is to wait for the transaction to finish committing before we shutdown the multiblock allocator. Signed-off-by: Josef Bacik Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 35a6f7824919816fca466997531885044d290b59 Author: Jan Kara Date: Tue Dec 8 21:24:33 2009 -0500 ext4: Avoid data / filesystem corruption when write fails to copy data (cherry picked from commit b9a4207d5e911b938f73079a83cc2ae10524ec7f) When ext4_write_begin fails after allocating some blocks or generic_perform_write fails to copy data to write, we truncate blocks already instantiated beyond i_size. Although these blocks were never inside i_size, we have to truncate the pagecache of these blocks so that corresponding buffers get unmapped. Otherwise subsequent __block_prepare_write (called because we are retrying the write) will find the buffers mapped, not call ->get_block, and thus the page will be backed by already freed blocks leading to filesystem and data corruption. Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 66c3a718335ccd37ac14c4f0f2d0a7551af562ed Author: Roel Kluin Date: Mon Dec 7 10:38:16 2009 -0500 ext4: Return the PTR_ERR of the correct pointer in setup_new_group_blocks() (cherry picked from commit c09eef305dd43846360944ad072f051f964fa383) Signed-off-by: Roel Kluin Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 86d291a39650e05c9db7c0d849e48beaf39efcdd Author: Theodore Ts'o Date: Tue Dec 1 09:04:42 2009 -0500 jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer() (cherry picked from commit e6ec116b67f46e0e7808276476554727b2e6240b) OOM happens. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit ce5cf38ef17272ad2641c723c6d0d8eaf1c34eab Author: Akira Fujita Date: Tue Nov 24 10:31:56 2009 -0500 ext4: move_extent_per_page() cleanup (cherry picked from commit ac48b0a1d068887141581bea8285de5fcab182b0) Integrate duplicate lines (acquire/release semaphore and invalidate extent cache in move_extent_per_page()) into mext_replace_branches(), to reduce source and object code size. Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 3369cbb6bedae7e8c7600b33803a8e69b2a6e99f Author: Kazuya Mio Date: Tue Nov 24 10:28:48 2009 -0500 ext4: initialize moved_len before calling ext4_move_extents() (cherry picked from commit 446aaa6e7e993b38a6f21c6acfa68f3f1af3dbe3) The move_extent.moved_len is used to pass back the number of exchanged blocks count to user space. Currently the caller must clear this field; but we spend more code space checking for this requirement than simply zeroing the field ourselves, so let's just make life easier for everyone all around. Signed-off-by: Kazuya Mio Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 74920c74ad3802bc81f5ccbb737d351073dd3ff9 Author: Akira Fujita Date: Tue Nov 24 10:19:57 2009 -0500 ext4: Fix double-free of blocks with EXT4_IOC_MOVE_EXT (cherry picked from commit 94d7c16cbbbd0e03841fcf272bcaf0620ad39618) At the beginning of ext4_move_extent(), we call ext4_discard_preallocations() to discard inode PAs of orig and donor inodes. But in the following case, blocks can be double freed, so move ext4_discard_preallocations() to the end of ext4_move_extents(). 1. Discard inode PAs of orig and donor inodes with ext4_discard_preallocations() in ext4_move_extents(). orig : [ DATA1 ] donor: [ DATA2 ] 2. While data blocks are exchanging between orig and donor inodes, new inode PAs is created to orig by other process's block allocation. (Since there are semaphore gaps in ext4_move_extents().) And new inode PAs is used partially (2-1). 2-1 Create new inode PAs to orig inode orig : [ DATA1 | used PA1 | free PA1 ] donor: [ DATA2 ] 3. Donor inode which has old orig inode's blocks is deleted after EXT4_IOC_MOVE_EXT finished (3-1, 3-2). So the block bitmap corresponds to old orig inode's blocks are freed. 3-1 After EXT4_IOC_MOVE_EXT finished orig : [ DATA2 | free PA1 ] donor: [ DATA1 | used PA1 ] 3-2 Delete donor inode orig : [ DATA2 | free PA1 ] donor: [ FREE SPACE(DATA1) | FREE SPACE(used PA1) ] 4. The double-free of blocks is occurred, when close() is called to orig inode. Because ext4_discard_preallocations() for orig inode frees used PA1 and free PA1, though used PA1 is already freed in 3. 4-1 Double-free of blocks is occurred orig : [ DATA2 | FREE SPACE(free PA1) ] donor: [ FREE SPACE(DATA1) | DOUBLE FREE(used PA1) ] Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 6011d0baad8d5229445b1e0f7b6bdfcaf9cbff26 Author: Eric Sandeen Date: Thu Nov 19 14:28:50 2009 -0500 ext4: make "norecovery" an alias for "noload" (cherry picked from commit e3bb52ae2bb9573e84c17b8e3560378d13a5c798) Users on the linux-ext4 list recently complained about differences across filesystems w.r.t. how to mount without a journal replay. In the discussion it was noted that xfs's "norecovery" option is perhaps more descriptively accurate than "noload," so let's make that an alias for ext4. Also show this status in /proc/mounts Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit feac39ba7f50e851f4e20466e5d390f046932287 Author: Eric Sandeen Date: Thu Nov 19 14:25:42 2009 -0500 ext4: make trim/discard optional (and off by default) (cherry picked from commit 5328e635315734d42080de9a5a1ee87bf4cae0a4) It is anticipated that when sb_issue_discard starts doing real work on trim-capable devices, we may see issues. Make this mount-time optional, and default it to off until we know that things are working out OK. Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit cd9c823a6830d6c84f50fe7dabaf281c542d13ef Author: Jan Kara Date: Mon Nov 23 07:24:48 2009 -0500 ext4: fix error handling in ext4_ind_get_blocks() (cherry picked from commit 2bba702d4f88d7b010ec37e2527b552588404ae7) When an error happened in ext4_splice_branch we failed to notice that in ext4_ind_get_blocks and mapped the buffer anyway. Fix the problem by checking for error properly. Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 43e932d3116f3a74f1b5ff0a38cca5e0bac1099a Author: Theodore Ts'o Date: Mon Nov 23 07:24:57 2009 -0500 ext4: avoid issuing unnecessary barriers (cherry picked from commit 6b17d902fdd241adfa4ce780df20547b28bf5801) We don't to issue an I/O barrier on an error or if we force commit because we are doing data journaling. Signed-off-by: "Theodore Ts'o" Cc: Jan Kara Signed-off-by: Greg Kroah-Hartman commit 31299e22be94e77b6df41d022e8f0bd075537d58 Author: Theodore Ts'o Date: Sun Nov 15 15:29:56 2009 -0500 ext4: fix block validity checks so they work correctly with meta_bg (cherry picked from commit 1032988c71f3f85483b2b4319684d1205a704c02) The block validity checks used by ext4_data_block_valid() wasn't correctly written to check file systems with the meta_bg feature. Fix this. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 58ffefbe7bf2bdfc6f91b79eef9d670df6eab4d3 Author: Theodore Ts'o Date: Mon Nov 23 07:24:38 2009 -0500 ext4: fix uninit block bitmap initialization when s_meta_first_bg is non-zero (cherry picked from commit 8dadb198cb70ef811916668fe67eeec82e8858dd) The number of old-style block group descriptor blocks is s_meta_first_bg when the meta_bg feature flag is set. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 9e9ddddfe74189e2f2514ed2d8eb9ef3f015118f Author: Theodore Ts'o Date: Mon Nov 23 07:24:52 2009 -0500 ext4: don't update the superblock in ext4_statfs() (cherry picked from commit 3f8fb9490efbd300887470a2a880a64e04dcc3f5) commit a71ce8c6c9bf269b192f352ea555217815cf027e updated ext4_statfs() to update the on-disk superblock counters, but modified this buffer directly without any journaling of the change. This is one of the accesses that was causing the crc errors in journal replay as seen in kernel.org bugzilla #14354. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 023c1d20ed1d29d5f5e40e79fde1f8f6b6a42e6f Author: Eric Sandeen Date: Sun Nov 15 15:30:52 2009 -0500 ext4: journal all modifications in ext4_xattr_set_handle (cherry picked from commit 86ebfd08a1930ccedb8eac0aeb1ed4b8b6a41dbc) ext4_xattr_set_handle() was zeroing out an inode outside of journaling constraints; this is one of the accesses that was causing the crc errors in journal replay as seen in kernel.org bugzilla #14354. Reviewed-by: Andreas Dilger Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 70095d96ced4dbe2ebc7cc0d248313e507dda31a Author: Julia Lawall Date: Sun Nov 15 15:30:58 2009 -0500 ext4: fix i_flags access in ext4_da_writepages_trans_blocks() (cherry picked from commit 30c6e07a92ea4cb87160d32ffa9bce172576ae4c) We need to be testing the i_flags field in the ext4 specific portion of the inode, instead of the (confusingly aliased) i_flags field in the generic struct inode. Signed-off-by: Julia Lawall Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 0f9036c7eed145cdd8c8ed9e899c61f499278259 Author: Theodore Ts'o Date: Mon Nov 23 07:17:34 2009 -0500 ext4: make sure directory and symlink blocks are revoked (cherry picked from commit 50689696867d95b38d9c7be640a311494a04fb86) When an inode gets unlinked, the functions ext4_clear_blocks() and ext4_remove_blocks() call ext4_forget() for all the buffer heads corresponding to the deleted inode's data blocks. If the inode is a directory or a symlink, the is_metadata parameter must be non-zero so ext4_forget() will revoke them via jbd2_journal_revoke(). Otherwise, if these blocks are reused for a data file, and the system crashes before a journal checkpoint, the journal replay could end up corrupting these data blocks. Thanks to Curt Wohlgemuth for pointing out potential problems in this area. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 21a4b3aaa2180ca6748446c4b06e91f3da244dca Author: Theodore Ts'o Date: Sat Nov 14 08:19:05 2009 -0500 ext4: plug a buffer_head leak in an error path of ext4_iget() (cherry picked from commit 567f3e9a70d71e5c9be03701b8578be77857293b) One of the invalid error paths in ext4_iget() forgot to brelse() the inode buffer head. Fix it by adding a brelse() in the common error return path, which also simplifies function. Thanks to Andi Kleen reporting the problem. Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit a752b960d4b57e0d307e1c40b1b47ab849832c0f Author: Akira Fujita Date: Mon Nov 23 07:24:41 2009 -0500 ext4: fix possible recursive locking warning in EXT4_IOC_MOVE_EXT (cherry picked from commit 49bd22bc4d603a2a4fc2a6a60e156cbea52eb494) If CONFIG_PROVE_LOCKING is enabled, the double_down_write_data_sem() will trigger a false-positive warning of a recursive lock. Since we take i_data_sem for the two inodes ordered by their inode numbers, this isn't a problem. Use of down_write_nested() will notify the lock dependency checker machinery that there is no problem here. This problem was reported by Brian Rogers: http://marc.info/?l=linux-ext4&m=125115356928011&w=1 Reported-by: Brian Rogers Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 52a4345d3d82b77bea320bf223716298468be3de Author: Akira Fujita Date: Mon Nov 23 07:24:43 2009 -0500 ext4: fix lock order problem in ext4_move_extents() (cherry picked from commit fc04cb49a898c372a22b21fffc47f299d8710801) ext4_move_extents() checks the logical block contiguousness of original file with ext4_find_extent() and mext_next_extent(). Therefore the extent which ext4_ext_path structure indicates must not be changed between above functions. But in current implementation, there is no i_data_sem protection between ext4_ext_find_extent() and mext_next_extent(). So the extent which ext4_ext_path structure indicates may be overwritten by delalloc. As a result, ext4_move_extents() will exchange wrong blocks between original and donor files. I change the place where acquire/release i_data_sem to solve this problem. Moreover, I changed move_extent_per_page() to start transaction first, and then acquire i_data_sem. Without this change, there is a possibility of the deadlock between mmap() and ext4_move_extents(): * NOTE: "A", "B" and "C" mean different processes A-1: ext4_ext_move_extents() acquires i_data_sem of two inodes. B: do_page_fault() starts the transaction (T), and then tries to acquire i_data_sem. But process "A" is already holding it, so it is kept waiting. C: While "A" and "B" running, kjournald2 tries to commit transaction (T) but it is under updating, so kjournald2 waits for it. A-2: Call ext4_journal_start with holding i_data_sem, but transaction (T) is locked. Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit a4a87a7f39020ea18f220c9e9c8ab112ebd6764a Author: Akira Fujita Date: Mon Nov 23 07:25:48 2009 -0500 ext4: fix the returned block count if EXT4_IOC_MOVE_EXT fails (cherry picked from commit f868a48d06f8886cb0367568a12367fa4f21ea0d) If the EXT4_IOC_MOVE_EXT ioctl fails, the number of blocks that were exchanged before the failure should be returned to the userspace caller. Unfortunately, currently if the block size is not the same as the page size, the returned block count that is returned is the page-aligned block count instead of the actual block count. This commit addresses this bug. Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 8ed33ff5203300ac8878042bc4d4954e2f40c488 Author: Theodore Ts'o Date: Mon Nov 23 07:24:46 2009 -0500 ext4: avoid divide by zero when trying to mount a corrupted file system (cherry picked from commit 503358ae01b70ce6909d19dd01287093f6b6271c) If s_log_groups_per_flex is greater than 31, then groups_per_flex will will overflow and cause a divide by zero error. This can cause kernel BUG if such a file system is mounted. Thanks to Nageswara R Sastry for analyzing the failure and providing an initial patch. http://bugzilla.kernel.org/show_bug.cgi?id=14287 Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman commit 6662a8d03104516c53170257b837d8a03e86db39 Author: Theodore Ts'o Date: Mon Nov 23 07:25:49 2009 -0500 ext4: fix potential buffer head leak when add_dirent_to_buf() returns ENOSPC (cherry picked from commit 2de770a406b06dfc619faabbf5d85c835ed3f2e1) Previously add_dirent_to_buf() did not free its passed-in buffer head in the case of ENOSPC, since in some cases the caller still needed it. However, this led to potential buffer head leaks since not all callers dealt with this correctly. Fix this by making simplifying the freeing convention; now add_dirent_to_buf() *never* frees the passed-in buffer head, and leaves that to the responsibility of its caller. This makes things cleaner and easier to prove that the code is neither leaking buffer heads or calling brelse() one time too many. Signed-off-by: "Theodore Ts'o" Cc: Curt Wohlgemuth Signed-off-by: Greg Kroah-Hartman commit d10a8f05208b66c0b29562a9601601b9a7b5d9ac Author: Yang, Bo Date: Tue Oct 6 14:52:20 2009 -0600 SCSI: megaraid_sas: fix 64 bit sense pointer truncation commit 7b2519afa1abd1b9f63aa1e90879307842422dae upstream. The current sense pointer is cast to a u32 pointer, which can truncate on 64 bits. Fix by using unsigned long instead. Signed-off-by Bo Yang Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 79daedf8b665473f5adf6d0d80b4f2c6ff524bca Author: Martin Michlmayr Date: Mon Nov 16 20:49:25 2009 +0200 SCSI: osd_protocol.h: Add missing #include commit 0899638688f223fd9e9fee60d662665e11693d12 upstream. include/scsi/osd_protocol.h uses ALIGN() without an #include , leading to: | include/scsi/osd_protocol.h:362: error: implicit declaration of function 'ALIGN' Signed-off-by: Martin Michlmayr Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit d888b1a2d5c7a9fbdc01e7395ea6a8d75cd729f5 Author: James Bottomley Date: Thu Nov 5 13:33:12 2009 -0600 SCSI: scsi_lib_dma: fix bug with dma maps on nested scsi objects commit d139b9bd0e52dda14fd13412e7096e68b56d0076 upstream. Some of our virtual SCSI hosts don't have a proper bus parent at the top, which can be a problem for doing DMA on them This patch makes the host device cache a pointer to the physical bus device and provides an extra API for setting it (the normal API picks it up from the parent). This patch also modifies the qla2xxx and lpfc vport logic to use the new DMA host setting API. Acked-By: James Smart Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman commit 98d338a7028dbcfc98a7d64856798882b4fbcc21 Author: Sebastian Andrzej Siewior Date: Sun Oct 25 15:37:58 2009 +0100 signal: Fix alternate signal stack check commit 2a855dd01bc1539111adb7233f587c5c468732ac upstream. All architectures in the kernel increment/decrement the stack pointer before storing values on the stack. On architectures which have the stack grow down sas_ss_sp == sp is not on the alternate signal stack while sas_ss_sp + sas_ss_size == sp is on the alternate signal stack. On architectures which have the stack grow up sas_ss_sp == sp is on the alternate signal stack while sas_ss_sp + sas_ss_size == sp is not on the alternate signal stack. The current implementation fails for architectures which have the stack grow down on the corner case where sas_ss_sp == sp.This was reported as Debian bug #544905 on AMD64. Simplified test case: http://download.breakpoint.cc/tc-sig-stack.c The test case creates the following stack scenario: 0xn0300 stack top 0xn0200 alt stack pointer top (when switching to alt stack) 0xn01ff alt stack end 0xn0100 alt stack start == stack pointer If the signal is sent the stack pointer is pointing to the base address of the alt stack and the kernel erroneously decides that it has already switched to the alternate stack because of the current check for "sp - sas_ss_sp < sas_ss_size" On parisc (stack grows up) the scenario would be: 0xn0200 stack pointer 0xn01ff alt stack end 0xn0100 alt stack start = alt stack pointer base (when switching to alt stack) 0xn0000 stack base This is handled correctly by the current implementation. [ tglx: Modified for archs which have the stack grow up (parisc) which would fail with the correct implementation for stack grows down. Added a check for sp >= current->sas_ss_sp which is strictly not necessary but makes the code symetric for both variants ] Signed-off-by: Sebastian Andrzej Siewior Cc: Oleg Nesterov Cc: Roland McGrath Cc: Kyle McMartin LKML-Reference: <20091025143758.GA6653@Chamillionaire.breakpoint.cc> Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman ----------------------------------------------------------------------- The branch, qualcomm-2.6.32 has been created This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "linux kernel tree". hooks/post-receive -- linux kernel tree