Commit graph

580590 commits

Author SHA1 Message Date
Linux Build Service Account
824a1a6d2a Merge "ARM: dts: msm: Enable volume up key for qrd sdm660" 2017-01-08 08:05:50 -08:00
Linux Build Service Account
1f52cde69c Merge "qseecom: Rename clock handle names" 2017-01-08 08:05:46 -08:00
Linux Build Service Account
082aa733d8 Merge "msm: cpp: Fix for integer overflow in cpp" 2017-01-07 23:00:03 -08:00
Linux Build Service Account
96f3cc94dd Merge "media: dvb-core: Fix for dvb_ringbuffer merge conflict" 2017-01-07 13:44:17 -08:00
Linux Build Service Account
fc0faf1b5e Merge "msm: isp: Handle ping pong mismatch error" 2017-01-07 13:44:16 -08:00
Linux Build Service Account
ccf3c89458 Merge "input: move qpnp-power-on driver into input/misc directory" 2017-01-07 05:24:01 -08:00
Linux Build Service Account
ad65eb0904 Merge "ARM: dts: msm: Add support for pwr/perf supply for sdm660" 2017-01-07 05:24:00 -08:00
Linux Build Service Account
2330401695 Merge "spcom: free all SKP ION buffers on SSR" 2017-01-07 05:23:57 -08:00
Linux Build Service Account
8964db0fd5 Merge "clk: qcom: osm: remove ioremaps from panic callback" 2017-01-07 05:23:56 -08:00
John zhao
22f9774b40 sched: add the max_freq comparing for evaluating the mitigation
trace_sched_get_task_cpu_cycles traces max_freq during the tracing of
OSM cycle considering mitigated such as thermal etc.

Change-Id: If134630e293ceaf8faf2aa0ed7d4cfdfe7b3a4d6
CRs-Fixed: 1108711
Signed-off-by: John zhao <yuankuiz@codeaurora.org>
2017-01-07 16:54:38 +08:00
Pavankumar Kondeti
432662eb4d sched: fix stale predicted load in trace_sched_get_busy()
When early detection notification is pending, we skip calculating
predicted load. Initialize it to 0 so that stale value does not
get printed in trace_sched_get_busy().

Change-Id: I36287c0081f6c12191235104666172b7cae2a583
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-01-07 13:49:22 +05:30
Manikanta Sivapala
0124613ef0 defconfig: msm: compile video drivers as builtins
Video kernel modules as LKM make the T32 debugging difficult.
So, make video drivers as part of boot image.

Change-Id: I229eba78f883d7656ac1bd64487dccc70bb0d43c
Signed-off-by: Manikanta Sivapala <msivap@codeaurora.org>
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2017-01-06 22:37:56 -08:00
Manikanta Sivapala
47c3da9b77 ARM: dts: msm: Enable early firmware loading for SDM660
This will ensure that the FW is always loaded and will
save the load time.

CRs-Fixed: 1103405
Change-Id: I40341f50852fb1df418c72fd0fa952af5670be23
Signed-off-by: Manikanta Sivapala <msivap@codeaurora.org>
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2017-01-06 22:11:10 -08:00
Siddartha Mohanadoss
c5fd9dbe9d thermal: tsens: Switch from usleep_range() to msleep
On certain cases we have seen usleep_range() return before
the intended minimum time parameter passed to this function.
There is no protection against wakeups and we may return
early. msleep() already has code to handle this cases since
it loops as long as there is still time.

Change-Id: I3cf1e2d7f61f5a6d42d66afb86ae3b3fe141a9e7
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2017-01-06 16:04:55 -08:00
David Collins
07f2f9952c input: move qpnp-power-on driver into input/misc directory
Move the qpnp-power-on driver from the drivers/input directory
into the drivers/input/misc directory.  This is the standard
location where other power key drivers are kept.

Also make a small fix to use octal instead of symbolic
permissions for the ship_mode_en module parameter.

