Commit graph

588926 commits

Author SHA1 Message Date
Linux Build Service Account
86dc30eade Merge "Merge branch 'android-4.4@c71ad0f' into branch 'msm-4.4'" 2017-04-27 07:06:52 -07:00
Linux Build Service Account
9d9b16e021 Merge "msm: ipa: fix IPC low priority logging" 2017-04-27 07:06:51 -07:00
Linux Build Service Account
dfa58d63ec Merge "msm: gsi: fix IPC low priority logging" 2017-04-27 07:06:30 -07:00
Linux Build Service Account
7428b8e268 Merge "diag: Fix to check for command length size" 2017-04-27 07:06:28 -07:00
Linux Build Service Account
99a42662cf Merge "mhi: core: add support for 64bit doorbell address" 2017-04-27 07:06:27 -07:00
Linux Build Service Account
51d0cf59d8 Merge "msm: ipa: Fix race condition between shared memory" 2017-04-27 07:06:25 -07:00
Linux Build Service Account
425b75778a Merge "ashmem: add mutex to set size ioctl" 2017-04-27 07:06:23 -07:00
Linux Build Service Account
42306cb9b7 Merge "msm: mdss: Add check to avoid NULL pointer dereference" 2017-04-27 07:06:21 -07:00
Mayank Rana
0fb60edc71 USB: dwc3: msm: Fix error handling with dwc3_msm_ep_queue()
If __dwc3_msm_ep_queue() fails, then req_complete is freed
but it is not being removed from mdwc->request_list. This
may result into list_add corruption issue on next USB cable
connect when USB endless request is queued. Fix this issue
by deleting req_complete from mdwc->req_complete_list.

CRs-Fixed: 1007571
Change-Id: I00300bc529db75593939a13fbea33acefa717da5
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2017-04-27 04:29:14 -07:00
Ashay Jaiswal
b5d63b4e49 defconfig: enable LCDB support in SDM660-perf_defconfig
LCDB driver exposes regulators to control the positive and
negative voltage bias for the LCD display panel. It also
allows ability to configure for the various bias-voltage
parameters.

Change-Id: I339345520a47c117e37e57a7b1f37ff2aead3dd8
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-27 16:37:20 +05:30
Linux Build Service Account
7d78f564eb Merge "input: misc: hbtp_input: filter out fb events" 2017-04-26 18:49:03 -07:00
Anirudh Ghayal
f6f4074ad0 ARM: dts: msm: Enable KPDPWR software debounce for PM660
Enable the SW debounce handling for KPDPWR_N rising edge.

CRs-Fixed: 2032520
Change-Id: Ic099d38abdd7693425d0e2510a0ef8fc52a69b95
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-27 06:58:23 +05:30
Anirudh Ghayal
dfdb97d8b9 input: qpnp-power-on: Add debounce for KPDPWR_N rising edge
On certain PMICs, an unexpected assertion on KPDPWR_DBC may
be seen during falling edge of KPDPWR_N when it is closer
to the rising edge of SLEEP_CLK. This triggers spurious
KPDPWR interrupts. Handle this by adding a debounce in SW
when the first KPDPWR_N falling edge is seen.

The debounce logic is enabled by the DT property
'qcom,kpdpwr-sw-debounce'.

CRs-Fixed: 2032520
Change-Id: I7655c13bda47fa6e2983650d7bec21e52aa91c2f
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-04-27 06:55:50 +05:30
David Zeuthen
b40bc405c2 ANDROID: AVB error handler to invalidate vbmeta partition.
If androidboot.vbmeta.device is set and points to a device with vbmeta
magic, this header will be overwritten upon an irrecoverable dm-verity
error. The side-effect of this is that the slot will fail to verify on
next reboot, effectively triggering the boot loader to fallback to
another slot. This work both if the vbmeta struct is at the start of a
partition or if there's an AVB footer at the end.

This code is based on drivers/md/dm-verity-chromeos.c from ChromiumOS.

Example:

 [    0.000000] Kernel command line: rootfstype=ext4 init=/init console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=uefi_x86_64 enforcing=0 androidboot.selinux=permissive androidboot.debuggable=1 buildvariant=eng dm="1 vroot none ro 1,0 2080496 verity 1 PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b 4096 4096 260062 260062 sha1 4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks" root=0xfd00 androidboot.vbmeta.device=PARTUUID=b865935d-38fb-4c4e-b8b4-70dc67321552 androidboot.slot_suffix=_a androidboot.vbmeta.device_state=unlocked androidboot.vbmeta.hash_alg=sha256 androidboot.vbmeta.size=3200 androidboot.vbmeta.digest=14fe41c2b3696c31b7ad5eae7877d7d188995e1ab122c604aaaf4785850b91f7 skip_initramfs
 [...]
 [    0.612802] device-mapper: verity-avb: AVB error handler initialized with vbmeta device: PARTUUID=b865935d-38fb-4c4e-b8b4-70dc67321552
 [...]
 [    1.213804] device-mapper: init: attempting early device configuration.
 [    1.214752] device-mapper: init: adding target '0 2080496 verity 1 PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b PARTUUID=6779df46-78f6-4c69-bf53-59bb1fbf126b 4096 4096 260062 260062 sha1 4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks'
 [    1.217643] device-mapper: init: dm-0 is ready
 [    1.226694] device-mapper: verity: 8:6: data block 0 is corrupted
 [    1.227666] device-mapper: verity-avb: AVB error handler called for PARTUUID=b865935d-38fb-4c4e-b8b4-70dc67321552
 [    1.234308] device-mapper: verity-avb: invalidate_vbmeta: found vbmeta partition
 [    1.235848] device-mapper: verity-avb: invalidate_vbmeta: completed.
 [...]

