Commit graph

585095 commits

Author SHA1 Message Date
Linux Build Service Account
20f778e413 Merge "qseecom: return app_id correctly when looking up and loading app" 2017-03-09 02:04:59 -08:00
Linux Build Service Account
c7692d37b0 Merge "usb: gadget: f_fs: Fix out-of-bounds string access" 2017-03-09 02:04:58 -08:00
Linux Build Service Account
3016067a56 Merge "msm: qpnp-haptic: Disable auto resonance on LRA frequency deviation" 2017-03-09 02:04:57 -08:00
Linux Build Service Account
8ca3301f72 Merge "ARM: dts: msm: set pm660 L6/L9/L19 to not follow HW_EN1 for wcn3990" 2017-03-09 02:04:57 -08:00
Linux Build Service Account
5b5c261ad2 Merge "ARM: dts: msm: No need to disable CXIP LM feature in KTM for sdm630" 2017-03-09 02:04:56 -08:00
Linux Build Service Account
515ac74e00 Merge "clk: qcom: Fix null pointer exception" 2017-03-09 02:04:55 -08:00
Linux Build Service Account
9bf700385d Merge "mmc: host: sdhci: Add new host_op for clearing ice configuration" 2017-03-08 15:47:28 -08:00
Linux Build Service Account
ac5d625313 Merge "ARM: dts: msm: Add kaslr offset IMEM entry for sdm630" 2017-03-08 15:47:26 -08:00
Linux Build Service Account
05da21ee3d Merge "ARM: dts: msm: enable SSC based sensors for QRD SDM630" 2017-03-08 15:47:25 -08:00
Linux Build Service Account
b9be5e00ae Merge "ARM: dts: msm: Enable Cx ipeak support from multimedia clients on SDM660" 2017-03-08 15:47:25 -08:00
Linux Build Service Account
d1a412e9b1 Merge "ASoC: codecs: Fix override of codec driver private data" 2017-03-08 15:47:24 -08:00
Linux Build Service Account
349f3344e5 Merge "ASoC: msm: Fix invalid access of codec pointer" 2017-03-08 15:47:23 -08:00
Linux Build Service Account
3e0acafdee Merge "qcom: smb-lib: force 9V for QC2.0 adapter" 2017-03-08 15:47:22 -08:00
Linux Build Service Account
1969f8fe9d Merge "arm64: Remove orig_addr_limit check in do_page_fault" 2017-03-08 15:47:21 -08:00
Linux Build Service Account
2e21181dde Merge "msm: ipa: Fix updating the repl_trig_thresh for LAN_CONS" 2017-03-08 15:47:20 -08:00
Linux Build Service Account
5457ac37d1 Merge "clk: qcom: Add separate aggre2_noc clock voters for SDM660/630" 2017-03-08 15:47:20 -08:00
Linux Build Service Account
b4659fbb0d Merge "USB: composite: Fix double release of spin_unlock_irqsave" 2017-03-08 15:47:19 -08:00
Linux Build Service Account
b8db96118b Merge "defconfig: msm: Enable Cx ipeak driver for SDM660" 2017-03-08 15:47:18 -08:00
Linux Build Service Account
91c39199b1 Merge "watchdog: Induce non secure watchdog bite for lockup" 2017-03-08 15:47:17 -08:00
Jack Pham
261c9dda82 usb: gadget: f_fs: Fix out-of-bounds string access
At the end of ffs_epfiles_create() a message is logged with
the name of the epfile, however this epfile pointer is only
valid in the body of the preceding for-loop. After the loop
exits, it is now pointing one past the allocated array and
results in an out-of-bounds memory access when formatting
the string.

Since there could be multiple ep's created, the name may not
be important to log. Replace it with the count instead. Also
while ffs_epfiles_destroy() doesn't have the same problem,
do the same there anyway for symmetry.