Change-Id: I4d80c2ca0f161bd443dbfe0fcef822459c9fe44b
Signed-off-by: David Collins <collinsd@codeaurora.org>
2017-01-06 10:52:46 -08:00
Linux Build Service Account
e4e95be265 Merge "ARM: dts: msm: Add an entry to the Silver memlat table for msm8998" 2017-01-06 08:11:50 -08:00
Abhijeet Dharmapurikar
2d7e48a4b3 qpnp-qnovo: Remove dependency on adapter current limit
Currently enabling of Qnovo isn't allowed unless a charger with
minimum 1A current limit is detected. This is not required.

Allow enabling of Qnovo regardless of the charger current limit.

Change-Id: I1726423d3bc31725c162f09b907683d6e63ac6b5
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-01-05 21:41:39 -08:00
Taniya Das
ef366c8b57 ARM: dts: msm: Add support for pwr/perf supply for sdm660
OSM cpu clocks would require the supply rails on which power and perf
clusters are connected, so add the same.

Change-Id: Ie5e50dff1c3c5b06585d03abb45ff493779f029d
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2017-01-05 19:37:20 -08:00
cyizhao
cadfa62c08 ARM: dts: msm: Enable volume up key for qrd sdm660
GPIO7 is used for volume up key on qrd sdm660 device.
Configure it to input and pull-up and add gpio-keys device to
enable the key detection.

CRs-Fixed: 1108198
Change-Id: I9ef323088e478aa2fd35858d256edb041da6f385
Signed-off-by: cyizhao <cyizhao@codeaurora.org>
2017-01-05 19:30:12 -08:00
cyizhao
21f6344cfe ARM: dts: msm: Add FG battery profile/JEITA property for qrd sdm660
Add battery profile for qrd sdm660 to make sure FG could load it
and work as expected.

Disable soft hot jeita threshold according to the battery vendor's and
hardware team's suggestion to make sure the battery could sustain at 1C
charging current longer.

CRs-Fixed: 1108198
Change-Id: Ifebeadae1590813ad785d25a399011efb447746d
Signed-off-by: cyizhao <cyizhao@codeaurora.org>
2017-01-06 11:29:15 +08:00
Douglas Anderson
e489bf2659 timers: Fix documentation for schedule_timeout() and similar
The documentation for schedule_timeout(), schedule_hrtimeout(), and
schedule_hrtimeout_range() all claim that the routines couldn't possibly
return early if the task state was TASK_UNINTERRUPTIBLE. This is simply
not true since wake_up_process() will cause those routines to exit early.

We cannot make schedule_[hr]timeout() loop until the timeout expires if the
task state is uninterruptible because we have users which rely on the
existing and designed behaviour.

Make the documentation match the (correct) implementation.

schedule_hrtimeout() returns -EINTR even when a uninterruptible task was
woken up. This might look strange, but making the return code depend on the
state is too much of an effort as it would affect all the call sites. There
is no value in doing so, but we spell it out clearly in the documentation.

Change-Id: I3e9bf91e7d285abcac134e32b02131b999d79f40
Suggested-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Cc: huangtao@rock-chips.com
Cc: heiko@sntech.de
Cc: broonie@kernel.org
Cc: briannorris@chromium.org
Cc: Andreas Mohr <andi@lisas.de>
Cc: linux-rockchip@lists.infradead.org
Cc: tony.xie@rock-chips.com
Cc: John Stultz <john.stultz@linaro.org>
Cc: linux@roeck-us.net
Cc: tskd08@gmail.com
Link: http://lkml.kernel.org/r/1477065531-30342-2-git-send-email-dianders@chromium.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Git-commit: 4b7e9cf9c84b09adc428e0433cd376b91f9c52a7
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-01-05 17:29:10 -08:00
Douglas Anderson
c51fd6364e timers: Fix usleep_range() in the context of wake_up_process()
Users of usleep_range() expect that it will _never_ return in less time
than the minimum passed parameter. However, nothing in the code ensures
this, when the sleeping task is woken by wake_up_process() or any other
mechanism which can wake a task from uninterruptible state.

