Commit graph

595053 commits

Author SHA1 Message Date
Linux Build Service Account
c71f1f1ef1 Merge "drivers: qdsp6v2: Add mutex unlock to properly release lock" 2017-11-19 07:45:10 -08:00
Linux Build Service Account
594cb9819c Merge "security: pfe: Return proper error code" 2017-11-19 07:45:09 -08:00
Linux Build Service Account
ee49de496a Merge "ARM: dts: msm: Fix tavil codec reset issue on sdm660" 2017-11-19 07:45:08 -08:00
Linux Build Service Account
74a9c48a91 Merge "ath10k: check the pipe credit update enabled flag before set" 2017-11-18 00:35:27 -08:00
Linux Build Service Account
e18df67a5b Merge "power: qpnp-fg-gen3: update battery profile based on Rconn configuration" 2017-11-18 00:35:25 -08:00
Linux Build Service Account
f0fa03855a Merge "DRM: SDE: Fix the spelling in DTS parser" 2017-11-17 16:00:54 -08:00
Linux Build Service Account
3105f28036 Merge "ARM: dts: msm: Add support for MSM8996 Mizar platform" 2017-11-17 16:00:54 -08:00
Sarada Prasanna Garnayak
7234f3d164 ath10k: check the pipe credit update enabled flag before set
Check the credit update flag has enabled for the pipe
before setting the flag for credit report update request
on the wcn3990 WLAN module.

CRs-Fixed: 2141924
Change-Id: Ic628fa49934c110b7abccefb45a2a354dc462791
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
2017-11-17 07:04:25 -08:00
Linux Build Service Account
d092195048 Merge "msm: camera: Enable (2+1) lane csiphy combo mode" 2017-11-16 19:11:13 -08:00
Camus Wong
59c20536bc DRM: SDE: Fix the spelling in DTS parser
Fix one of the mode properties' spelling error.

Change-Id: I6cb0f31aa62b825773b97099fcac3da8a2b94af6
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2017-11-16 08:08:16 -08:00
Camus Wong
a8988fe98c SDE: Fix the minimum value in display property
The minium value of u32 is zero instead of -1.  -1 will become the
largest value in u32.

Change-Id: I20fcab7d5912d6da7c4afe1ec7a86333767b0bf1
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2017-11-15 10:35:25 -08:00
Bharathraj Nagaraju
04332db32d ARM: dts: msm: Add support for MSM8996 Mizar platform
Add device tree files needed to support MSM8996 based
mizar platform.

Change-Id: Ife6c6659b981b37c6b9d9cbb0a0c106488f1e07f
Signed-off-by: Bharathraj Nagaraju <snbraj@codeaurora.org>
2017-11-15 07:29:06 -08:00
Subbaraman Narayanamurthy
1ff9fbe486 power: qpnp-fg-gen3: update battery profile based on Rconn configuration
Currently, Rconn is configured once in fg_hw_init() if it is not
configured already. However, if the driver loads the profile
later, it will overwrite the Rconn value configured during
fg_hw_init. To fix this problem, configure Rconn after handling
battery profile loading.

Usually the Rconn configuration is setup differently from what
the profile has for it. We check if the profile in SRAM is bit
to bit matching with the profile in device tree. We may come
across a mismatch for Rconn configuration and conclude that the
profile isn't matching. Fix this by initializing the Rconn
configuration in the profile read from device tree to the value
read from SRAM.

CRs-Fixed: 2142441
Change-Id: I2b7ac8cd6efe811527c29bc5cd0fa43b77da7b15
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-11-14 19:44:04 -08:00
Linux Build Service Account
ae2f6cb5ad Merge "soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait" 2017-11-14 09:45:24 -08:00
Tanya Dixit
4273a189a9 drivers: qdsp6v2: Add mutex unlock to properly release lock
Add mutex unlock in function audio_effects_shared_ioctl
at appropriate place to prevent use after free.

