Commit graph

600329 commits

Author SHA1 Message Date
Linux Build Service Account
093e11e9d2 Merge "sdm660: defconfig: Enable GCM crypto configs" 2018-07-09 12:30:23 -07:00
Linux Build Service Account
792f7097d5 Merge "hid: usbhid: Changes to prevent buffer overflow" 2018-07-09 12:30:22 -07:00
Linux Build Service Account
78366da7ed Merge "msm8998: defconfig: Enable GCM crypto configs." 2018-07-09 03:59:41 -07:00
Linux Build Service Account
cabe796714 Merge "ASoC: msm: qdsp6v2: Update LSM param hdr size" 2018-07-09 03:59:40 -07:00
Linux Build Service Account
055c0ed6a2 Merge "pmic: gpio: dt: disable unnecessary gpios in la-gvm" 2018-07-09 03:59:38 -07:00
Gerrit - the friendly Code Review server
83ddc388e2 Merge changes into msm-4.4 2018-07-09 03:35:34 -07:00
Devi Sandeep Endluri V V
25b8a96a31 sdm660: defconfig: Enable GCM crypto configs
Enable GCM crypto support.

Change-Id: I08b9d20ad314117bb30b21ffc2eabe8dd0cac7d3
CRs-Fixed: 2263373
Signed-off-by: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
2018-07-09 11:22:35 +05:30
Linux Build Service Account
0e811b3f2e Merge "msm: ais: sensor: Fix turning clocks off during suspend" 2018-07-08 20:23:57 -07:00
Devi Sandeep Endluri V V
f66a4162ed msm8998: defconfig: Enable GCM crypto configs.
Enable GCM crypto support.

CRs-Fixed: 2263373
Change-Id: Ic243892a71551e880ece90876c38bb08fd709b4b
Signed-off-by: Devi Sandeep Endluri V V <dendluri@codeaurora.org>
2018-07-09 00:32:34 +05:30
Linux Build Service Account
1708fcc68f Merge "ARM: dts: msm: add sde block lengths on msm8996" 2018-07-06 17:34:59 -07:00
Linux Build Service Account
726c573100 Merge "regulator: qpnp-lcdb: Disable the SC irq only for PM660L V1.1 and below" 2018-07-06 09:57:15 -07:00
Linux Build Service Account
eef8d2fd05 Merge "ARM: dts: msm: Set default status of I2C_8 as disabled" 2018-07-06 09:57:14 -07:00
Linux Build Service Account
f9c50487ba Merge "pinctrl: qcom: Clear status bit on irq_unmask" 2018-07-06 09:57:12 -07:00
Soumya Managoli
06cd2ea4b5 ASoC: msm: qdsp6v2: Update LSM param hdr size
q6lsm_pack_params requires param hdr size
to be filled and sent as argument.
Change is to update size with param_hdr_v3 struct size.

Change-Id: Id2380f3ceb887e1fc73b7f5f8e28ac93029082e4
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
2018-07-06 05:01:11 -07:00
Sriharsha Allenki
55fece3439 hid: usbhid: Changes to prevent buffer overflow
Moved some value checks to right positions to prevent
buffer flow, which may be possible before. Previously
these value checks are in an else statement which may
not be executed.

Change-Id: I02dbecd074183581a6bdae6377097bc004bd3d3c
CRs-fixed: 1102936
Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
2018-07-06 16:22:02 +05:30
Linux Build Service Account
d429fdd458 Merge "Revert "do d_instantiate/unlock_new_inode combinations safely"" 2018-07-06 00:10:21 -07:00
Suprith Malligere Shankaregowda
c8e9459d37 msm: ais: sensor: Fix turning clocks off during suspend
Added condition check for suspend only if sensor state is power
down and for resume only if sensor state is power up in
pm functions on sensor driver to control.

