Commit graph

586582 commits

Author SHA1 Message Date
Zhen Kong
cb2d1d68c3 qseecom: fix macro QSEECOM_ALIGN definition issue
In macro QSEECOM_ALIGN, change (x + QSEECOM_ALIGN_SIZE) to
(x + QSEECOM_ALIGN_MASK); otherwise, when x is already aligned,
QSEECOM_ALIGN(x) will get (x + QSEECOM_ALIGN_SIZE), but it should
be x. Also, remove the dulplicate QSEECOM_ALIGN definition
in hdcp.c and mpq_sdmx.c, since they already include
"qseecom_kernel.h"

Change-Id: I9dbcadb618372fce71c2ff7ab62ca691afe7c7fa
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2017-03-29 13:51:51 -07:00
Linux Build Service Account
664cdd33f9 Merge "ath10k: Use atomic read for fw_crashed state" 2017-03-29 06:49:33 -07:00
Linux Build Service Account
937b17aac8 Merge "ASoC: msm: add support for ADSP Stream Cmd and Callback" 2017-03-29 06:49:32 -07:00
Linux Build Service Account
67d69b8ce5 Merge "soc: qcom: pil: Explicitly clear the subsystem loading address" 2017-03-29 06:49:31 -07:00
Linux Build Service Account
04561686f4 Merge "soc: qcom: Separate out qmi handle destruction and PD notification" 2017-03-29 06:49:30 -07:00
Govind Singh
47a157657e ath10k: Use atomic read for fw_crashed state
fw_crashed is atomic state variable, use atomic
read operation for reading the value

Change-Id: Ieaad558cad684a0eb7daaad9d220b44c032d69ca
Signed-off-by: Govind Singh <govinds@codeaurora.org>
2017-03-28 11:14:40 +05:30
Linux Build Service Account
fec225ae45 Merge "qpnp-fg-gen3: prime CC_SOC_SW when capacity learning begins" 2017-03-27 20:43:42 -07:00
Linux Build Service Account
df700e072e Merge "esoc: add support for additonal physical link info" 2017-03-27 20:43:41 -07:00
Linux Build Service Account
df9d7dccc8 Merge "defconfig: msm: enable EDAC_CORTEX_ARM64_DBE_IRQ_ONLY for SDM660" 2017-03-27 20:43:41 -07:00
Linux Build Service Account
4e44621207 Merge "BACKPORT: f2fs: add a max block check for get_data_block_bmap" 2017-03-27 20:43:38 -07:00
Linux Build Service Account
24cabe3eb3 Merge "qcom: smblib: Only enable hdc and icl irqs on QC/PD chargers" 2017-03-27 20:43:37 -07:00
Gaurav Kohli
c59edf21d4 soc: qcom: pil: Explicitly clear the subsystem loading address
Explicitly clear the subsystem loading address in case of any
memory failure. It will help to avoid any platform dependency.

Change-Id: I3be8f6318d68f02c02e637fc34f4a868e9fafa45
Signed-off-by: Gaurav Kohli <gkohli@codeaurora.org>
2017-03-27 01:00:44 -07:00
Linux Build Service Account
f4a611a3af Merge "ARM: dts: msm: Update LPM parameter values for sdm630" 2017-03-27 00:00:24 -07:00
Linux Build Service Account
dfbbbe04e1 Merge "usb: gadget: f_ncm: allocate/free net device upon driver bind/unbind" 2017-03-27 00:00:23 -07:00
Linux Build Service Account
184c749ea2 Merge "ath10k: msm: enable ATH10k DEBUG config for APQ8098" 2017-03-27 00:00:23 -07:00
Linux Build Service Account
3cf406dcbb Merge "ath10k: Fix ATH10K_DBG_SNOC debug mask" 2017-03-27 00:00:22 -07:00
Linux Build Service Account
f475cb50b0 Merge "msm: isp: initialize pd stats buffer index" 2017-03-27 00:00:21 -07:00
Linux Build Service Account
664fd922ef Merge "msm: isp: Fix unbalanced hvx clk disable" 2017-03-27 00:00:20 -07:00
Linux Build Service Account
3f772904a9 Merge "msm: camera: isp: Set max address for stats write master" 2017-03-27 00:00:19 -07:00
Avaneesh Kumar Dwivedi
24998aa8a6 soc: qcom: Separate out qmi handle destruction and PD notification
This patch move qmi handle destruction in a new function which is
executed in a worker thread and PD notification is issued in
blocking call. This  avoid issue of late PD notification due to
delay in qmi handle destruction.

Change-Id: I0c7efa336f7849ffde95143e3a0134ebb9e33022
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
2017-03-26 23:24:05 -07:00
Linux Build Service Account
ba53c4518c Merge "Merge tag v4.4.55 into branch 'msm-4.4'" 2017-03-25 13:54:57 -07:00
Linux Build Service Account
63e553c0c5 Merge "qcom: smb138x-charger: add vbus regulator" 2017-03-25 13:54:56 -07:00
Linux Build Service Account
53741d950a Merge "qcom: smb138x-charger: Add support for setting parallel mode" 2017-03-25 13:54:55 -07:00
Linux Build Service Account
a95f0c7623 Merge "ARM: dts: msm: add gpio irq for laser sensor on msm8998" 2017-03-25 06:51:46 -07:00
Neeraj Upadhyay
45960e0dd3 defconfig: msm: enable EDAC_CORTEX_ARM64_DBE_IRQ_ONLY for SDM660
Disable handling of single bit errors for SDM660, as they are
correctable.

