Commit graph

599032 commits

Author SHA1 Message Date
Linux Build Service Account
aab4834f1e Merge "diag: Validate query dci event and log mask size properly" 2018-05-02 04:54:38 -07:00
Linux Build Service Account
c38b834398 Merge "Merge android-4.4.128 (89904cc) into msm-4.4" 2018-05-02 04:54:37 -07:00
Linux Build Service Account
1c294945bc Merge "usb: gadget: ffs: Multi-instance fix for use after free case" 2018-05-02 04:54:36 -07:00
Linux Build Service Account
b0b4c8bfd4 Merge "tracing: always define trace_{irq,preempt}_{enable_disable}" 2018-05-02 04:54:35 -07:00
Linux Build Service Account
e16f4fa16b Merge "cpuidle: lpm-levels: Fix snprintf string format" 2018-05-02 04:54:33 -07:00
Linux Build Service Account
ff39bce7b8 Merge "soc: qcom: rpm_stats: Fix snprintf string format" 2018-05-02 04:54:32 -07:00
Linux Build Service Account
d1507b1236 Merge "usb: dwc3-msm: Resume PHY before notify_connect on start_host" 2018-05-01 17:00:40 -07:00
Linux Build Service Account
6934044c51 Merge "ASoC: msm: move tdm grp mgt to afe for anc support" 2018-05-01 17:00:37 -07:00
Linux Build Service Account
2223ffa69b Merge "drm/msm/sde: increase gpu input fence timeout to 10 seconds" 2018-05-01 06:26:41 -07:00
Linux Build Service Account
e6e01da7c4 Merge "drm: msm: add uevent handler to release pipes" 2018-05-01 06:26:39 -07:00
Linux Build Service Account
8517b96791 Merge "drm: msm: add early splash support on triple displays" 2018-05-01 06:26:38 -07:00
Linux Build Service Account
f43d6a5263 Merge "msm: ipa: rmnet: Make code changes with respect to CR#2046006" 2018-05-01 06:26:37 -07:00
Linux Build Service Account
f7b7bdea5a Merge "Revert "adv7481: return error when PLL lock fails"" 2018-05-01 06:26:36 -07:00
Linux Build Service Account
58d23d8d65 Merge "ath10k: update wowlan config and rekey data store method" 2018-05-01 06:26:35 -07:00
Linux Build Service Account
aa6d4b9770 Merge "net: ipc_router: Remove wakeup-source for Sensor ports" 2018-05-01 06:26:34 -07:00
Linux Build Service Account
0af3c13aa0 Merge "ASoC: msm: Update channel mixer weight mixer control" 2018-05-01 06:26:32 -07:00
Linux Build Service Account
036d89dd56 Merge "soc: msm: add apr sensor domain support" 2018-05-01 06:26:31 -07:00
Linux Build Service Account
7df7eae8eb Merge "audio: qdsp6v2: add retry when EAGAIN for habmm_socket_recv" 2018-05-01 06:26:28 -07:00
Linux Build Service Account
b98369d69b Merge "msm: camera: sensor: Adjust csiphy skew filter setting" 2018-04-30 21:09:08 -07:00
Linux Build Service Account
b09928fabb Merge "msm: camera: Change data type of data rate" 2018-04-30 21:09:06 -07:00
Linux Build Service Account
1a61dab660 Merge "esoc: Use standard reset time for mdm9x55 atomic reset" 2018-04-30 21:09:02 -07:00
Mohammed Javid
4987fb136c msm: ipa: rmnet: Make code changes with respect to CR#2046006
Check for CAP_NET_ADMIN capability of the user
space application who tries to access rmnet driver IOCTL.

Change-Id: If6bb4b54659306c5103b5e34bf02c7234c851e0a
CRs-Fixed: 2226355
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-04-30 00:07:34 -07:00
Vijay kumar Tumati
f35c51fe09 msm: camera: sensor: Adjust csiphy skew filter setting
Change camera csiphy skew filter setting to match HPG.