Change-Id: Ia31f34dc103428423a86efe8f8012db18b5a75f1
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-07-05 23:54:27 -07:00
Srinivas Ramana
886e726260 pinctrl: qcom: Clear status bit on irq_unmask
This commits reverts the commit a6566710adaa ("pinctrl:
qcom: Don't clear status bit on irq_unmask").
Above change causes an unexpected wakeup on the gpios when the
interrupt is enabled. The gpio interrupt status bit is getting set
after the irq is disabled and causing an immediate interrupt after
enablling the irq. So, revert this change to avoid unexpected/spurious
wakeups.

The above change came in as part of the merge commit 3a75d7a947
("Merge 4.4.59 into android-4.4")

Change-Id: Ie58116c8ac5c81bc007d2c4398f5edfcbf9988d6
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2018-07-05 23:37:14 -07:00
Kiran Gunda
fadfa06fbf regulator: qpnp-lcdb: Disable the SC irq only for PM660L V1.1 and below
PM660L v2.0 has the NCP power-on issue fixed. This allows enabling the
short-circuit IRQ. Enable the same.

Change-Id: I4c0523ef8c46dd9bac190d4ad69190ef777ef14b
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2018-07-05 21:55:47 -07:00
Linux Build Service Account
67addccde1 Merge "dts: msm: Add QSEECOM heap node on msm8996 lfv baseline platform" 2018-07-05 14:33:21 -07:00
Shrey Vijay
29a78b18d9 ARM: dts: msm: Set default status of I2C_8 as disabled
Set default configuration of I2C_8 instance to disabled
state, for MSM8996 vplatform, such that clients can overwrite
and enable respective instance as per need.

Change-Id: I2e873cb27ba028323d6dc1a0aa302f2c32e2b69f
Signed-off-by: Shrey Vijay <shreyv@codeaurora.org>
2018-07-05 18:58:15 +05:30
Jomana Artul
51eaca3871 dts: msm: Add QSEECOM heap node on msm8996 lfv baseline platform
Added the QSEECOM ION heap node, to allow QSEECOM driver and QSEECOM
API library to allocate ION memory from QSEECOM heap.

Change-Id: I72162f8e45bfb8dd3d54e259947aa9604618a7ed
Signed-off-by: Jomana Artul <jartul@codeaurora.org>
2018-07-05 03:28:55 -07:00
Manoj Prabhu B
0fe549f6b6 diag: Update mask buffer after reallocation
Currently, reallocated mask update buffers are not
updated if the received mask range is more than the
mask update buffer length. Update the reallocated buffer
address before writing the mask to peripherals.

CRs-Fixed: 2266693
Change-Id: I6b506ce68e17b7da61926b0f9543157812a8c555
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-07-04 23:11:14 -07:00
Linux Build Service Account
38a0bccad5 Merge "Revert "packet: fix race condition in packet_set_ring"" 2018-07-04 07:24:44 -07:00
Venkata Rao Kakani
106c717628 pmic: gpio: dt: disable unnecessary gpios in la-gvm
Disable all pmic gpios which are not necessary for
la-gvm.

Change-Id: I8f2156bdfd2a065b7f29d4028424f369739435cf
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
2018-07-03 22:22:11 -07:00
Linux Build Service Account
39da72f028 Merge "msm: kgsl: Add hibernation support" 2018-07-03 22:17:57 -07:00
Linux Build Service Account
3fd902873b Merge "msm: ais: sensor: Fix turning off sensor during suspend" 2018-07-03 22:17:55 -07:00
Venkata Rao Kakani
e57d78a605 driver/ethernet/camera: NULL pointer checks before accessing
Check NULL pointer conditions before accessing the
structure to avoid crashes.

Change-Id: I7633d94c265f01793f7aafc3ec2b27379539b857
Signed-off-by: Venkata Rao Kakani <vkakani@codeaurora.org>
2018-07-03 20:55:54 -07:00
Gustavo Solaira
a97cb8dfea Revert "do d_instantiate/unlock_new_inode combinations safely"
This reverts commit 03bb758894.
Causes oops with security smack enabled.

Change-Id: I14fb2b0841c6b71940bd3f08bd4b49b1d7b039a3
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-07-03 16:23:54 -07:00
Linux Build Service Account
cedd6dde99 Merge "ARM: dts: msm: Remove ahb-clk-vote property for msm8996-auto" 2018-07-03 09:15:52 -07:00
Guchun Chen
70631c06ca ARM: dts: msm: add sde block lengths on msm8996
Specify the length of the register blocks for sde
hardware on msm8996, which is needed to support
hardware register dumping.

CRs-Fixed: 2243728
Change-Id: I753ca0260ded630ef34ebf75913b22b22e741fb1
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-07-04 00:09:32 +08:00
Vivek Kumar
3913b083f0 ARM: dts: msm: Remove ahb-clk-vote property for msm8996-auto
Do not unvote for the mss_cfg_ahb clock after the modem
boots up for modem ssr to work,so remove qcom,ahb-clk-vote
property for msm8996 auto boards

Change-Id: Id04bbb9c98bd3852727309c79a459a0bd353d534
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
2018-07-03 00:14:52 -07:00
Linux Build Service Account
d8c2c85fcd Merge "net: sockev: fix uninitialized data leak into userspace" 2018-07-02 23:56:07 -07:00
Suprith Malligere Shankaregowda
ed5f87f97d msm: kgsl: Add hibernation support
Invoke kgsl_suspend and kgsl_resume during hibernation
of KGSL.

Change-Id: I8e1a8ad8b9293d568950a9e71667d1088ff6fbba
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
Signed-off-by: Thomas (Wonyoung) Yun <wyun@codeaurora.org>
2018-07-02 22:50:56 -07:00
Tejaswi Tanikella
5539367290 net: sockev: fix uninitialized data leak into userspace
Socket event string, notifying userspace of socket event, can leak
data into userspace. Memset it before filling it using strlcpy.

Change-Id: I37851f32a1b7ce3307644998c2cc7dd617bb7022
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-07-02 22:19:07 -07:00
Linux Build Service Account
0dc1009129 Merge "ASoC: msm: qdsp6v2: Add mutex protection for rtac cal apis" 2018-07-02 14:10:32 -07:00
Ramprasad Katkam
804e259983 ASoC: msm: qdsp6v2: Add mutex protection for rtac cal apis
Add mutex lock protection to synchronize rtac
calibration set and get api calls.

Change-Id: Ieb2d01642ecefff6405bb59554157c304b4b651d
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
2018-07-02 07:06:01 -07:00
Linux Build Service Account
642d3ae98b Merge "diag: Update mask pointers after reallocation" 2018-07-02 06:08:30 -07:00
Linux Build Service Account
1e208d258e Merge "usb: misc: diag_ipc_bridge: Add support for QMI messages over BULK" 2018-07-02 06:08:28 -07:00
Linux Build Service Account
99dd03c2eb Merge "usb: misc: diag_ipc_bridge: Add support for 9900 and 9901 PIDs" 2018-07-02 06:08:27 -07:00
Linux Build Service Account
dc05ac7626 Merge "usb: misc: Add snapshot of diag_bridge driver" 2018-07-02 06:08:26 -07:00
Mohit Aggarwal
af0b8ef27c diag: Update mask pointers after reallocation
Currently, mask pointers are not updated in
case peripherals are supporting more mask
tables. The patch updates the mask pointers
properly.

Change-Id: I1360c722076fca0215e0ccd28247c4741a1ebd88
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2018-07-02 01:49:57 -07:00
Suprith Malligere Shankaregowda
f032e2ce8d msm: ais: sensor: Fix turning off sensor during suspend
Added pm functions on sensor driver to control
sensor resume and suspend.

Change-Id: I17e51462e6e5ef2d0224daefc2ea8159748609af
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-07-02 13:52:21 +05:30
Srinivasa Rao Kuppala
fa491f9311 Revert "packet: fix race condition in packet_set_ring"
Re-adding lock_sock(sk) and release_lock(sk) back in packet_set_ring()
is incorrect and causing deadlock.
This reverts commit e513723258.

Change-Id: I1e5aa60d155f2c0803c127dc3e2e9dd81807e6f3
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
2018-07-02 11:06:55 +05:30
Linux Build Service Account
921198dc69 Merge "mmc: core: hibernation support for mmc cards" 2018-07-01 22:18:30 -07:00
Linux Build Service Account
9cf9e6ced5 Merge "ARM: dts: msm: Enable the PMIC MPP08 for msm8996 CV2X boards" 2018-06-29 22:18:25 -07:00
Gustavo Solaira
f7f9fe94d5 ARM: dts: msm: Enable the PMIC MPP08 for msm8996 CV2X boards
Enable the PMIC MPP08 for msm8996 CV2X boards. This
GPIO is used to power on the external modem.

Change-Id: I834d3896687be292b9e6f68f719e4ea317da2035
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2018-06-29 13:52:35 -07:00
Linux Build Service Account
201c98295d Merge "defconfig: remove configs to resolve cts failures" 2018-06-29 12:04:18 -07:00
Linux Build Service Account
25c69bf35b Merge "Merge android-4.4.138 (07c0138) into msm-4.4" 2018-06-29 12:04:17 -07:00
Linux Build Service Account
ae8a7e6903 Merge "Revert "drm: msm: sde: remove user commit validity check"" 2018-06-29 12:04:16 -07:00