Neither usleep_range() nor schedule_hrtimeout_range*() have any protection
against wakeups. schedule_hrtimeout_range*() is designed this way despite
the fact that the API documentation does not mention it.

msleep() already has code to handle this case since it will loop as long
as there was still time left.  usleep_range() has no such loop, add it.

Presumably this problem was not detected before because usleep_range() is
only used in a few places and the function is mostly used in contexts which
are not exposed to wakeups of any form.

An effort was made to look for users relying on the old behavior by
looking for usleep_range() in the same file as wake_up_process().
No problems were found by this search, though it is conceivable that
someone could have put the sleep and wakeup in two different files.

An effort was made to ask several upstream maintainers if they were aware
of people relying on wake_up_process() to wake up usleep_range(). No
maintainers were aware of that but they were aware of many people relying
on usleep_range() never returning before the minimum.

Change-Id: Ia403f0dc9cac711c8a4b6fcc4cf0094ad1358ed7
Reported-by: Tao Huang <huangtao@rock-chips.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Cc: heiko@sntech.de
Cc: broonie@kernel.org
Cc: briannorris@chromium.org
Cc: Andreas Mohr <andi@lisas.de>
Cc: linux-rockchip@lists.infradead.org
Cc: tony.xie@rock-chips.com
Cc: John Stultz <john.stultz@linaro.org>
Cc: djkurtz@chromium.org
Cc: linux@roeck-us.net
Cc: tskd08@gmail.com
Link: http://lkml.kernel.org/r/1477065531-30342-1-git-send-email-dianders@chromium.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Git-commit: 6c5e9059692567740a4ee51530dffe51a4b9584d
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-01-05 17:28:28 -08:00
Thomas Gleixner
8965291e3d timers: Plug locking race vs. timer migration
Linus noticed that lock_timer_base() lacks a READ_ONCE() for accessing the
timer flags. As a consequence the compiler is allowed to reload the flags
between the initial check for TIMER_MIGRATION and the following timer base
computation and the spin lock of the base.

While this has not been observed (yet), we need to make sure that it never
happens.