Bug: 31622239
Test: Manually tested (other arch).
Change-Id: Idf6be32d6a3d28e15de9302aa26ad6a516d663aa
Signed-off-by: David Zeuthen <zeuthen@google.com>
Git-commit: 8d6f006d60
Git-repo: https://android.googlesource.com/kernel/common/
[runminw@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-04-26 13:33:51 -07:00
David Zeuthen
330da40c21 ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.
This is needed for AVB integration work.

Bug: 31796270
Test: Manually tested (other arch).
Change-Id: I32fd37c1578c6414e3e6ff277d16ad94df7886b8
Signed-off-by: David Zeuthen <zeuthen@google.com>
Git-commit: 6a6a7657c2
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
2017-04-26 13:33:24 -07:00
Jordan Crouse
00ca56e448 ARM: dts: msm: Remove I/O coherence for the GPU
I/O coherence has some limitations that make it less preferable than
the usermode cache operations.  Given these limitations the user mode
driver teams have requested that I/O coherence be disabled.

Change-Id: Ic0dedbadbc10b3a6239e20df8b527a5738a1a3a4
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-04-26 10:18:01 -06:00
Jordan Crouse
f567fc12bf drm/msm: Add explicit sync operations
Add sync operations to give the user more control
over the behavior of cached buffers.

Change-Id: Ic0dedbad67e19a6b30b2cc5f6b2c7bbe52c2b708
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2017-04-26 10:17:55 -06:00
Linux Build Service Account
b1980b6bfe Merge "msm: camera: isp: Enable recovery for stats in out of sync case" 2017-04-26 06:33:53 -07:00
Linux Build Service Account
5c863c42bf Merge "btfm: set watermark level to 3 for wcn3990 slimbus FM slave ports" 2017-04-26 06:33:52 -07:00
Linux Build Service Account
d6448aef73 Merge "esoc: remove reduntant return_esoc_udev() fn call" 2017-04-26 06:33:51 -07:00
Linux Build Service Account
e92c6a2322 Merge "defconfig: msm: Enable cache dump and common log in perf build" 2017-04-26 06:33:50 -07:00
Linux Build Service Account
4d68ab6fd6 Merge "power: qpnp-fg-gen3: configure ESR FCC based on Qnovo enable status" 2017-04-26 06:33:49 -07:00
Linux Build Service Account
1399da4328 Merge "msm: camera: Fix kernel overwrite GET_BUF_BY_IDX ioctl" 2017-04-26 06:33:48 -07:00
Linux Build Service Account
f8f13e5308 Merge "Revert "soc:qcom: Synchronize service notifier task's"" 2017-04-26 06:33:47 -07:00
Linux Build Service Account
fa3c35e909 Merge "ASoC: msm: qdsp6v2: Add support for speaker swap" 2017-04-26 06:33:45 -07:00
Linux Build Service Account
f4300126c7 Merge "Revert "spi: spi_qsd: Check device state during set_cs call"" 2017-04-26 06:33:44 -07:00
Lokesh Kumar Aakulu
2fac5aa034 msm: camera: isp: Enable recovery for stats in out of sync case
When the stats go out of sync across the 2 VFEs, don't treat it
as a fatal error but allow for recovery.

Change-Id: I5ef16b3e823cec9698d3ee0627335653f13fd60d
Signed-off-by: Lokesh Kumar Aakulu <lkumar@codeaurora.org>
2017-04-26 03:48:09 -07:00
Ashay Jaiswal
d1f5c07537 power: smb-lib: Fix charger type reporting
Charger type gets updated in 'smblib_update_usb_type' function
and this should only be called after completion of APSD.
Update the calling sites of 'smblib_update_usb_type' to use
'smblib_get_apsd_result' instead of 'smblib_update_usb_type'.
This ensures charger type doesn't get updated inadvertently.

CRs-Fixed: 2038837
Change-Id: Iaa380c8f02bb71ad0f4367c16ec39d86d825dfa2
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-04-26 15:32:33 +05:30
Utkarsh Saxena
36dfd73961 msm: ipa: Fix race condition between shared memory
Protect the common shared wlan_comm_desc_list with
spin lock to avoid the race condition.

Change-Id: I02ef6c6b663340711e0e2f766424d642aaa8d7af
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
2017-04-26 15:06:09 +05:30
Jiangen Jiao
84d92213bc ARM: dts: msm: Add QRD device nodes for HDK660/630 boards
Add device tree support for QRD HDK660, HDK630 boards.

Change-Id: I65e7537f2ae0e7d04ccab11342925e0457f4198b
Signed-off-by: Jiangen Jiao <jiangenj@codeaurora.org>
2017-04-26 01:55:26 -07:00
Rupesh Tatiya
6737311d22 btfm: set watermark level to 3 for wcn3990 slimbus FM slave ports
Without this, we hear silence or delay in sound during FM playback in
following use cases -
1. Switching between FM and media applications like YouTube
2. Changing volume during FM FTM

Change-Id: I51072ab70e6bc34e1ed10222ee289d987ed9ffbf
Signed-off-by: Rupesh Tatiya <rtatiya@codeaurora.org>
2017-04-26 13:19:14 +05:30
Mohammed Khajapasha
cd52d68bef esoc: remove reduntant return_esoc_udev() fn call
Remove reduntant return_esoc_udev() function call
while deleting a esoc device from an esoc clink.

Change-Id: Id2e812addb1bd8af0e23c4182427adbee9731a58
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
2017-04-26 11:19:40 +05:30
Trishansh Bhardwaj
fa5ee0d284 msm: camera: Fix kernel overwrite GET_BUF_BY_IDX ioctl
Assign address of buf_info into ioctl_ptr.
Previously we were copying first 8 bytes of buf_info (content)
into ioctl_ptr. Which is dereferenced and written later causing
kernel overwrite vulnerability.

Change-Id: Ie5deae249da8208523027f8ec5632f960757e9bd
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2017-04-25 22:31:58 -07:00
Hareesh Gundu
c1540a6bfe msm: kgsl: Perform cache operation with kernel address
Kernel should never access untrusted pointers directly.
If the address is not mapped to kernel, map to kernel
address space and perform cache related operation.

Change-Id: I433befcde620e51b8ec17954ddb710f6084e0592
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2017-04-26 11:00:09 +05:30
Linux Build Service Account
d8af252b93 Merge "msm: mdss: wait for pp done when switching from ON to LP1" 2017-04-25 21:48:58 -07:00
Linux Build Service Account
ce6271aa37 Merge "ath10k: enable wlan hardware checksum for wcn3990" 2017-04-25 21:48:57 -07:00
Linux Build Service Account
ded611df05 Merge "clk: qcom: Add support for throttle clocks for clients" 2017-04-25 21:48:56 -07:00
Linux Build Service Account
cf53577f5f Merge "msm: kgsl: Allow draw context to perform only replay on recovery" 2017-04-25 21:48:55 -07:00
Linux Build Service Account
22c29693e8 Merge "iommu: disable smmu stalls on faulty transactions" 2017-04-25 21:48:53 -07:00
Linux Build Service Account
94bc5fd5e8 Merge "drm/msm: Enable per cmdstream profiling for the user" 2017-04-25 21:48:52 -07:00
Linux Build Service Account
877e5ff1ff Merge "msm: mhi_rmnet: clean channel resources only if allocated" 2017-04-25 21:48:51 -07:00
Linux Build Service Account
677003c73f Merge "input: laser: disable laser sensor when camera crash" 2017-04-25 21:48:50 -07:00
Linux Build Service Account
0941c5793c Merge "ASoC: wcd934x: force the wdsp clock to be ungated" 2017-04-25 21:48:49 -07:00
Linux Build Service Account
6f9ad72025 Merge "ASoC: msm: qdsp6v2: Add TrueHD HDMI compress pass-though" 2017-04-25 21:48:48 -07:00
Linux Build Service Account
6bf1176e82 Merge "ASoC: wcd-dsp-mgr: force crash upon collecting ramdumps" 2017-04-25 21:48:47 -07:00
Linux Build Service Account
6a10b24047 Merge "ASoC: msm: qdsp6v2: allow zero size calibration for LSM" 2017-04-25 21:48:46 -07:00
Linux Build Service Account
123d4f45f6 Merge "msm: ipa: return error on channel setup failure" 2017-04-25 21:48:45 -07:00
Linux Build Service Account
27ea79a481 Merge "msm: rmnet_ipa: fix security issue" 2017-04-25 21:48:44 -07:00
Linux Build Service Account
8bca4070e5 Merge "defconfig: Enable support for QBT1000 feature" 2017-04-25 21:48:42 -07:00
Linux Build Service Account
47014a127a Merge "spcom: always wait for glink LOCAL_DISCONNECT event after glink_close()" 2017-04-25 21:48:41 -07:00