Change-Id: I10551f9c1e056f215ec59335cbf1cde2bad6cc04
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-03-08 09:52:54 -08:00
Linux Build Service Account
c78ba94d64 Merge "diag: Add NULL pointer checks in mask updates" 2017-03-08 06:51:07 -08:00
Linux Build Service Account
405c831196 Merge "soc: qcom: Free qmi handle in a worker thread" 2017-03-08 06:51:06 -08:00
Linux Build Service Account
70e1d5859a Merge "supply: qcom: add battery.o earlier" 2017-03-08 06:51:05 -08:00
Linux Build Service Account
bfc0e4b108 Merge "ARM: dts: msm: Enable Short-Circuit (SC) interrupt for LCDB on PM660L" 2017-03-08 06:51:04 -08:00
Linux Build Service Account
3a5e2a2080 Merge "msm: ADSPRPC: Handle SSR, daemon kill for audio PD" 2017-03-08 06:51:03 -08:00
Neeraj Upadhyay
a1d6abf78d ARM: dts: msm: Add kaslr offset IMEM entry for sdm630
Enable the msm-imem-kaslr_offset node for sdm630
which preserve the randomized kernel offset.

Change-Id: Icb4b6a94a702f07b99513ebd16ebc949b49d919c
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2017-03-08 16:23:34 +05:30
Ankit Sharma
1450b9c7da msm: qpnp-haptic: Disable auto resonance on LRA frequency deviation
Disable Auto-resonance if calibrated LRA frequency deviates more
than +/- 25% of initial LRA frequency and change error polling
frequency to 20ms.

While at it, fix the calculation of deviation error percent for
LRA rate code.

CRs-Fixed: 1099718
Change-Id: I329415992d3932e389e95995c1503c15ba282b19
Signed-off-by: Ankit Sharma <ansharma@codeaurora.org>
2017-03-08 13:30:31 +05:30
Bingzhe Cai
ec53c2750d ARM: dts: msm: enable SSC based sensors for QRD SDM630
Add device node for SSC sensor device for QRD SDM630.
It allows userspace client to read sensor related
information.

Change-Id: I9913274b778cdc4b148cfff2388da0642094b2b0
Signed-off-by: Bingzhe Cai <bingzhec@codeaurora.org>
2017-03-08 13:26:16 +08:00
Rupesh Tatiya
04123e01e2 ARM: dts: msm: set pm660 L6/L9/L19 to not follow HW_EN1 for wcn3990
There is leakage of ~300-400uA current in Bluetooth page scan scenarios
when L6/L9/L19 follow HW_EN1.

CRs-Fixed: 2011978
Change-Id: I1940c6c4638ae588b1b8126967d252d7cad06a51
Signed-off-by: Rupesh Tatiya <rtatiya@codeaurora.org>
2017-03-08 09:14:50 +05:30
Veerabhadrarao Badiganti
a7291efc55 mmc: host: sdhci: Add new host_op for clearing ice configuration
Add new host op for clearing ice configuration.
This config_end host op need to invoked for clearing ice configuration,
once mmc request processing is completed.

Change-Id: Ifc5569ae88748599b75ef5b3e625249ecd667762
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
2017-03-08 07:33:59 +05:30
Anirudh Ghayal
38bb2f628d ARM: dts: msm: Enable Short-Circuit (SC) interrupt for LCDB on PM660L
The SC interrupt handles the SC events and disables the module
if it persists.

CRs-Fixed: 1083319
Change-Id: I18e37440159089103c5ba89a9a2d793d9aafe433
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-03-08 06:54:03 +05:30
Anirudh Ghayal
85d260aee8 regulator: qpnp-lcdb: Handle short-circuit (SC) event
Handle the SC event in normal and TTW mode. Check if the
SC event is valid and re-enable the module to check
if it goes away. Disable the module altogether if the
SC event persists.

CRs-Fixed: 1083319
Change-Id: I20bd3ca0bd3cf273a2607656e3f51bde1eaf2dc6
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-03-08 06:53:56 +05:30
Linux Build Service Account
74efdfc1b9 Merge "ASoC: msm: qdsp6v2: Support app type for NOIRQ" 2017-03-07 16:55:52 -08:00
Linux Build Service Account
f2c96c8928 Merge "drivers: soc: add size check" 2017-03-07 16:55:51 -08:00
Linux Build Service Account
ac95e8f4e5 Merge "usb: xhci: Set bulk EP maxpacket to 8 for buggy FS devices" 2017-03-07 16:55:50 -08:00
Linux Build Service Account
e994a9c99d Merge "ARM: dts: msm: Add kaslr offset IMEM entry for sdm660" 2017-03-07 16:55:49 -08:00
Linux Build Service Account
4b7a5c696f Merge "icnss: set vdd-0.8-cx-mx regulator optional for icnss driver" 2017-03-07 16:55:48 -08:00
Linux Build Service Account
0d8cb86769 Merge "ARM: dts: msm: update cti gpio configuration on sdm660" 2017-03-07 16:55:47 -08:00
Linux Build Service Account
83c0e1120d Merge "wil6210: include moduleparam.h" 2017-03-07 16:55:46 -08:00
Zhen Kong
c83a067a9a qseecom: return app_id correctly when looking up and loading app
When __qseecom_check_app_exsits() and __qseecom_load_fw() get app_id
from TZ, they save it to function's return value then return back.
But "app_id" is of type uint32, "ret" is int32, this will return
incorrect app_id to the caller if app_id is larger than 0x7FFFFFFF.
Thus make change to return app_id correctly.

