Commit graph

598161 commits

Author SHA1 Message Date
Linux Build Service Account
2a5b9922bf Merge "drm/msm: check hpd_off flag only for pluggable displays" 2018-03-28 15:28:06 -07:00
Linux Build Service Account
ac5f95a1a7 Merge "soc: qcom: ipc_router_smd_xprt: Set pointer to NULL after free" 2018-03-28 15:28:04 -07:00
Linux Build Service Account
ca7292c0ff Merge "cnss2: Fix dereference before NULL check issue" 2018-03-28 15:28:03 -07:00
Linux Build Service Account
1ccccc02c1 Merge "cnss2: Support collecting firmware dump during driver load" 2018-03-28 15:28:02 -07:00
Linux Build Service Account
538e1c6d03 Merge "msm: vidc: Fix use after free issue in set_output_buffers" 2018-03-28 15:28:01 -07:00
Linux Build Service Account
09ff85fe7f Merge "defconfig: Add WLAN related defconfigs for msm8996_gvmq" 2018-03-28 15:27:59 -07:00
Linux Build Service Account
189db53495 Merge "ARM: dts: Add qcom,cnss for WLAN on vplatform msm8996_gvmq" 2018-03-28 15:27:58 -07:00
Linux Build Service Account
2b4db72cec Merge "ARM: dts: msm: add the hab entry into the msm8996 telematics vplatform" 2018-03-28 15:27:57 -07:00
Linux Build Service Account
905fb03643 Merge "sched: Export wake_to_idle API" 2018-03-28 15:27:56 -07:00
Linux Build Service Account
cce73b6eb4 Merge "crypto: msm: reset pointer before returning from the function" 2018-03-28 15:27:54 -07:00
Linux Build Service Account
4494f37ab3 Merge "soc: qcom: hab: add habmm_socket_query support" 2018-03-28 15:27:52 -07:00
Derek Chen
c230fbe3c0 ASoC: msm: qdsp6v2: add 24b capture support for tert mi2s
Add support for 24 bits capture for Tertiary MI2S
interface in CPU DAI links.

Change-Id: I2453c5e7efb957d9c2a1fb832c1a456d0672af9a
Signed-off-by: Derek Chen <chenche@codeaurora.org>
2018-03-28 10:57:21 -07:00
Tejaswi Tanikella
b116697fb5 nf: xt_socket: Fix out-of-bounds in xt_socket_lookup_slow_v{4,6}
skb_header_pointer will copy data into the buffer if data is spread
across pages, else share pointer within skb->data. In
xt_socket_lookup_slow_v4, data is copied into udphdr, and later
th->doff is accessed, causing a out-of-bounds. This
access will only work if the data is not split across pages.

Copy data into tcphdr buffer for TCP packets instead.

Change-Id: Ifd6e15ece27fcf5bd02ae17571ab43f6df3ceb21
Fixes: a583636a ("inet: refactor inet[6]_lookup functions to take skb")
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-03-28 07:43:00 -07:00
Manaf Meethalavalappu Pallikunhi
255ce53eb8 msm: thermal: Initialize KTM interrupt mode at kernel late init level
KTM prolong KTM hotplug mitigation, cpu frequency mitigation etc. till
thermal-engine takes over. It is helping thermal runaway issues during
the boot time from KTM kernel late init level to thermal-engine
starts. Since BCL is also using KTM interface for mitigation, it
delays BCL mitigation till thermal-engine starts. Again target which
has LMH support enables Tj based mitigation very early in the boot.
So there is no risk of thermal runaway issues mentioned above.

