Commit graph

592707 commits

Author SHA1 Message Date
Linux Build Service Account
0cae764de2 Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm660" 2017-08-10 21:36:37 -07:00
Linux Build Service Account
8ca20aea7e Merge "msm: adsprpc: Separate hyp_assign call for audio remote heap protection" 2017-08-10 21:36:36 -07:00
Linux Build Service Account
d73a32a9d1 Merge "Revert "ARM: dts: msm: enable ADV7535 on MSM8996Pro Auto CDP lite platform"" 2017-08-10 21:36:35 -07:00
Linux Build Service Account
ae773d7171 Merge "drm/msm: only set need cdm for INTF3" 2017-08-10 21:36:35 -07:00
Linux Build Service Account
1f01c0ba90 Merge "msm: camera: Avoid deadlock for vb2 operations using separate lock" 2017-08-10 21:36:34 -07:00
Linux Build Service Account
75f68f1cdb Merge "power: qpnp-fg-gen3: adjust recharge voltage during soft JEITA charge done" 2017-08-10 21:36:32 -07:00
Guchun Chen
ea3c1f1db1 Revert "ARM: dts: msm: enable ADV7535 on MSM8996Pro Auto CDP lite platform"
This reverts commit 9ec3ce38d7.

This change brings one NULL pointer in display kernel booting, which
will bring crash on msm8996 lite board. So revert this commit temporarily.

Change-Id: I7e11b78b47f0e2f2f5cc05a0220f1ff7f3a1addd
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-08-10 17:52:01 +08:00
Tharun Kumar Merugu
46756eb931 ARM: dts: msm: Add fastrpc vmid flag for sdm660
Add a device specific flag for new vmid heap shared feature.

Change-Id: I9be679f9edd0048acbb057ceff4d877c630e4258
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-10 02:23:19 -07:00
Tharun Kumar Merugu
dc979af523 msm: adsprpc: Separate hyp_assign call for audio remote heap protection
Enable audio remote heap protection for separate hyp_assign call to map
HLOS buffer to ADSP_Q6_ELF VM.

Change-Id: I91a70cb8ef2c2feb2d4c398c15c220c78c96a509
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-10 02:21:58 -07:00
Linux Build Service Account
39b5f76de0 Merge "msm: kgsl: Correctly update fence_name for larger timestamp" 2017-08-09 14:17:14 -07:00
Linux Build Service Account
25918b144a Merge "cnss2: Disable BDF bypass by default" 2017-08-09 14:17:13 -07:00
Yuan Zhao
13af4ecf92 drm/msm: only set need cdm for INTF3
Only HDMI INTF3 should need cdm block, other
INTFs do not need cdm.

Change-Id: Iff355dae456ed432efd84dff72ec85b83dbb93f2
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
2017-08-09 08:17:07 -07:00
Linux Build Service Account
bb7cc76a8f Merge "qpnp-smb2: enable/disable sw jeita using a property" 2017-08-09 03:18:21 -07:00
Linux Build Service Account
772f98746e Merge "power: power_supply: add property for sw based JEITA" 2017-08-09 03:18:21 -07:00
Linux Build Service Account
ea1901ceaf Merge "ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver" 2017-08-09 03:18:20 -07:00
Abhilash Kumar
a9d6b142e1 msm: kgsl: Correctly update fence_name for larger timestamp
Since 'timestamp' is of unsigned int type, for larger timestamp
the format specifier %d can show negative values. Fix this by
using %u format specifier for timestamp.

Change-Id: I621dfd4843099cb27436006500fe3342d1d5ddf4
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-08-09 02:17:09 -07:00
Abhijeet Dharmapurikar
713a3c923a qpnp-smb2: enable/disable sw jeita using a property
Provide support to enable/disable sw jeita using a power supply
property.

Change-Id: Id1c2a4bcd8caece5ed7591dc5ab5bf3ac2207cba
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-09 09:55:38 +05:30
Ashay Jaiswal
04e88147af power: power_supply: add property for sw based JEITA
Add power_supply property to enable/disable software based
JEITA charging.

Change-Id: I9fca73c1de524e78c3df83b02a9f5a64488eaae0
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-09 09:47:17 +05:30
Yue Ma
b958ebeb2a cnss2: Disable BDF bypass by default
Disable sending dummy BDF(board data file). Enforce to use real BDF
by default.

