Commit graph

595536 commits

Author SHA1 Message Date
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
Lokesh Kumar Aakulu
7698308315 msm: camera: isp: Allocate kernel page and map to userspace
Share memory with kernel and user and update latest
kernel sof frame id.

Change-Id: Ie35132ffb9bd0298483b451b3333b3b2e3bb32ac
Signed-off-by: Lokesh Kumar Aakulu <lkumar@codeaurora.org>
2017-11-14 22:10:03 +05:30
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
Robb Glasser
36f332c566 Prevent potential double frees in sg driver
sg_ioctl could be spammed by requests, leading to a double free in
__free_pages. This protects the entry points of sg_ioctl where the
memory could be corrupted by a double call to __free_pages if multiple
requests are happening concurrently.

Bug:35644812

Change-Id: Ie13f65beb6974430f90292e2742841b26aecb8b1
Signed-off-by: Robb Glasser <rglasser@google.com>
Git-commit: 22d8e80738b5ce8784d59b48b0b051a520da4bec
Git-repo: https://android.googlesource.com/kernel/msm
[srkupp@codeaurora.org: Resolved trivial conflicts]
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-11-14 18:46:51 +05:30
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
Veerabhadrarao Badiganti
e773b0dbb9 mmc: core: Return card status if sdr104_wa is not present
On the targets in which sdr104 workaround is not needed, simply return
card status from mmc_recovery_fallback_lower_speed() call.

If any platform uses the tray for SD card, then even if the tray is 
inserted without sd card, card-detect gpio pulled low. And in card 
removal detection path we end-up in calling 
mmc_recovery_fallback_lower_speed(). If we don't return error or card
status it may treat errors are due to CRC errors and try to fall-back to
lower speed mode instead of marking the card as removed.

Change-Id: I83a41c44f5b031663733d7ffa226c1feaa5c9203
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-11-13 20:43:09 +05:30
Padmanabhan Komanduru
6254597c2b msm: mdss: dp: fix programming of DisplayPort SDP registers
Fix the programming of DisplayPort SDP registers primarily related
to Audio enable sequence. This would fix potential issues caused by
read/append/write operations on SDP registers which might corrupt
the parity/data bytes. This would lead to audio issues since the DP
controller would treat the corrupt SDP information as invalid data.

Change-Id: I55db6a70be0fdf94a60fd7cc8bf0d30702febef8
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
2017-11-13 19:18:40 +05:30
Rahul Sharma
acbe0dcf09 msm: ais: 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.

Change-Id: I4df8557719533900a5c571fc00f9844943c8f7b1
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
2017-11-12 21:38:28 -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
Surajit Podder
3af634b1a2 msm: vidc: Update extradata address mapping
Simplify extradata mapping update by updating
extradata device address while saving v4l2 buffer.

Change-Id: I3d07be503b977e4bd8e66ee56824bd30bc91c531
Signed-off-by: Surajit Podder <spodder@codeaurora.org>
2017-11-09 23:53:27 -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
Satya Krishna Pindiproli
45f4197c7f ARM: dts: msm: Add USB audio via ADSP support for msm8996
Add device tree entries for USB audio Rx and Tx to
support USB audio via ADSP on msm8996 platform.

Change-Id: Iae36762f40e9b5403e7305c79b4edf47e3f553cb
Signed-off-by: Satya Krishna Pindiproli <satyak@codeaurora.org>
2017-11-09 18:16:05 +05:30
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
Vivek Iyer
26f229089b ARM: dts: msm: Add support for irs1645 eeprom on msm8998
Add device tree entry needed to support eeprom on the
irs1645 sensor.

Change-Id: I88ad09c7da813e3b74d465392e8e40839d9c88a9
Signed-off-by: Vivek Iyer <viyer@codeaurora.org>
2017-11-08 11:49:52 -08:00
Dedy Lansky
7d7d37295b wil6210: drop RX probe reponses with low SNR
FW now reports SNR for RX management frames.
Drop probe responses with SNR lower than the configured threshold.

Change-Id: Ife1863b07aebe5cb6097420290c0c10b590c2da1
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
2017-11-08 14:57:41 +02:00
Dedy Lansky
dea78e0c9f wil6210: add sysfs for setting connect SNR threshold
snr_thresh sysfs can be used to set omni and direct SNR threshold for
connection.

Change-Id: I091a6b61a1a4cb98e0e8c0f70b2fff4d22486e61
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
2017-11-08 14:57:30 +02:00
Lynus Vaz
a00b5d0583 msm: kgsl: Update the dispatcher timer properly
The dispatcher timer should be updated if preemption is not in
progress. This schedules the dispatcher work in case the command
does not make progress.

Change-Id: I9ef55b12d7a4f07a3c5bba650e37453bd8f86ce3
Signed-off-by: Lynus Vaz <lvaz@codeaurora.org>
2017-11-08 03:30:03 -08:00
Neeraj Soni
a3b28d68a2 security: pfe: Return proper error code
ICE clock funciton masks the error code from
scm call. This might introduce unwanted issues
in device. Ensure to return proper error code
to storage frameworks.

Change-Id: Ibd7358c3b19d23d5995cf267f56ef3bacf166569
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
2017-11-08 16:49:51 +05:30
Linux Build Service Account
8fe7c2f3d9 Merge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996" 2017-11-08 02:31:29 -08:00