CRs-Fixed: 2123291
Change-Id: Ie0d321dc8cc20a295d102a44faea7e5710834932
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2017-11-14 05:18:43 -08:00
Kyle Yan
191e097508 soc: qcom: service-locator: Update incorrect usage of qmi_send_req_wait
qmi_send_req_wait expects timeout argument to be passed in ms and not
in jiffies. Update the call in service-locator to pass in the correct
argument.

Change-Id: Ib2f8deedf2fb2a561c30b0c8511bb1edd5a37361
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2017-11-13 23:01:20 -08:00
Kyle Yan
6c06d8ddf7 soc: qcom: service-locator: Fix error message prints for receiving messages
ENOMSG is not a real failure return code for qmi_recv_msg. Instead ENOMSG
signifies that we have finished reading the entirety of the message buffer.
Update the error condition to print errors only when any error message
other than ENOMSG is returned.

Change-Id: Id6b42df182cb02f2cbffaae9698363b7dafce4e4
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
2017-11-13 22:56:58 -08:00
Linux Build Service Account
f2170a2917 Merge "power: qcom: msm-core: Add mutex lock for ioctl" 2017-11-13 07:26:33 -08:00
Linux Build Service Account
adff01925e Merge "ASoC: msm: qdsp6v2: Remove excess logs in compress driver" 2017-11-13 07:26:32 -08:00
Linux Build Service Account
290c401bca Merge "adv7481: Changes to compile ADV7481 as a module" 2017-11-13 07:26:31 -08:00
Linux Build Service Account
525336aad1 Merge "usb: gadget: ffs: Defer freeing memory on free_inst if in use" 2017-11-13 07:26:30 -08:00
Linux Build Service Account
3d47351ac1 Merge "ARM: dts: msm: add SLPI fw name property for msm8996" 2017-11-13 07:26:29 -08:00
Maulik Shah
bddfadfc2a power: qcom: msm-core: Add mutex lock for ioctl
There can be use after free with multiple ioctl calls.
Add mutex lock when updating userspace power.

Change-Id: Ieae08d05478a462b19cf7f91b64267177eaebe84
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
2017-11-12 21:15:40 -08:00
Rahul Sharma
913cd48cf2 adv7481: Changes to compile ADV7481 as a module
ADV7481 driver is board-specific, and thus should be compiled
as a module. This is part of the kernel modularization requirement.

Change-Id: I38ab9efca34ac9f898c2b76843563d8f74c29320
Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-11-12 20:45:07 -08:00
Walter Yang
1589568cdd ASoC: wcd934x: reset ASRC after playback
Reset ASRC after audio playback is completed to clear
the FIFO and avoid any noise being generated.

CRs-Fixed: 2129994
Change-Id: Ie45796e1bd68d5a8bd790490a65520358f26b811
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
2017-11-12 18:59:17 -08:00
Hareesh Gundu
b0ba6e4792 msm: kgsl: Do not expose kernel pointer for global entries
Add kernel pointer restriction while printing the global
page table entries through the debugfs.

Change-Id: Ia2ef4243248ece477e3f679c0027379686670928
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-11-11 22:14:51 -08:00
Linux Build Service Account
92c49e0199 Merge "drm/msm: add SRM support for HDCP 1.4" 2017-11-10 07:55:27 -08:00
Ananda Kishore
c3883fcbfe ARM: dts: msm: add SLPI fw name property for msm8996
Add SLPI fw name property to support dynamic loading of SLPI
fw images based on the version info.

Change-Id: I31baf971106a7a076cf83bd72c4509d860b3e7cb
Signed-off-by: Ananda Kishore <kananda@codeaurora.org>
2017-11-10 01:49:33 -08:00
Linux Build Service Account
d8675c149d Merge "msm: pcie: always recover cfg space during resume" 2017-11-09 22:06:48 -08:00
Abhinav Kumar
ef193b7094 drm/msm: add SRM support for HDCP 1.4
Add support for clients to notify SRM update
to HDCP 1.x driver.