Change-Id: Ib0cf267af8ddea8a702f8ac6774063466094f52e
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-08 19:46:17 -07:00
Linux Build Service Account
603df3f744 Merge "power: qpnp-fg-gen3: add support for skew in capacity learning algorithm" 2017-08-08 16:24:56 -07:00
Linux Build Service Account
38c099f001 Merge "usb: dwc3: initialize ep0_usb_req.request.dma to avoid crash" 2017-08-08 16:24:55 -07:00
Linux Build Service Account
ee4d827cf0 Merge "ASoC: msm: qdsp6v2: Modify name for Tertiary mi2s RX and TX" 2017-08-08 16:24:54 -07:00
Linux Build Service Account
fbf1286c9c Merge "drm/msm: free the IRQ during GPU cleanup" 2017-08-08 16:24:53 -07:00
Linux Build Service Account
488414b696 Merge "ion: Correct argument of Set/ClearPagePrivate of secure CMA" 2017-08-08 16:24:53 -07:00
Linux Build Service Account
0975f1e0b7 Merge "defconfig: msm: Enable PAN emulation" 2017-08-08 16:24:51 -07:00
Linux Build Service Account
01dc1a95a2 Merge "cnss2: Suspend PCIe link and power off device after PCIe probe" 2017-08-08 16:24:50 -07:00
Linux Build Service Account
1b6a7f7ebb Merge "defconfig: msm: enable fstack-protector-strong" 2017-08-08 09:02:18 -07:00
Linux Build Service Account
cb10479cfa Merge "Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4" 2017-08-08 09:02:16 -07:00
Linux Build Service Account
0257f99a4d Merge "defconfig: msm: Disable DEVPORT config for msm8998" 2017-08-08 09:02:15 -07:00
Linux Build Service Account
f43cc12df0 Merge "msm: sensor: ois: add conditional check for ioctl" 2017-08-08 09:02:14 -07:00
Linux Build Service Account
7dbbe1224f Merge "msm: ipa3: Fix IPA aggregation force close call" 2017-08-08 09:02:12 -07:00
Linux Build Service Account
7195c28d78 Merge "USB: f_ccid: Unblock ccid_ctrl_read() during disconnect" 2017-08-08 09:02:11 -07:00
Linux Build Service Account
6757ffb0b5 Merge "icnss: Delay Shutdown/reinit sequence for all cases" 2017-08-08 09:02:10 -07:00
Linux Build Service Account
6f1a42cbc9 Merge "qcom: qpnp-haptic: Disable haptics when enable time specified is zero" 2017-08-08 09:02:09 -07:00
Linux Build Service Account
a42bc74491 Merge "drm/msm: reset TMDS clock ratio bit when disabling scrambler" 2017-08-08 09:02:08 -07:00
Linux Build Service Account
6d76f20002 Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm630" 2017-08-08 09:02:07 -07:00
Linux Build Service Account
c75201c442 Merge "ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996" 2017-08-08 09:02:05 -07:00
Linux Build Service Account
e9249c8420 Merge "msm: ipa3: fix compatibility with ipa kernel tests" 2017-08-08 09:02:04 -07:00
Tanya Dixit
2fff7d7ae6 ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver
Fix missing mutex unlock in LSM client driver.

CRs-fixed: 2059497
Change-Id: If5da5ab2eeb424b86c0e6476b69aa6ed36e7ea72
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2017-08-08 13:20:40 +05:30
Hareesh Gundu
3171bf3ddf ion: Correct argument of Set/ClearPagePrivate of secure CMA
On each sg of secure CMA buffer to set/clear page private bit,
we should use the sg_page(sg) rather than sg_page(sgt->sgl).

Change-Id: I05300d9d3a0931d2a0c113f945b45136e0dea01e
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-08-08 12:57:53 +05:30
Ghanim Fodi
4858b46db0 msm: ipa3: Fix IPA aggregation force close call
Core IPA driver passes wrong end-point index to HAL
when generating aggregation force close parameters
values. Fixed the call to pass the correct index.