Change-Id: I2ef98d64490c480d5416ee24ec6ca9aca9c8ca8a
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2017-03-07 15:29:38 -08:00
Alexy Joseph
53804ded4f ASoC: msm: qdsp6v2: Support app type for NOIRQ
App type is required to send the calibration
for the modules in a topology that would
be selected for ULLPP. For this, expose
a mixer control. App type will be sent
if the ULLPP is used for NOIRQ.

CRs-Fixed: 2009687
Change-Id: I7c8349d5827dffe32c0db35262d54cb7c1dba1a9
Signed-off-by: Alexy Joseph <alexyj@codeaurora.org>
2017-03-07 12:28:47 -08:00
Abhijeet Dharmapurikar
6abd30face supply: qcom: add battery.o earlier
The initialization code in battery.c creates important votables like
FCC, FV which every many other charging drivers are dependent on.
The dependent charging drivers keep probe deferring until the votables
are created.

Ensure that battery.c's initialization code is invoked before other
drivers get added.

Change-Id: I52990baef7f7c4095e635728511e120c1dbe5e9d
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-03-07 11:38:26 -08:00
Prasad Sodagudi
6b68820719 arm64: Remove orig_addr_limit check in do_page_fault
Remove the orig_addr_limit check against KERNEL_DS in
do_page_fault handler for permissions faults. This
check is part of UAO and PAN features and these features
are disabled by default.

Change-Id: I5de760b983edcf14d1c0bee2a53dc091ceca31da
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
2017-03-07 11:08:25 -08:00
Ashay Jaiswal
90986348e0 qcom: smb-lib: force 9V for QC2.0 adapter
In case of USBIN-USBIN based parallel charging configuration
hardware based INOV is disabled and adapter output voltage of
QC3.0 adapter is controlled by userspace daemon. But in case
of QC 2.0 based adapter there is no such daemon to control
adapter output voltage, thus force 9V adapter output when a
QC 2.0 adapter is detected.

While at it, cancel icl_change_work before scheduling it in
order to make sure work is scheduled for next interval.

CRs-Fixed: 2015927
Change-Id: I198f8299b5cd0a62c518815c33088bb5e38c8505
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-03-07 23:38:36 +05:30
Ashay Jaiswal
d8ffd48003 power: qcom-charger: add OTG workaround for PM660
PM660 support configurable delay for softstart done with
minimum value of 3msec and thus OTG can be configured to
a minimum value till softstart completes. Add a PM660
specific workaround to set OTG current limit to 250mA before
enabling OTG mode and reconfigure the current back to desired
value once OTG softstart completes.

CRs-Fixed: 2016131
Change-Id: Iabb9e1c55cc59453825795e045d7fcc6caf8f33e
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
2017-03-07 23:38:24 +05:30
Linux Build Service Account
35731dbb93 Merge "ASoC: Add backend user count checking" 2017-03-07 06:25:14 -08:00
Linux Build Service Account
c5b24f3221 Merge "ASoC: wcd934x: mark AIF4 MAD TX as ignore suspend" 2017-03-07 06:25:13 -08:00
Linux Build Service Account
d7cded90e8 Merge "ARM: dts: msm: remove hph_en nodes for sdm660 qrd" 2017-03-07 06:25:12 -08:00
Linux Build Service Account
b8f5c40e55 Merge "ASoC: msm: qdsp6v2: set pointer to NULL after free" 2017-03-07 06:25:11 -08:00
Linux Build Service Account
3238c76389 Merge "ASoC: msm: add support for VI sense recording" 2017-03-07 06:25:08 -08:00