Integrate the SRM validation check in the HDCP 1.x
authentication flow to check HDCP 1.x receiver/repeater
KSV against the SRM revoked list and fail the authentication
if the sink is found to be present in the list.

Change-Id: I6615122f785bde94cb746ec4df7ab63b9f878528
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-11-09 20:53:59 -08:00
Sujeev Dias
4f3f403a2e msm: pcie: always recover cfg space during resume
During linkdown pci host cannot save the config space
prior to suspending the link. If saved_state is null
recover rc config space using shadow recovery.

CRs-Fixed: 2141146
Change-Id: I6c6e817ae2c32d8040853fe22785040480aa76eb
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
2017-11-09 15:52:04 -08:00
Linux Build Service Account
10dc161b22 Merge "msm: vidc: Fix sequence change event properly" 2017-11-09 09:58:57 -08:00
Linux Build Service Account
d36a884a1e Merge "soc: qcom: msm_bus: Add debug logging for max bandwidth votes" 2017-11-09 09:58:56 -08:00
Linux Build Service Account
59b028f31d Merge "msm: mdss: do not do phy reset when HDMI power off" 2017-11-09 09:58:55 -08:00
Linux Build Service Account
f2dfcc956e Merge "usb: gadget: f_qdss: Update usb string table based on channel name" 2017-11-09 01:36:54 -08:00
Linux Build Service Account
a2e26ea434 Merge "msm: sensor: actuator: avoid accessing out of bound memory" 2017-11-09 01:36:53 -08:00
Linux Build Service Account
56909a07a9 Merge "net: rmnet_data: Support recycling frames to real device" 2017-11-09 01:36:52 -08:00
Linux Build Service Account
118bf84f06 Merge "ARM: dts: msm: Add support for irs1645 eeprom on msm8998" 2017-11-09 01:36:51 -08:00
Linux Build Service Account
fb484848d3 Merge "cnss2: Refactor callbacks for SSR framework" 2017-11-09 01:36:50 -08:00
Linux Build Service Account
aaacae8143 Merge "Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4" 2017-11-09 01:36:48 -08:00
Linux Build Service Account
2a8246c9d1 Merge "sched: restore discarded ifdef CONFIG_SCHED_WALT code" 2017-11-09 01:36:48 -08:00
Linux Build Service Account
3581002a13 Merge "wil6210: drop RX probe reponses with low SNR" 2017-11-09 01:36:46 -08:00
Linux Build Service Account
f1d762e892 Merge "msm: cec: simplify TX message processing" 2017-11-09 01:36:45 -08:00
Linux Build Service Account
7e7ffb7435 Merge "cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)" 2017-11-09 01:36:44 -08:00
Linux Build Service Account
dc27c14f6b Merge "msm: ipa: Fix to use GFP_DMA flag" 2017-11-09 01:36:42 -08:00
Haibin Liu
37347af942 msm: sensor: actuator: avoid accessing out of bound memory
Issue:
When total_steps is updated, after that, copy_from_user
fails with an error, then, i2c_reg_tbl is not allocated.
In this case, when calling msm_actuator_parse_i2c_params,
it lead to out-of-bound memory write.

Fix:
1) Assign total_steps to zero when error from copying.
2) Add NULL pointer check for i2c tbl.

CRs-Fixed: 2111672
Change-Id: Ib9dcb182356e2df8078c131edfd0791fa95a35e0
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
2017-11-08 19:27:27 -08:00
Linux Build Service Account
3a15cd3400 Merge "NFC: Fix for core init cmd send failure" 2017-11-08 12:55:15 -08:00
Linux Build Service Account
56f4249dfb Merge "spi: core: Add support for registering SPI slave controllers" 2017-11-08 12:55:14 -08:00
Linux Build Service Account
b9d7765e73 Merge "regulator: qpnp: fix voltage min/max constraints check" 2017-11-08 12:55:13 -08:00
Linux Build Service Account
9d1c28996f Merge "dwc3: Do not perform core reinitialisation for host only mode" 2017-11-08 12:55:13 -08:00