Change-Id: I14618e5f2685c08c57a6375e7a80d1090bbf0eaa
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-03-25 19:10:09 +05:30
Mark Salyzyn
63ba8a3d1d BACKPORT: f2fs: add a max block check for get_data_block_bmap
(cherry pick from commit 179448bfe4cd201e98e728391c6b01b25c849fe8)

This patch adds a max block check for get_data_block_bmap.

Trinity test program will send a block number as parameter into
ioctl_fibmap, which will be used in get_node_path(), when the block
number large than f2fs max blocks, it will trigger kernel bug.

Signed-off-by: Yunlei He <heyunlei@huawei.com>
Signed-off-by: Xue Liu <liuxueliu.liu@huawei.com>
[Jaegeuk Kim: fix missing condition, pointed by Chao Yu]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Bug: 28271368
Git-repo: https://android.googlesource.com/kernel/tegra.git
Git-commit: 3c714201e02ec08652be4b9544a5267e79bde3a9
Change-Id: Ia5acae04522993d5b60a0bcb5ccc184c66532be8
[d-cagle@codeaurora.org Resolve trivial merge conflicts]
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
2017-03-24 17:25:23 -07:00
Harry Yang
1a62ba595f qcom: smb138x-charger: add vbus regulator
Add vbus regulator in USBIN-USBIN parallel mode.

Change-Id: I57d5cc54aa789a942d5b1a5bc33677ba263d3284
Signed-off-by: Harry Yang <harryy@codeaurora.org>
2017-03-24 13:29:40 -07:00
Harry Yang
71aeac7a9c qcom: smb138x-charger: Add support for setting parallel mode
More than one parallel configurations between PMI8998 and SMB138x are
supported. Update the parallel mode from DT.

Change-Id: I07c30e8d4d860acaf24dd5d0608dca6ba3e65559
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-03-24 13:29:40 -07:00
Satya Durga Srinivasu Prabhala
090a6c0e90 esoc: add support for additonal physical link info
Some of the device configurations support multiple external SOCs.
To differentiate physical links, add support for additonal info
about the physical link.

CRs-Fixed: 2024578
Change-Id: If71bf23d798f8bf0b6594a686415fe9b806e4226
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2017-03-24 13:22:26 -07:00
Linux Build Service Account
c8026470c5 Merge "ath10k: Add rx rate histogram for data packet" 2017-03-24 12:13:08 -07:00
Linux Build Service Account
d0ae02c103 Merge "input: synaptics_dsx: remove array declaration in write function" 2017-03-24 12:13:07 -07:00
Linux Build Service Account
788fd1f669 Merge "i2c-msm-v2: Create rx completion object for dma mode" 2017-03-24 12:13:06 -07:00
Linux Build Service Account
1c5eaab322 Merge "iio: qcom-rradc: Update reading battery ID channel" 2017-03-24 12:13:06 -07:00
Linux Build Service Account
e6025a89eb Merge "msm: ipa: add retry to channel stop" 2017-03-24 12:13:05 -07:00
Linux Build Service Account
3e5a44882b Merge "ath10k: Enable Subsystem Restart for ath10k WCN3990 driver" 2017-03-24 12:13:04 -07:00
Linux Build Service Account
284d57ddfe Merge "msm: msm_bus: initialize the local variable" 2017-03-24 12:13:03 -07:00
Linux Build Service Account
7b585b8e0e Merge "ARM: dts: msm: config SD card GPIO on SDM630 QRD" 2017-03-24 12:13:02 -07:00
Linux Build Service Account
c5db1ff34d Merge "msm: msm_bus: fix the memory leak issue" 2017-03-24 12:13:01 -07:00
Linux Build Service Account
c18c373729 Merge "mmc: sdhci-msm: Cache mmc data structures for debugging" 2017-03-24 12:13:00 -07:00
Linux Build Service Account
e76a227bca Merge "msm: mdss: Remove DSC parameters from MDP caps" 2017-03-24 12:12:59 -07:00
Linux Build Service Account
588c3e92c9 Merge "msm: mdss: Perform splash cleanup on slave control" 2017-03-24 12:12:58 -07:00
Linux Build Service Account
f24c14db5b Merge "msm: mdss: handle force clock lane to HS option properly" 2017-03-24 12:12:57 -07:00
Linux Build Service Account
ba4b8bd054 Merge "msm: mdss: ensure proper state transition during ULPS exit" 2017-03-24 12:12:56 -07:00
Linux Build Service Account
b606e151e5 Merge "msm: mdss: initialize external BL level when fb probe" 2017-03-24 12:12:55 -07:00
Linux Build Service Account
bf4ee749a7 Merge "ion: ion_system_heap: Fix null pointer dereference" 2017-03-24 12:12:54 -07:00
Linux Build Service Account
6ec5aba99c Merge "msm: wlan: Change EIRP value for country China" 2017-03-24 12:12:53 -07:00
Linux Build Service Account
1939e99608 Merge "USB: qdss: Fix NULL pointer deference issue during QDSS transfers" 2017-03-24 12:12:52 -07:00
Linux Build Service Account
4358e92082 Merge "Revert "ARM: dts: msm: Enable midframe sampling timer on SDM660"" 2017-03-24 12:12:51 -07:00
Linux Build Service Account
8dd5f28966 Merge "ARM: dts: msm: add speed bin 1 CPU clock boost frequency for msm8996pro" 2017-03-24 12:12:50 -07:00
Linux Build Service Account
ef1e7d218c Merge "arm64: kaslr: Fix up the kernel image alignment" 2017-03-24 12:12:49 -07:00