Change-Id: I577327e02ab77b6de951ac2aa936cb5d5a4f477a
Fixes: 0eeda71bc3 ("timer: Replace timer base by a cpu index")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1610241711220.4983@nanos
Cc: stable@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Git-commit: b831275a3553c32091222ac619cfddd73a5553fb
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[runminw@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-01-05 17:27:10 -08:00
David Dai
2669ae7f24 clk: msm: clock-gcc-8998: keep gcc_bimc_gfx_clk on
Keep gcc_bimc_gfx_clk always on to prevent a stall during BIMC
redirection handshake that occurs as part of a transition between
different CCI power modes. The stall causes momentary bandwidth drops
for the display ports and creates display buffer underflows.

Change-Id: Ie7de487fbe16c7e6b1234a96c1208d54daa5a9bb
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2017-01-05 16:43:26 -08:00
Rohit Gupta
e4434f152e ARM: dts: msm: Add an entry to the Silver memlat table for msm8998
Add a level at the lower end of the memlat table for the Silver
cluster so that the memlat driver votes for at least 200MHz
when the CPU's effective frequency is at most 300MHz for latency
bound workloads.

Change-Id: I2695d2d115d925ac8b274d93e59b2be6578f3001
Signed-off-by: Rohit Gupta <rohgup@codeaurora.org>
2017-01-05 10:20:51 -08:00
Amir Samuelov
1039ef6124 spcom: free all SKP ION buffers on SSR
Free all the SKP ION buffers that were locked for SPSS app swapping,
when remote subsystem reset.

Change-Id: I5230152cc7c3e721b1ebb01b663b9fd14bd2d6c9
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
2017-01-05 18:40:45 +02:00
Manoj Prabhu B
87e224427f ARM: dts: msm: Allocate memory for diag client for SDM630
This patch enables allocation of 5MB for new diag client
of memshare.

CRs-Fixed: 1107794
Change-Id: Ibfbd9c2fc13860b647c1411e6c60f4a543683993
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2017-01-05 18:16:06 +05:30
Meera Gande
4c59120d7b msm: camera: isp: Update UB Size for SDM660
The UB size has been updated to 64KB for
SDM660.

Change-Id: I6493574b17f7ad458476f6e25a8aef19c0befdae
Signed-off-by: Meera Gande <mgande@codeaurora.org>
2017-01-05 16:57:56 +05:30
Linux Build Service Account
2116b44bd3 Merge "ARM: dts: msm: Add APC0/1 CPR instances for sdm660" 2017-01-05 02:09:06 -08:00
Linux Build Service Account
ed4ef900e9 Merge "sched: Delete heavy task heuristics in prediction code" 2017-01-05 02:09:05 -08:00
Linux Build Service Account
54aaf0328a Merge "thermal: tsens: Remove calibration functions" 2017-01-05 02:09:04 -08:00
Linux Build Service Account
e48066aa5f Merge "msm: mdss: advertize hdr support on msm8998" 2017-01-05 02:09:03 -08:00
Linux Build Service Account
3ef2b6c93c Merge "msm: mdss: avoid possible infinite loop on kmalloc failure" 2017-01-05 02:09:02 -08:00
Linux Build Service Account
8b24b9db96 Merge "msm: mdss: fix cwb output buffer memory leak" 2017-01-05 02:09:01 -08:00
Linux Build Service Account
c4ae5b8690 Merge "ARM: dts: msm: Introduce bus topology for sdm630" 2017-01-05 02:09:01 -08:00
Linux Build Service Account
53a6c09ff4 Merge "msm: mdss: fix programming of scaler lut_ctrl register" 2017-01-05 02:09:00 -08:00
Linux Build Service Account
6b5c6d44ea Merge "msm: sde: move config validation earlier to stream on" 2017-01-05 02:08:59 -08:00
Linux Build Service Account
1841235aad Merge "ARM: dts: msm: add support for truly panel in dsc mode" 2017-01-05 02:08:58 -08:00
Linux Build Service Account
dbbac4f76f Merge "sched: Fix new task accounting bug in transfer_busy_time()" 2017-01-05 02:08:58 -08:00
Linux Build Service Account
24df0afae9 Merge "ppp: take reference on channels netns" 2017-01-05 02:08:57 -08:00
Linux Build Service Account
0cb304caa5 Merge "msm: kgsl: Add Zap shader name for A512 GPU on SDM660" 2017-01-05 02:08:56 -08:00
Linux Build Service Account
fa69f96bbb Merge "msm: mdss: rename dsi phy version for msm8996 and sdm660" 2017-01-05 02:08:55 -08:00
Linux Build Service Account
a5d7c799af Merge "msm: mdss: Set default fps for dedicated WB" 2017-01-05 02:08:50 -08:00
Linux Build Service Account
fbc0f1b44f Merge "msm: mdss: Memset commit structure in compat path" 2017-01-05 02:08:49 -08:00
Linux Build Service Account
11e1f7acff Merge "msm: mdss: Add sysfs node for mdss to give runtime fps" 2017-01-05 02:08:48 -08:00
Linux Build Service Account
d4e1fb98bd Merge "msm: mdss: Allow WB to use first available control path" 2017-01-05 02:08:48 -08:00
Linux Build Service Account
9bcaa86e0c Merge "msm: mdss: Fix potential NULL pointer dereference in mdss smmu driver" 2017-01-05 02:08:47 -08:00
Linux Build Service Account
7da94c32a4 Merge "msm: mdss: print fence name during sync fence timeouts" 2017-01-05 02:08:47 -08:00
Linux Build Service Account
afc76e01c9 Merge "msm: mdss: Fix compat IOCTLS in rotator and primary" 2017-01-05 02:08:46 -08:00
Linux Build Service Account
dfc703f24a Merge "msm: mdss: Fix potential NULL pointer dereferences" 2017-01-05 02:08:46 -08:00