CRs-Fixed: 2082839
Change-Id: Icc0fd2ce8a23bf0e3334f54b27b850ebf92b58a1
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2017-08-07 23:00:37 -07:00
annamraj
47cda96d50 msm: camera: Avoid deadlock for vb2 operations using separate lock
Use mutex lock for all VB2 operations, and use separatelock other
than used for stop streaming operation to avoid dead lock.

Change-Id: Idba956e5e3bce48ee57eaa5984786ded218e32d5
Signed-off-by: annamraj <annamraj@codeaurora.org>
2017-08-08 11:05:31 +05:30
Yue Ma
0c23ebd17e cnss2: Suspend PCIe link and power off device after PCIe probe
After finishing initialization during PCIe probe, there is no need to
keep PCIe link up. Hence suspend PCIe link and power off device after
PCIe probe for QCA6290 chipset.

Change-Id: I1b07d7c9ef4c3a15ba1eb409a4c64f905e83dae4
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-07 20:43:10 -07:00
Anirudh Ghayal
7eb49b3251 qcom: qpnp-haptic: Disable haptics when enable time specified is zero
The vibrator HAL expects vibration to be disabled when the 'enable'
time specified is 0. Fix this.

CRs-Fixed: 2083994
Change-Id: I12843233da5429ed2fd53f33617952b1dd0ddcd5
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-08-08 06:02:48 +05:30
Subbaraman Narayanamurthy
65cbdb062d power: qpnp-fg-gen3: adjust recharge voltage during soft JEITA charge done
When there is an early charge termination because of soft JEITA
(warm and cool) conditions, float voltage would have been reduced
by the charger based on the compensation configuration (e.g. by
105 mV). This can be close to the recharge voltage threshold
(e.g. 4.25 V) when the recharge is configured to be based off
Vbatt. Adjust the recharge voltage threshold dynamically by
lowering it by 200 mV during soft JEITA and charge termination.
Reset it back to the original value when the condition clears
i.e. either it is out of soft JEITA or the charger is removed.

Change-Id: If4d293c10e84e414c81204784f2e7062140264b1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-08-07 16:27:13 -07:00
Abhinav Kumar
ee79d2fe34 drm/msm: reset TMDS clock ratio bit when disabling scrambler
Currently, when scrambler is disabled the TMDS clock ratio bit
is left untouched. Ideally the sink should reset this bit during
hot plug OR no-signal cases. However, the HDMI spec requires this
bit to be explicitly reset by the source.

Add support to reset this bit during scrambler disable.

Change-Id: I092f6cae84653940e2bdb9100df5e384084cf938
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-07 15:54:50 -07:00
Linux Build Service Account
0c4cf52730 Merge "soc: qcom: scm: fix boot issue when compiled with clang" 2017-08-07 15:48:18 -07:00
Satya Durga Srinivasu Prabhala
1b81606bf7 soc: qcom: scm: fix boot issue when compiled with clang
As per SMC Calling Convention, X4/W4, X5/W5 & X6/W6 registers
return state is unpredictable. But, inline assembly in scm
driver did not correctly specify output markers, which is
causing compiler to move instructions around when clang is
used to compile, which inturn causing deadlock and boot issue
during firmware loading. Add X4/W4, X5/W5 & X6/W6 registers
to output operand list to fix the deadlock during firmware
loading.

Change-Id: I1e4d51a58cd34c31fc63bcd21a20bfd15498bdc3
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-08-07 11:31:12 -07:00
Anurag Chouhan
21d31ab5eb icnss: Delay Shutdown/reinit sequence for all cases
PD down notifications reaches APPS only after WLAN HW is
reset. Because of this, there is a small window of time
in which APPS may try to access WLAN HW Copy Engine
registers and get into exception. To avoid this, FW has
implemented 2 stage reset sequence in which first HW is
halted rather than reset and then when FW PD is started
again, reset sequence is executed. Because of the 2
stage reset sequence, WLAN shutdown call back also needs
to be delayed as there may be some buffers submitted to
hardware and if they are freed then again HW exception
may be seen. Delay the shutdown call back till FW ready
happens at this time HW should be reset and clean state.

CRs-fixed: 2056443
Change-Id: Ie587f98d574f7c0a49a8480449fed44c1f4ab816
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
2017-08-07 04:27:56 -07:00
Linux Build Service Account
58274ed8f1 Merge "msm: wlan: Update regulatory database" 2017-08-07 04:11:20 -07:00