Change-Id: I21d63daa95bd1901b6343e7ff47f05e259a1a8a1
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2018-04-30 10:41:26 +05:30
Linux Build Service Account
866d379212 Merge "msm: Allocate fd with O_CLOEXEC flag" 2018-04-29 21:09:50 -07:00
Linux Build Service Account
8d9b6ddf04 Merge "ASoC: msm: update listen service dai to low latency pcm" 2018-04-29 21:09:49 -07:00
Linux Build Service Account
5282e9782d Merge "clk: qcom: Retrieve pre_div from freq_tbl for shared RCG" 2018-04-29 21:09:46 -07:00
Sachin Bhayare
b2edddb0e7 msm: Allocate fd with O_CLOEXEC flag
(cherry-pick from 'commit 580ec70acac4 ("fbdev: msm: Allocate fd
 with O_CLOEXEC flag")') and made similar changes
for MDP3.

When fd is requested during get_metadata call, create
fd using O_CLOEXEC flag.

Change-Id: Iaa55927ac04b019ea45fbdfe9c64b10d1f0e3ceb
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
2018-04-27 14:18:05 +05:30
Suprith Malligere Shankaregowda
0f6827e465 Revert "adv7481: return error when PLL lock fails"
This reverts commit 44d8abb6e0.

If we return error on PLL lock failure, it results in open_stream
failure for TIF. So, if we open the TV app first and then connect
HDMI cable, it will not start streaming. Therefore reverting this
change.

Change-Id: Ic99a6986a3138bc3abb9e65eb598a743f1634c5c
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-04-26 23:56:40 -07:00
Samyukta Mogily
fd4aade756 msm: camera: Change data type of data rate
Change data rate to uint64, to ensure that the value sent
to kernel is not corrupted.

Change-Id: I692c1c3e591cbac24931078e0fb8938900fc991c
Signed-off-by: Samyukta Mogily <smogily@codeaurora.org>
2018-04-27 10:28:51 +05:30
Ajay Agarwal
19ca45e5ff usb: dwc3-msm: Resume PHY before notify_connect on start_host
Currently as a part of host cable connection, we are notifying
cable connect to phy driver first and then resuming the PHY. This
leads to bus resume case running instead of the cable connect
case resume, hence the phy driver does not vote for the LDOs. As
a result, PHY goes into bad state. Fix this by first resuming PHY
so that cable connect case resume runs.

Change-Id: Ica5b16e420c38b920688b86a24af396644487a6b
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-04-26 18:46:45 +05:30
Hardik Arya
31c280fe34 diag: Validate query dci event and log mask size properly
Currently there is possibility of out-of-bound read due to
incorrect validation of received dci event and log mask for
query. The patch update the validation for the same.

Change-Id: I4266eb0f69fdbfa48c5aacc17744dec83995e9e6
Signed-off-by: Hardik Arya <harya@codeaurora.org>
2018-04-25 08:43:24 -07:00
Sarada Prasanna Garnayak
c3e91de9c5 ath10k: update wowlan config and rekey data store method
In wow suspend method clean up the old configured wow events
before enabling the WLAN offloads and wakeup wow events.

The rekey data set ops is not part of the ieee80211 power
management ops so remove the rekey data set method from wow
and add it in ath10k mac layer.

CRs-Fixed: 2226944
Change-Id: Ida7592097f949734b5880c470845780295a695af
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2018-04-25 03:07:11 -07:00
Arun Kumar Neelakantam
3da30a8cb3 net: ipc_router: Remove wakeup-source for Sensor ports
In high speed sensor data stream case system is not entering into
suspend state due to edge and port specific wake-up sources.

Add flag to check and avoid the wakeup sources for all sensor ports.

CRs-Fixed: 2196601
Change-Id: Ibf642619b969925dc96e8a57e11f7e349b85c024
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
2018-04-25 11:50:11 +05:30
Taniya Das
278e58fc5c clk: qcom: Retrieve pre_div from freq_tbl for shared RCG
There could be cases where a simultaneous clk_disable and clk_set_rate on
the same rcg could result in a wrong recalc rate. So for shared rcgs
get the pre_div value based on the current frequency from the frequency
table.

Change-Id: I575855a3a054bb405f54e1ae0d5feba755aada18
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2018-04-24 12:44:50 +05:30
Dhaval Patel
36a4671970 drm/msm/sde: increase gpu input fence timeout to 10 seconds
GPU hardware may take longer time to process the complex
workload rendering. 2 seconds might not be enough to
finish the processing. Increase this timeout to 10seconds
for allowing GPU to render complex scene.

Change-Id: Iab3462e2bcddc8d303a6012a632d465d1508ebf8
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Signed-off-by: Rahul Sharma <rahsha@codeaurora.org>
2018-04-24 11:38:11 +05:30
Cong Tang
d82892ea91 ASoC: msm: Update channel mixer weight mixer control
Update channel mixer weight controls to support maximum 32 channels
then it could configure maximum to 32 channels by apply
weight coefficient.

Change-Id: Ibf9c130ceba23fbe086c640505c8e348c40d9ffe
Signed-off-by: Cong Tang <congt@codeaurora.org>
2018-04-23 22:35:41 -07:00
Hugh Guan
a5cf01f3c5 audio: qdsp6v2: add retry when EAGAIN for habmm_socket_recv
HAB in the kernel can return -EAGAIN from the habmm_socket_recv() call.
This can happen particularly from a signal handler context.

Change-Id: Ib2885dc49193efb925ed03dc507a2fd2c97ec8c5
Signed-off-by: King Tam <kingt@codeaurora.org>
2018-04-23 10:02:24 -07:00
Arnd Bergmann
893b274e18 tracing: always define trace_{irq,preempt}_{enable_disable}
We get a build error in the irqsoff tracer in some configurations:

kernel/trace/trace_irqsoff.c: In function 'trace_preempt_on':
kernel/trace/trace_irqsoff.c:855:2: error: implicit declaration of function 'trace_preempt_enable_rcuidle'; did you mean 'trace_irq_enable_rcuidle'? [-Werror=implicit-function-declaration]
  trace_preempt_enable_rcuidle(a0, a1);

The problem is that trace_preempt_enable_rcuidle() has different
definition based on multiple Kconfig symbols, but not all combinations
have a valid definition.

This changes the conditions so that we always get exactly one
definition of each of the four tracing macros. I have not tried
to verify that these definitions are sensible, but now we
can build all randconfig combinations again.

Link: http://lkml.kernel.org/r/20171019083230.2450779-1-arnd@arndb.de

Change-Id: I6220ade69ab894721ce9f737a634ac6cc15c16e7
Fixes: d59158162e03 ("tracing: Add support for preempt and irq enable/disable events")
Acked-by: Joel Fernandes <joelaf@google.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Git-commit: 250d0c7754aa37c6443f07f1f5f591e2806295d8
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
2018-04-23 19:10:39 +05:30
Guchun Chen
b5f1a490e8 drm: msm: add uevent handler to release pipes
To achieve glitch-free purpose for early RVC case, the pipes are set
to be unavailable to user Apps. So after splash handoff is done, kernel
needs to tell user Apps the update via this uevent. User Apps will get
this event and start further operation accordingly.

CRs-Fixed: 2225630
Change-Id: I96f023d72dea9c359730d0313e65e87cf9dc1fbc
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-04-23 01:53:14 -07:00
Guchun Chen
10d7d4f65a drm: msm: add early splash support on triple displays
This patch is to support early splash on triple displays
including DSI-HDMI displays and native HDMI display, for
auto products.

CRs-Fixed: 2225630
Change-Id: I4de17eabbf2b2caf1354390f327ba7b761dc313f
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-04-23 16:39:21 +08:00
Linux Build Service Account
502257f3e6 Merge "mmc: core: Donot fall back to lower speed modes for tuning errors" 2018-04-23 01:14:47 -07:00
Linux Build Service Account
e30750c55d Merge "ARM: dts: msm: clean up display device tree for MSM8996" 2018-04-23 01:14:46 -07:00
Linux Build Service Account
5b8c48ad8e Merge "mmc: core: Add retuning to cmdq path" 2018-04-23 01:14:44 -07:00
Linux Build Service Account
d6dbc41649 Merge "mmc: core: implement enhanced strobe support" 2018-04-23 01:14:42 -07:00
Liangliang Lu
2c1ed6b34c usb: gadget: ffs: Multi-instance fix for use after free case
ffs can be used by many drivers, ADB can use it and MTP can
use it. Any other generic function can use it.

So we continue on the single instance patch, provide
multi-instance fix for the use-after-free issue.

Change-Id: I0056bd3779fb472b69e51391702b8b753d39372f
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2018-04-23 10:33:47 +08:00
Linux Build Service Account
3eab84442e Merge "thermal: tsens: Disable Tsens interrupts during driver initialization" 2018-04-21 11:29:48 -07:00
Guchun Chen
7cc625f159 drm: msm: reserve drm resource for early RVC
When early RVC is enabled in bootloader, the pipes on the display
which RVC is on should not be available to uers' Apps. That means,
user should not touch and allocate the pipe for other Apps before
RVC exits. For this purpose, this patch reads the reserved pipe
information from device tree, and reports pipe availability to
user from kernel side.
In additional, user's layer mixer stage will decrease by 1 to
let RVC's layer stays on top before it exits.

CRs-Fixed: 2225630
Change-Id: Id4530afb82da52aecdf5aa48c8fbd59313da236b
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-04-21 22:40:19 +08:00
Linux Build Service Account
4f476c17c5 Merge "cnss2: Support unified QMI sequence" 2018-04-21 02:48:03 -07:00
Linux Build Service Account
3463b69522 Merge "Merge android-4.4.127 (d6bbe8b) into msm-4.4" 2018-04-21 02:48:02 -07:00
Linux Build Service Account
3866b9c778 Merge "ARM: dts: msm: Add WiFi SSR support on msm8996 vplatform" 2018-04-21 02:48:00 -07:00