Enable KTM interrupt mode mitigation back from kernel late init
itself. This reverts commit <07f3dcfc7f7c> ("msm: thermal: Prolong
KTM mitigation till thermal-engine takesover").

Change-Id: I7e4beaed2dd003c6ed36cc10e4bf003826fad827
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
2018-03-28 18:22:38 +05:30
Rahul Sharma
b86526c85e drm/msm: check hpd_off flag only for pluggable displays
This change will wrap the 'hpd_off' flag with pluggable displays.
In non-pluggable display case 'hpd_off' flag prevents disabling
of HPD clocks and hence display subsystem doesn't got into suspend
state.

Change-Id: I28ade8fb60a60a15f1d23009de63bbf9f10c7c77
Signed-off-by: Rahul Sharma <rahsha@codeaurora.org>
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-03-27 22:01:10 -07:00
Arun Kumar Neelakantam
8d26f80ebc soc: qcom: ipc_router_smd_xprt: Set pointer to NULL after free
in_pkt pointer is holding dangling pointer address even after calling
release_pkt() which causing use-after-free.

Set the in_pkt pointer to NULL after free.

CRs-Fixed: 2210859
Change-Id: If5e01c0109c947e52f3ff269c9b2b50ac0dc2bdf
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
2018-03-28 10:30:26 +05:30
Ferry Zhou
008010a68b defconfig: Add WLAN related defconfigs for msm8996_gvmq
The WLAN driver qcacld-3.2 depends on CNSS2, CFG80211 and ralated
defconfigs.  So, add these defconfigs to enable WLAN over PCIe in
virtual platform msm8996_gvmq.

Change-Id: I3ade33ef26bc057b96b4b283669293a43a79b101
Signed-off-by: Ferry Zhou <tianguiz@codeaurora.org>
2018-03-28 08:59:44 +08:00
Ferry Zhou
f4d1f8db03 ARM: dts: Add qcom,cnss for WLAN on vplatform msm8996_gvmq
The device tree node qcom,cnss includes all WLAN related hardware
configurations including power supply regulators and pinctrl
configuration etc.  So, add qcom,cnss into the dts of Linux/Android
virtual platform msm8996_gvmq to enable WLAN over PCIe.

Change-Id: I0dbefbeefb7c6e843e55f32a8b33c4113a3a2e6e
Signed-off-by: Ferry Zhou <tianguiz@codeaurora.org>
2018-03-28 08:59:44 +08:00
Yue Ma
bde7c6fb4d cnss2: Support collecting firmware dump during driver load
When firmware crashes during WLAN host driver loads, collects
firmware dump and proceeds with SSR as normal cases.

Change-Id: If2ac7da3c2db4b4116949d092ad53299f23c87e0
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2018-03-27 17:04:25 -07:00
Yue Ma
fa138cc53c cnss2: Fix dereference before NULL check issue
In cnss_mhi_notify_status(), NULL check should be performed before
dereference for pci_priv.

Change-Id: Iea5a6e2b8be9b07c235b02bfe02292f24da882d8
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2018-03-27 15:20:26 -07:00
Chinmay Sawarkar
11685571ad msm: vidc: Fix use after free issue in set_output_buffers
When set_buffers fails, binfo is freed and again accessed
while freeing smem memory.

CRs-Fixed: 2118860
Change-Id: Ifdd683f907862665e34d6d39d5a8634984804c01
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
Signed-off-by: Sanjay Singh <sisanj@codeaurora.org>
2018-03-27 15:01:19 -04:00
Sriharsha Allenki
b8e7c7ca38 usb: gsi: Don't disable endpoints as part of flow control
Currently GSI endpoints are disabled when host enables
flow control for RNDIS function. When these endpoints are
enabled again as part of flow control disable, no transactions
are observed on these endpoints. Fix this by not disabling the
endpoints as part of flow control enable but just stop the
active transfers on these endpoints.

Change-Id: I391a7048188b2a63e2df993fcebf7a6e78eaef14
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
2018-03-27 23:07:18 +05:30
Ajay Agarwal
f57dd975b0 xhci: plat: Avoid xhci_resume if skip_resume flag is set
The flag skip_resume is set when DWC3 is already runtime
suspended and prepare it for PM suspend. But if PM suspend of
DWC is not called because of some reason, then directly the PM
resume of xhci-plat is called which invokes xhci_resume when DWC
is in Low Power Mode. This leads to watchdog timeout.
Fix this issue by not calling xhci_resume if skip_resume is set.

Change-Id: I47c946c4491015edcf00602d5a525bf35e7c67ed
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-03-27 16:17:33 +05:30
Yong Ding
3aa0551246 ARM: dts: msm: add the hab entry into the msm8996 telematics vplatform
In the msm8996 telematics vplatform, only these MMID groups
for QCPE, clock, FDE and test are added into its device node.

Change-Id: Ib527a4e3a79ebf84fd6f47db66baa324eedb5300
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-03-27 01:55:43 -07:00
Parai Wang
7fcca62cb3 crypto: msm: reset pointer before returning from the function
Reset cipher_req.creq.dst and cipher_req.creq.src pointer to NULL
before returning from the function, and initialize scatterlist
variable before using it.

Change-Id: I5d5eee06a5213a05b20bf459ef0bf0c433fadbdd
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Signed-off-by: Parai Wang <fpwang@codeaurora.org>
2018-03-27 01:10:29 -07:00
Guchun Chen
f42176b693 drm: msm: fix potential NULL pointer dereference
Add checker before using pointers, to avoid NULL pointer
dereference happens.

CRs-Fixed: 2202957
Change-Id: I99930e1e9477130fcfceadad3f3a2ff5c9e89cda
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-03-27 12:37:35 +08:00
Linux Build Service Account
a56e768ca3 Merge "ARM: dts: msm: add audio ion vm dev node for msm8996 auto" 2018-03-26 18:57:02 -07:00
Linux Build Service Account
9b88bdd9cd Merge "mm-camera2:isp2: Avoid use after free buffer" 2018-03-26 18:57:01 -07:00
Linux Build Service Account
8164e45d2e Merge "cnss2: msm: Enable WLAN over PCIe for GVM" 2018-03-26 18:56:58 -07:00
Linux Build Service Account
4bafa4fba5 Merge "softirq: Don't defer all softirq during RT task" 2018-03-26 05:04:35 -07:00
Ferry Zhou
eceef732d8 cnss2: msm: Enable WLAN over PCIe for GVM
The hypervisor does not support PCI_MSM, and uses PCI_HOST_GENERIC
instead.  After this change, the cnss2/PCIe for WLAN in metal case
depends on PCI_MSM, while in GVM case depends on PCI_HOST_GENERIC.

Currently, the WLAN chip is powered up by hypervisor.  So, just
bypass power related code.

Change-Id: Icf13fb11c5e18f6e48746fe82f1b4392559dd5b0
Signed-off-by: Ferry Zhou <tianguiz@codeaurora.org>
2018-03-26 16:44:09 +08:00
Yimin Peng
a8c4fabd93 spmi: msm: add virtual SPMI interrupt support
Add interrupt support for virtual SPMI front-end driver. It will co-work
with backend to serve interrupts of GPIOs and VADC on PMIC.

Change-Id: I7404b18b553f58c8a645a0e300633828de41cfb3
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-03-26 14:40:49 +08:00
Yimin Peng
3967069a45 ARM: dts: msm: add virtual SPMI interrupt support on msm8996 vplatform
Add virtual SPMI interrupt attributes based on SPMI back-end change.

Change-Id: Id30232d4bf2fa34c8f2311a1dd4271c2bb6e50c2
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
2018-03-26 13:45:19 +08:00
Suprith Malligere Shankaregowda
38290c14dd ARM: dts: msm: add audio ion vm dev node for msm8996 auto
Add msm audio ion vm device node to be compatible
with virtualized audio ion platform driver for
msm8996 automotive platform.

Change-Id: Ifaa396a8447080255a70eec5c2ddd3adf803d18f
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-03-25 11:53:45 -04:00
Linux Build Service Account
4b6c5fa539 Merge "ARM: dts: msm: add the hab entry into the msm8996 ivi vplatform" 2018-03-24 00:27:23 -07:00
Linux Build Service Account
907c971904 Merge "msm: mdss: hdmi: add pll_enable property to support clock recovery" 2018-03-24 00:27:22 -07:00
Linux Build Service Account
917c88ae76 Merge "adv7481: Fix Video split rendering observed on QTVinput" 2018-03-24 00:27:20 -07:00
Linux Build Service Account
19b6fc5a35 Merge "soc: qcom: glink: smem: Add wmb between data and write index" 2018-03-23 14:43:51 -07:00
Linux Build Service Account
4ea5505a2a Merge "DRM: SDE: Fixing the power up sequence with early splash" 2018-03-23 14:43:50 -07:00
Linux Build Service Account
6996c532e2 Merge "camera: ais: change the early camera get clk method" 2018-03-23 14:43:49 -07:00
Linux Build Service Account
c4d8eef8df Merge "msm: mdss: hdcp_1x: call HDCP 1x APIs only if HDCP 2.2 is not present" 2018-03-23 14:43:47 -07:00
Meera Gande
8679ae5f90 mm-camera2:isp2: Avoid use after free buffer
In the code, there are certain calls that can
try to access the bffer pointer variable after
free, as the same pointer can be freed at
RELEASE_BUF call at the same time.

Change-Id: I4f7a48613b614138916ae33e7783b0c172330321
Signed-off-by: Meera Gande <mgande@codeaurora.org>
2018-03-23 16:16:25 +05:30
Linux Build Service Account
9a72ed233c Merge "ASoC: msm: Upgrade ASM Driver to support 32 Channels" 2018-03-23 03:32:45 -07:00
Linux Build Service Account
0c10164313 Merge "ASoC: msm: Upgrade ADM Driver to support 32 Channels" 2018-03-23 03:32:44 -07:00
Linux Build Service Account
062c3ef733 Merge "ASoC: msm: qdspv2: fix NULL pointer exception in core driver" 2018-03-23 03:32:42 -07:00
Linux Build Service Account
028e2cf766 Merge "drivers: net: Change timeout for query_firmware command" 2018-03-23 03:32:41 -07:00
Linux Build Service Account
03ead47874 Merge "defconfig: msm: Enable EHSET test fixture driver on msm8996 Auto" 2018-03-23 03:32:39 -07:00
Chris Lew
f497bfd257 soc: qcom: glink: smem: Add wmb between data and write index
Make sure data is flushed before updating write index by adding a wmb.

Change-Id: I3d17ed56b64ac9ca399a0ef11a638027c1ba36ae
Signed-off-by: Chris Lew <clew@codeaurora.org>
2018-03-23 16:01:25 +05:30
Srinivas Girigowda
88f4823be3 sched: Export wake_to_idle API
Export wake_to_idle APIs so that external modules can access these
functions to improve performance.

CRs-Fixed: 2166787
Change-Id: I0863a2e80a303c7584ca52ef81c19d369e840662
Signed-off-by: Srinivas Girigowda <sgirigow@codeaurora.org>
2018-03-23 02:12:58 -07:00
Yong Ding
7e72e45a2e ARM: dts: msm: add the hab entry into the msm8996 ivi vplatform
With such hab entry in the ivi vplatform's device tree,
hab driver will get its configurations dynamically. So
it will not use the default configurations any more.

Change-Id: Idbfc17d2b9ecc6bd18e3aa8901b9bbfbe20636f2
Signed-off-by: Yong Ding <yongding@codeaurora.org>
2018-03-23 16:29:28 +08:00