summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-29Merge branch 'android-3.10' into rel-21Ishan Mittal
Bug 200004122 Bug 1511804 This merge takes AOSP commits from android-3.10 branch Change-Id: I07ec2468114db0366d63777142c9572bbfadbc45 Signed-off-by: Ishan Mittal <imittal@nvidia.com>
2014-05-14nvdumper: Added debug footprint featureYifei Wan
Bug 1498975 Change-Id: I541e4c1d6496be390ae31921d7ed2feb2f1a15cb Signed-off-by: Yifei Wan <ywan@nvidia.com> Reviewed-on: http://git-master/r/404094 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mark Peters <mpeters@nvidia.com> Reviewed-by: Greg Lo <glo@nvidia.com> Reviewed-by: Mitch Luban <mluban@nvidia.com>
2014-05-14syscalls: add trace events for system callsAlex Van Brunt
Add trace events for the entry point and exit point of all system calls. This makes it possible to account for the time spent in each system call. Change-Id: Iba88c0a38424ea8e986954e23f13f4417578379d Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com> Reviewed-on: http://git-master/r/407691 GVS: Gerrit_Virtual_Submit
2014-05-14drivers: cpuidle: add cpuidle trace evnetAlex Van Brunt
Add a trace event to the cpuidle menu governer that reports when the CPU enters idle and how long it expect to be idle. This can be used to account for the idle time and track the accuracy of the menu governors idle residency predictions. Change-Id: I37048f05be41590afd0091294002b8f8a42c566c Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com> Reviewed-on: http://git-master/r/407690 GVS: Gerrit_Virtual_Submit
2014-05-14sched: add event for context switch endAlex Van Brunt
Add a trace envent for the end of a context switch. The makes it possible to account for the time spent context switching using the event log. Change-Id: Idc7bcc47cf51d5e2200e2f9380ba0100e1e56884 Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com> Reviewed-on: http://git-master/r/407689 GVS: Gerrit_Virtual_Submit
2014-05-14drivers: irqchip: gic: add IPI trace eventsAlex Van Brunt
Add enter and exit trace events for IPI. This makes it possible to account for hte time in IPI handlers using trace logs. Change-Id: Ied5d840beca6dfe9ad65ed21ebf77333fbd17e00 Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com> Reviewed-on: http://git-master/r/407688 GVS: Gerrit_Virtual_Submit
2014-05-14arm64: mm: add a trace event for page faultsAlex Van Brunt
Create a trace event for the entry and exit of the page fault handler so that it is possible to account for the time in the page fault handler using frace logs. Change-Id: Iff3af99812c5fd18386cca9f0e59cc8238d92be0 Signed-off-by: Alex Van Brunt <avanbrunt@nvidia.com> Reviewed-on: http://git-master/r/407687 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
2014-05-14ASoC: Tegra: Fix concurrent pcm and compress playbackRavindra Lokhande
- Added path between BE and codec stream - use atomic reference count Bug 1495249 Change-Id: I895d22e1854c53f41362ed2a1cff63d88feb397b Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-on: http://git-master/r/405859 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
2014-05-14input: gpio-keys: change wakeup_key's init valueLouis Li
KEY_RESERVED is 0 and the keycode of "Hall Effect Sensor" is also 0. This causes POWER_KEY_DOWN event to be reported twice while resuming from LP0 by pressing power key. Bug 1489955 Change-Id: Ib583f92155f785618430a3b1ed75eb28015ba977 Reviewed-on: http://git-master/r/389703 (cherry picked from commit 8ed070220e154fb46fd8bd378915a326cf29db42) Signed-off-by: Louis Li <louli@nvidia.com> Reviewed-on: http://git-master/r/408583 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Vinayak Pane <vpane@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-14ARM: tegra:set auto rechg time for power off and suspend modesVenkat Reddy Talla
if charger cable is connected and device enters into suspend/power off state,then wake up device from suspend/Power off after 1 hour to auto recharge device battery. Bug 1440235 Change-Id: I90ccf6c3878b7263f21b33263c4cfb9bb674adf4 Signed-off-by: Venkat Reddy Talla <vreddytalla@nvidia.com> Reviewed-on: http://git-master/r/406878 (cherry picked from commit f22eeaf8e044f40fa8ca4f64b73a7d57df5e5a86) Reviewed-on: http://git-master/r/408174 GVS: Gerrit_Virtual_Submit Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
2014-05-14Revert "security: tlk_driver: Allow affinity changing"Arto Merilainen
This reverts commit 7f6caab3a015a82c3f5b8842a5bd461d61d34af1. The commit introduced a modification that made threads to change affinity to ensure that the CPU can be changed. However, this approach was not bullet proof and it was fixed in a separate patch. Bug 1506585 Change-Id: I3e280a5fae1f63015032f62b45c333344411e5da Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/408076 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
2014-05-14security: tlk_driver: Run kthreads on CPU0Arto Merilainen
Currently, the driver assumes that smc requests come either from workqueue or from a thread that has possibility to set cpu affinity. However, kernel threads by default do not have this possibility and in principle the flag can be set in middle of operation. Turning on devices is sometimes done in kernel threads and in GPU case we may need to change i.e. the VPR parameters. Therefore, ensure that the communication is done on CPU0. Bug 1506585 Change-Id: I0cbd8b841a07c8400310167fa8800eaae9de21f2 Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/408075 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
2014-05-14usb: gadget: add compat_ioctl handlerRakesh Bodla
Add compat_ioctl for accessory and fs to work on 64 bit platforms. Bug 1505458 Change-Id: Ic5fa65451fa6428d50de2307136a59b13bd691cb Signed-off-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-on: http://git-master/r/408014 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-05-14security: tlk_driver: modify secure storage glueVarun Wadekar
The secure world now sends a PREEMPT_BY_FS error code as a result of OpenSession/LaunchOp call. This indicates a pending FS request from the secure world which we need to handle and send the FS_COMPLETION SMC on completion. Until the secure firmware and the linux driver get in sync, we keep legacy SS handling alive to avoid incomaptibility issues. Once the secure firmware switches to the new handling, we would remove the legacy support from the linux driver as well. Bug 1500621 Change-Id: I9e84cd5a87d820107b1c2279c9d89dcd5c31b44b Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/375994 (cherry picked from commit 433d8d1687725ab7db23eef27e5a073e8d88e862) Reviewed-on: http://git-master/r/406769 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
2014-05-14iio: core: add protection to avoid race conditionLouis Li
Kernel panic at iio_read_channel_info during boot stress. It is supposed that iio_dev has been released while sensor service is reading sysfile. So add a protection here to avoid race condition. Bug 1501090 Change-Id: I24da6245f4473fdcc2e8e7bf9673fbd25c350820 Reviewed-on: http://git-master/r/398726 (cherry picked from commit 75155b5e80369feafc612a8c0f1ec44ed84dee10) Signed-off-by: Louis Li <louli@nvidia.com> Reviewed-on: http://git-master/r/408580 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-14ARM: tegra: loki: Switched tegra to master modeJason Roche
Switch Tegra to master This is to improve capture read times Bug 1480935 Change-Id: I8e6fcd3b5da08566b23ee1e5977f30adbc7229d0 Signed-off-by: Jason Roche <jroche@nvidia.com> Reviewed-on: http://git-master/r/392989 (cherry picked from commit e2dacc8fdd3a52b8e333cbd8ae174ed0d9c4e328) Reviewed-on: http://git-master/r/408348 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Pierre Gervais <pgervais@nvidia.com>
2014-05-14ARM: tegra: add emc tables for E1923Ishwarya Balaji Gururajan
add emc tables for E1923 bug 1411684 Change-Id: I104a3916dee65a4daa3f9fbb94e4a1eb25e13f56 Signed-off-by: Ishwarya Balaji Gururajan <igururajan@nvidia.com> Reviewed-on: http://git-master/r/387383 (cherry picked from commit 957188258fbc857bb8ac761ef21cd78a32cfc982) Reviewed-on: http://git-master/r/408345 Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input:touchscreen: raydium: update to 63.7Vincent Chen
63.7 changelist: 1. Fixed “Drawing Shot strokes suddenly moves towards the edges”. 2. Fixed “Ghost touch detected if put screen on desk”. 3. Fixed “Line broken if draw line outside in by stylus”. 4. Solved the multiple interrupt in rm_work_handler. 5. Improve stylus performance with palm. 6. Fixed the issue of touch no response after selftest. Please update selftest to this version. 7. change report to 250Hz in SPI 18M Change-Id: I5f55d54efde9adbc064c89d19be37876aeff447e Signed-off-by: Vincent Chen <zochen@nvidia.com> Reviewed-on: http://git-master/r/406669 (cherry picked from commit 2102dc1f143556333d01057807b0d87c7b3a2754) Reviewed-on: http://git-master/r/408006 Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input: touchscreen: raydium: update to 63.6Vincent Chen
63.5 changelist: 1. wakeup from idle mode unexpectedly 2. adjust the noise mode function, but it's disabled now. 3. improve the ghost point after turn over the tablet on the desk. 63.6 changelist: 1. fix point drop when writing in palm 2. resolve rm_work_handler lantency exceed 100ms on TN8. 3. There is no interrupt when watchdog check is active. Change the watchdog time to 60s and idle time to 5s. 4. fix the ghost point when put the TN8 screen to desk. 5. fix stylus outside in problem. Bug 200001903 Bug 200002195 Bug 200001723 Bug 1509034 Bug 1509031 Change-Id: I7b4dd70243bce4358f490f8c61d1614d15f05fdd Signed-off-by: Vincent Chen <zochen@nvidia.com> Reviewed-on: http://git-master/r/405974 (cherry picked from commit 9904373eb70dd6e140a380f5ccd37b2df8c8dbcd) Reviewed-on: http://git-master/r/408005 Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input: touch: raydium: update to 63.4Vincent Chen
1. Wakeup from idle mode unexpectedly 2. Can’t unlock screen with palm on it 3. Finger detected as pen when swipe in 4. Finger detected as palm when swipe in 5. No finger touch if palm on screen 6. Line broken with palm 7. Include cfboost change 8. Resume time under 200ms 9. Add log for LP0. 10. update selftest v63.4 Bug 1498502 Bug 1505787 Bug 1508475 Change-Id: Ia465a1527cb1e272c94ab063596134087b8d190c Signed-off-by: Vincent Chen <zochen@nvidia.com> Reviewed-on: http://git-master/r/405005 (cherry picked from commit 2b25f10404e89d87893dc7d2731e3f29461a9eef) Reviewed-on: http://git-master/r/404570 (cherry picked from commit 40bec354b08d2fbf0f0d7109c5ce6664fd1827a1) Reviewed-on: http://git-master/r/407530 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input: touch: raydium: force cfboost from idleVincent Chen
input_sync is required to report event through protocol b bug 1501238 Change-Id: I82861971ad4b7cc8c00f33131d0b7df1e01f07ac Signed-off-by: Vincent Chen <zochen@nvidia.com> Reviewed-on: http://git-master/r/404288 (cherry picked from commit b362e37dd9127a344300586a72a7931a049daa49) Reviewed-on: http://git-master/r/404231 (cherry picked from commit 8928052d8bfa7f58bf61271f0744d2f7d7b8a75d) Reviewed-on: http://git-master/r/407529 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14arch: arm: TN8: increase spi speed for touchVincent Chen
bug 1501238 - increase spi to 18MHz Change-Id: Iaffe0898b543e85c5c5c83b2daa07e83cd402cfe Reviewed-on: http://git-master/r/402624 (cherry picked from commit cbb4b5e66c27e0ba92c8e87e0019629d06c299fa) Signed-off-by: Vincent Chen <zochen@nvidia.com> Reviewed-on: http://git-master/r/403922 (cherry picked from commit 818ab41aa3144e042f7a1107057f477115fcfc2a) Reviewed-on: http://git-master/r/407528 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
2014-05-14input: touch: raydium: update to 63.3Jordan Nien
63.1 changelist: [1] improve suspend/resume time. [2] improve light touch. [3] improve tool type switch. [4] report multiple stylus points. Change-Id: I44ed8ab6cae5e001ba26b711346aeec438d62815 Signed-off-by: Jordan Nien <jnien@nvidia.com> Reviewed-on: http://git-master/r/403718 (cherry picked from commit 52b3b3cf2b7a8696ce1df3a767b0ac1cd6073176) Reviewed-on: http://git-master/r/407527 Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input: touch: raydium: update to 63.0Jordan Nien
63.0 changelist: [1] fix protocol B issue. [2] improve light touch. [3] Improve pinch to zoom. [4] fix resolution problem. Change-Id: Ic88cfdc770beabce806e2a2996f78c8d8c63dfd7 Signed-off-by: Jordan Nien <jnien@nvidia.com> Reviewed-on: http://git-master/r/401600 (cherry picked from commit 32c161795216b0aacfa29b0c9ece4193f6bcf899) Reviewed-on: http://git-master/r/407526 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input: touch: raydium: update to 62.6Jordan Nien
62.6 changelist: [1] remove function border area palm rejection. [2] fix idle mode problem. Change-Id: Ib0c740d27d2f30bdb81737b393c65f9d26bdc3f6 Signed-off-by: Jordan Nien <jnien@nvidia.com> Reviewed-on: http://git-master/r/395671 (cherry picked from commit 773454e62ae332a9694c4c6c0c0af55703144174) Reviewed-on: http://git-master/r/407525 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14input: touch: raydium: update to 62.4Vincent Chen
62.4 changelist: [1] improve TN8 stylus performance. [2] improve TN8 finger performance. [3] modify selftest function. Change-Id: Ida5a7e79c14a02d49dee3ccffa2344cc55563570 Reviewed_On: http://git-master/r/394462 (cherry picked from commit 12fef93a6711a0dccc7a524acf568286cb25814b) Signed-off-by: Vincent Chen <zochen@nvidia.com> Reviewed-on: http://git-master/r/394896 (cherry picked from commit ab165bc5c195db1a7a034b02174c2717e454c409) Reviewed-on: http://git-master/r/407524 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Chen <alchen@nvidia.com> Tested-by: Alex Chen <alchen@nvidia.com> Reviewed-by: Robert Collins <rcollins@nvidia.com> Reviewed-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-14arm: tegra: usb: enable unaligned dma buf supportRohith Seelaboyina
Enable unaligned dma buffer support and coherency for host mode on T114, T124, T132 platforms Bug 1505123 Change-Id: Ib236e31451fb9af7e07985639431a486600cb8b3 Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/402015 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
2014-05-13n_tty: Fix n_tty_write crash when echoing in raw modePeter Hurley
commit 4291086b1f081b869c6d79e5b7441633dc3ace00 upstream. The tty atomic_write_lock does not provide an exclusion guarantee for the tty driver if the termios settings are LECHO & !OPOST. And since it is unexpected and not allowed to call TTY buffer helpers like tty_insert_flip_string concurrently, this may lead to crashes when concurrect writers call pty_write. In that case the following two writers: * the ECHOing from a workqueue and * pty_write from the process race and can overflow the corresponding TTY buffer like follows. If we look into tty_insert_flip_string_fixed_flag, there is: int space = __tty_buffer_request_room(port, goal, flags); struct tty_buffer *tb = port->buf.tail; ... memcpy(char_buf_ptr(tb, tb->used), chars, space); ... tb->used += space; so the race of the two can result in something like this: A B __tty_buffer_request_room __tty_buffer_request_room memcpy(buf(tb->used), ...) tb->used += space; memcpy(buf(tb->used), ...) ->BOOM B's memcpy is past the tty_buffer due to the previous A's tb->used increment. Since the N_TTY line discipline input processing can output concurrently with a tty write, obtain the N_TTY ldisc output_lock to serialize echo output with normal tty writes. This ensures the tty buffer helper tty_insert_flip_string is not called concurrently and everything is fine. Note that this is nicely reproducible by an ordinary user using forkpty and some setup around that (raw termios + ECHO). And it is present in kernels at least after commit d945cb9cce20ac7143c2de8d88b187f62db99bdc (pty: Rework the pty layer to use the normal buffering logic) in 2.6.31-rc3. js: add more info to the commit log js: switch to bool js: lock unconditionally js: lock only the tty->ops->write call References: CVE-2014-0196 Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git branch: stable/linux-3.10.y commit: abb5100737bba3f82b5514350fea89ca361ac66c Change-Id: I81e79fe209f5c7b25cac35189a44286e5a9ddac0 Signed-off-by: JP Abgrall <jpa@google.com>
2014-05-13video: tegra: nvmap: deal with read vs write faultSri Krishna chowdary
This change modifies the user fault handler to - allow read access on reserved page - do not mark pages which are read by cpu as dirty Bug 1444151 Bug 1444298 Change-Id: Ic0550503fe27ecd179e9d24f09cc344613249be5 Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com> Reviewed-on: http://git-master/r/403969 (cherry picked from commit d8c2a9f56bbfbb90d90719a8fcae58e1b6f0df3c) Reviewed-on: http://git-master/r/408170 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-13video: tegra: nvmap: fix nvmap_handle_mkSri Krishna chowdary
Loop must run from start_page to end_page and not 2*start_page to end_page. Bug 1444151 Change-Id: I71e35abcf9bda97694d1398d130c0ebf1440a62f Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com> Reviewed-on: http://git-master/r/404263 (cherry picked from commit 203ffb9cec0131be3d84c92abcc7cf5fe5504e6a) Reviewed-on: http://git-master/r/408169 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-13staging: iio: light: update copyright to GPLv2Sri Krishna chowdary
Bug 1495051 Change-Id: I2bf7838dc79848017bf38affe6d61e4349fb3d49 Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com> Reviewed-on: http://git-master/r/400089 (cherry picked from commit 4a556c1bf36e12034f653dc129084954c98a896b) Reviewed-on: http://git-master/r/404970 (cherry picked from commit 050e92969edd6cd0e28542598a36eb1c50441edc) Reviewed-on: http://git-master/r/408090 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-13ARM: tegra: update copyright to GPLv2Sri Krishna chowdary
Bug 1495051 Change-Id: I2848306054e728da8e665fe3745c2ec71fe073c6 Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com> Reviewed-on: http://git-master/r/408087 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-13gpu: nvgpu: Do not enable lbreq interruptTerje Bergstrom
Lbreq interrupt can assert when there is memory back pressure. Do not enable it as either stalling or nonstalling interrupt. Bug 1498688 Change-Id: I02f94a64ab9df82402d80a632450d87457644d50 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/408040 Reviewed-by: Simone Willett <swillett@nvidia.com> Tested-by: Simone Willett <swillett@nvidia.com>
2014-05-13gpu: nvgpu: Fix sched error and recovery raceTerje Bergstrom
Fix race between channel recovery and sched error. Bug 1499214 Change-Id: If95526c7e374703e8941f1b24d3916384261058e Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/405662 (cherry picked from commit f8092e158294260dd9d041dc7f4d2c1872e02474) Reviewed-on: http://git-master/r/407571 Reviewed-by: Automatic_Commit_Validation_User
2014-05-13security: tlk_driver: ensure VPR SMC occurs on CPU0Chris Johnson
The te_set_vpr_params routine is called both by normal user mode threads and worker threads as part of a free/shrink of VPR. The calls from worker threads, will fail in sched_setaffinity() because they have PF_NO_SETAFFINITY set, so previously no switch occurred and the SMC issued on something other than CPU0. This change detects the worker thread case, and if needed, issues a work_on_cpu() instead for the VPR programming. Bug 1473456 Change-Id: I76fa71c577e243b073cabb93928e688fdf7833ec Signed-off-by: Chris Johnson <cwj@nvidia.com> Reviewed-on: http://git-master/r/385924 (cherry picked from commit 30fed4ced5517c8c78b34d3a8db734263cf5d798) Reviewed-on: http://git-master/r/406698 Reviewed-by: Arto Merilainen <amerilainen@nvidia.com> Tested-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
2014-05-13tty: serial8250: add break handler quirk for tegraBibek Basu
On tegra,after a break is issued, uart status register generates FIFOE error rather than the next character ready status. For that quirk is already present. Hook is added for the quirk so that sysrq key combination works. This helps in debugging soft hangs Bug 1401397 Change-Id: I0131cfc986aba694ddc21d859685748843534611 Signed-off-by: Bibek Basu <bbasu@nvidia.com> Reviewed-on: http://git-master/r/401535 (cherry picked from commit c72b366e010b5cfbac6541eb339a0324b863ff17) Reviewed-on: http://git-master/r/406402 Reviewed-by: Matthew Pedro <mapedro@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2014-05-13video: tegra: host: Disable pm runtime lateArto Merilainen
Currently pm runtime is disabled for host1x right after we start suspending. However, many devices (dc, avp, gk20a) depend on host1x functionality and thereby they try to turn on host1x during suspend. This patch modifies host1x suspend sequence to: - Suspend late and resume early. This ensures that "normal" devices can handle host1x properly. - Re-enable host1x pm runtime immediately after genpd has disabled it. This allows other devices to use pm runtime to enable host1x. - Disable pm runtime in complete event. genpd will re-enable it immediately after this has happened Bug 200001342 Change-Id: Ic40cc3e257f9bde8e28eec27bb1a2ca939987ca7 Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/408238 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Amey Asgaonkar <aasgaonkar@nvidia.com> Tested-by: Amey Asgaonkar <aasgaonkar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2014-05-13input: Changed keyreset to act as a wrapper for keycombo.Daniel Rosenberg
keyreset now registers a keycombo driver that acts as the old keyreset driver acted. Change-Id: I08f5279e3a33b267571b699697f9f54508868983 Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-05-13input: add keycombo, a general key combo driver.Daniel Rosenberg
Keycombo lets you provide a key up and key down function, and an optional time delay for key down. The driver will call the key down function after the specified key combo has been held for the speicified time delay. After you release the combo, if the key down has happened, it calls key up. Change-Id: I6a9a94e96a8f58fadd908fd1dc7944b9102a089f Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-05-13video: tegra12: dc: set emc clk per laXia Yang
Update emc clock rate as necessary per latency allowance. Bug 1495454 Bug 1486711 Change-Id: I9ce15517047974d08026b4cbfeb889f31db9d31d Signed-off-by: Xia Yang <xiay@nvidia.com> Reviewed-on: http://git-master/r/404643 GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2014-05-13arm: tegra: soctherm: cap hotspot offset on switchDiwakar Tundlam
If CPU-zone temp reads a lot higher than PLL-zone in a transient scenario, we would program a huge hotspot offset value which would cause spuriously high temperatures when we actually switch to PLL-TSOSC. In the issue described in the bug, this seems to cause a spurious shutdown. We fix this by capping the dynamic hotspot offset to the maximum defined by specification. Also use signed vars to work with -ve temps. Bug 1511045 Change-Id: Ia5803103e951105382c937de8c75f82e4f166b16 Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com> Reviewed-on: http://git-master/r/407794 Reviewed-by: Edward Riegelsberger <eriegels@nvidia.com>
2014-05-13arm: tegra: thermal: new ATE rev and marginsDiwakar Tundlam
Added check for new ATE rev (0.9+). Added WAR for ATE revs 0.9-0.11 - continue to use PLL-TSOSC for thermals. Updated thermal thresholds and CPU and GPU EDP margins per thermal margins spreadsheet. Bug 1429685 Bug 1510809 Bug 1511626 Change-Id: I78528be0ed6b01625dd464054fbbf39c810c8873 Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com> Reviewed-on: http://git-master/r/407793 Reviewed-by: Automatic_Commit_Validation_User
2014-05-13arm: tegra: t124: add emc clock for disp laXia Yang
Add new EMC clock for display controller latency allowance Change-Id: Ia73de5b447b2344f9a9c475e9b89a2387cfcc0e0 Signed-off-by: Xia Yang <xiay@nvidia.com> Reviewed-on: http://git-master/r/407158 Reviewed-by: Aleksandr Frid <afrid@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2014-05-13video: tegra12: dc: use min la APIAdeel Raza
Use the new LA API. The new API gives DC feedback when a display client's new LA value is less than the minimum LA for the current EMC frequency. DC needs to take some corrective action for such cases. Bug 1495454 Bug 1486711 Change-Id: I5f508614ff085bcb7c0726ca98fdc37aa4477f21 Signed-off-by: Adeel Raza <araza@nvidia.com> Reviewed-on: http://git-master/r/401697 (cherry picked from commit 2386a1f9a5f1ac06a9b57178f3e39e221c53ee65) Signed-off-by: Xia Yang <xiay@nvidia.com> Reviewed-on: http://git-master/r/404642 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2014-05-13arm: tegra12: la: detect when disp la < min laAdeel Raza
Detect when a display client's new LA value is less than the minimum LA for the current EMC frequency. Return an error in such a case and let the display driver take corrective action. Bug 1495454 Bug 1486711 Change-Id: I8bda8a01cc657e3774213a5e2e6dd38f21220010 Signed-off-by: Adeel Raza <araza@nvidia.com> Reviewed-on: http://git-master/r/401696 (cherry picked from commit d161832ca7a48fe958677e5520a6aab49c50f004) Signed-off-by: Xia Yang <xiay@nvidia.com> Reviewed-on: http://git-master/r/404641 GVS: Gerrit_Virtual_Submit Reviewed-by: Jon Mayo <jmayo@nvidia.com>
2014-05-13ARM: Tegra: deprecate use_dt_emc_tableJay Bhukhanwala
Change-Id: I4dc22e8a7878c1f90798d6e8d013af6f0b48cb5d Signed-off-by: Jay Bhukhanwala <jbhukhanwala@nvidia.com> Reviewed-on: http://git-master/r/403722 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
2014-05-12power: bq2419x: configure resume and power-ON time on suspend/shutdownLaxman Dewangan
Based on the chargign status and type of cable connected, configure resume and auto power on of system on suspend and shutdown respectively. bug 1440235 bug 1509880 Change-Id: Idd1c731b2852c26132272c35a78e1c5ec5101031 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Venkat Reddy Talla <vreddytalla@nvidia.com> Reviewed-on: http://git-master/r/406364 Reviewed-on: http://git-master/r/408096
2014-05-12net: wireless: bcmdhd: handle roam indicationNarayan Reddy
When user modifies any settings in AP, wlan driver does a reconnection on its own and after connection is re-established, reports it as ROAM_EVENT to cfg. Sometimes bss information of that particular bssid gets expired in the cfg80211 which is resulting in the WARN_ON in cfg80211_roamed function. So skip roaming indication to cfg80211 layer if it is connected to the same BSSID Bug 1500472 Change-Id: I67b9466840451d65a3d7558fc14294ecf1ccf865 Signed-off-by: Narayan Reddy <narayanr@nvidia.com> Reviewed-on: http://git-master/r/403994 (cherry picked from commit 56e52b147181ca3489e0090072d6d5fc42be0f1d) Signed-off-by: Manikanta <mmaddireddy@nvidia.com> Reviewed-on: http://git-master/r/408004 Reviewed-by: Nagarjuna Kristam <nkristam@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
2014-05-12arm: tegra: ardbeg: release Bruce reset lineJulien Vuillaumier
Release Bruce modem module reset line from modem driver init callback, to have earlier modem enumeration during platform boot. bug 1496796 Change-Id: Ia4c807784f9fd13930955e99122062659c58b451 Signed-off-by: Julien Vuillaumier <jvuillaumier@nvidia.com> Reviewed-on: http://git-master/r/403715 (cherry picked from commit 08f543e25cfbaecd1dd1a0130cddc8687e841ce8) Reviewed-on: http://git-master/r/407611 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>
2014-05-12gpu: nvgpu: Fix TLB invalidate raceTerje Bergstrom
TLB invalidate can have a race if several contexts use the same address space. One thread starting an invalidate allows another thread to submit before invalidate is completed. Bug 1502332 Change-Id: I074ec493eac3b153c5f23d796a1dee1d8db24855 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/407578 Reviewed-by: Riham Haidar <rhaidar@nvidia.com> Tested-by: Riham Haidar <rhaidar@nvidia.com>