Commit graph

580936 commits

Author SHA1 Message Date
Linux Build Service Account
3b75c28dc2 Merge "ARM: dts: msm: Specify the interrupts properly for haptics on pm660" 2017-01-09 01:32:11 -08:00
Linux Build Service Account
cec4a662ea Merge "ARM: dts: msm: Specify the interrupts properly for haptics on pmi8998" 2017-01-09 01:32:10 -08:00
Linux Build Service Account
69fd33f749 Merge "qcom-charger: Fix crash due to null ptr access of pl psy" 2017-01-09 01:32:09 -08:00
Linux Build Service Account
3a12198f55 Merge "qcom-charger: typec legacy cable detection" 2017-01-09 01:32:09 -08:00
Linux Build Service Account
22b3cb62b0 Merge "lpm-levels: Do not consider cluster residency in suspend" 2017-01-09 01:32:08 -08:00
Linux Build Service Account
eb9fd932ae Merge "mmc: core: Enable HS mode first in the device and then in the host" 2017-01-09 01:32:07 -08:00
Linux Build Service Account
c52c8180c8 Merge "clk: msm: clock-osm: remove ioremaps from panic callback" 2017-01-09 01:32:06 -08:00
Linux Build Service Account
36d6426c99 Merge "qpnp-fg-gen3: show 0 time to full at 100% SOC" 2017-01-09 01:32:06 -08:00
Linux Build Service Account
1e5b699f08 Merge "pmic-voter: Allow forcing a value via debug interface" 2017-01-09 01:32:05 -08:00
Linux Build Service Account
a44f92715b Merge "ASoC: msm: qdsp6v2: DAP: Add check to validate param length" 2017-01-09 01:32:04 -08:00
Linux Build Service Account
149442b64e Merge "msm: vidc: enable passive buses while unload firmware" 2017-01-09 01:32:03 -08:00
Linux Build Service Account
834cafa954 Merge "ASoC: msm: qdsp6v2: add route for secondary MI2S TX hostless capture" 2017-01-09 01:32:03 -08:00
Linux Build Service Account
7bf4e176b4 Merge "msm: cpp: Use regulator APIs for gdsc reg access" 2017-01-09 01:32:02 -08:00
Linux Build Service Account
2113b4e7d2 Merge "msm: camera-v2: vpe: Add check to prevent index out of bounds" 2017-01-09 01:32:01 -08:00
Linux Build Service Account
e863daf413 Merge "ARM: dts: msm: Add actuator node to camera1 node for 8998" 2017-01-09 01:32:00 -08:00
Andrey Markovytch
3eab9b61f3 security: switched to stackable model for PFT/PFK module
Moved hooks from SELINUX framework to general SECURITY framework.

Change-Id: I37e701b4925c4993f724c32b258c5088f4dcbe4d
Signed-off-by: Andrey Markovytch <andreym@codeaurora.org>
2017-01-09 11:23:03 +02:00
Chandana Kishori Chiluveru
99392dcd7d usb: gadget: Fix null pointer crash issue in gsi_free_inst
If misc register failed then there is a chance for accessing the
null pointer in gsi_free_inst function and leads to target crash.
Hence add the change to handle the same.

Change-Id: Iaa3f7db1403ca2d87f259dec109912c5437c24f4
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>
2017-01-09 11:40:22 +05:30
cyizhao
28a9e2bfa0 ARM: dts: msm: Change FG cut-off voltage to 3.7V for SDM660 QRD
SDM660 QRD device will use Groot V1.0 device which would reset
when VPH_PWR and VBOB crossover, this causes the MSM to reset and
a device reboot. Set cut-off voltage to 3.7V to avoid this happen
but this will lose some battery capacity as the penalty.

CRs-Fixed: 1107239
Change-Id: Idae459e036089fa1161d8dd81c33dc393deac3aa
Signed-off-by: cyizhao <cyizhao@codeaurora.org>
2017-01-08 18:06:46 -08:00
Walter Yang
437969bb3a ARM: dts: msm: add audio support for sdm660 qrd skus
Add support for required node for audio of sdm660 qrd skus
with tasha codec.

CRs-Fixed: 1106852
Change-Id: If61b6669ce7a22eb02c044ced240da00e1069bdf
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
2017-01-08 17:56:19 -08:00
zhenchao
48bebffe20 ARM: dts: msm: Enable blsp2_uart1_hs for sdm660 QRD
Enable blsp2_uart1 for WCN3990 for sdm660 QRD to use high
speed UART driver for bluetooth HCI interface.

CRs-Fixed: 1106765
Change-Id: I27aee84ce0f68a25181eeeb9f2404adbaf7d3600
Signed-off-by: zhenchao <zhenchao@codeaurora.org>
2017-01-08 17:54:58 -08:00
cyizhao
7e65ab057d ARM: dts: msm: Set WLED string number for SDM660 QRD
Specify the number of strings in WLED properly according to hardware
connection.

CRs-Fixed: 1108198
Change-Id: I39d3a0ba05a78d0d3204ffb56df64830d0fdedce
Signed-off-by: cyizhao <cyizhao@codeaurora.org>
2017-01-08 17:53:18 -08:00
Linux Build Service Account
08a95e6878 Merge "drm/msm: remove clock framework dependency" 2017-01-08 16:32:11 -08:00
Prasad Sodagudi
adcb849731 arm64: Add TLB conflict fault handler
Add TLB conflict fault handler and try to handle
gracefully. Check whether TLB fault can be handled
by EL2 and cause panic if EL2 is not able to handle.

Change-Id: I276ec5413411932bd8a67ed4c85ebbf66f4affcf
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
2017-01-08 12:56:28 -08:00
Linux Build Service Account
e51c3cc83f Merge "defconfig: msm: compile video drivers as builtins" 2017-01-08 08:05:53 -08:00
Linux Build Service Account
dfa7c4abac Merge "ASoC: wcd934x: Fix out of bounds for mad input value" 2017-01-08 08:05:53 -08:00
Linux Build Service Account
827cd4f6bb Merge "drivers: mfd: Add support for direct apps interrupt" 2017-01-08 08:05:52 -08:00
Linux Build Service Account
99286f0b5d Merge "ARM: dts: msm: add a new panel driver for sdm660 QRD" 2017-01-08 08:05:51 -08:00
Linux Build Service Account
824a1a6d2a Merge "ARM: dts: msm: Enable volume up key for qrd sdm660" 2017-01-08 08:05:50 -08:00
Linux Build Service Account
1f52cde69c Merge "qseecom: Rename clock handle names" 2017-01-08 08:05:46 -08:00
Linux Build Service Account
082aa733d8 Merge "msm: cpp: Fix for integer overflow in cpp" 2017-01-07 23:00:03 -08:00
Linux Build Service Account
96f3cc94dd Merge "media: dvb-core: Fix for dvb_ringbuffer merge conflict" 2017-01-07 13:44:17 -08:00
Linux Build Service Account
fc0faf1b5e Merge "msm: isp: Handle ping pong mismatch error" 2017-01-07 13:44:16 -08:00
Linux Build Service Account
ccf3c89458 Merge "input: move qpnp-power-on driver into input/misc directory" 2017-01-07 05:24:01 -08:00
Linux Build Service Account
ad65eb0904 Merge "ARM: dts: msm: Add support for pwr/perf supply for sdm660" 2017-01-07 05:24:00 -08:00
Linux Build Service Account
2330401695 Merge "spcom: free all SKP ION buffers on SSR" 2017-01-07 05:23:57 -08:00
Linux Build Service Account
8964db0fd5 Merge "clk: qcom: osm: remove ioremaps from panic callback" 2017-01-07 05:23:56 -08:00
John zhao
22f9774b40 sched: add the max_freq comparing for evaluating the mitigation
trace_sched_get_task_cpu_cycles traces max_freq during the tracing of
OSM cycle considering mitigated such as thermal etc.

Change-Id: If134630e293ceaf8faf2aa0ed7d4cfdfe7b3a4d6
CRs-Fixed: 1108711
Signed-off-by: John zhao <yuankuiz@codeaurora.org>
2017-01-07 16:54:38 +08:00
Pavankumar Kondeti
432662eb4d sched: fix stale predicted load in trace_sched_get_busy()
When early detection notification is pending, we skip calculating
predicted load. Initialize it to 0 so that stale value does not
get printed in trace_sched_get_busy().

Change-Id: I36287c0081f6c12191235104666172b7cae2a583
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2017-01-07 13:49:22 +05:30
Manikanta Sivapala
0124613ef0 defconfig: msm: compile video drivers as builtins
Video kernel modules as LKM make the T32 debugging difficult.
So, make video drivers as part of boot image.

Change-Id: I229eba78f883d7656ac1bd64487dccc70bb0d43c
Signed-off-by: Manikanta Sivapala <msivap@codeaurora.org>
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2017-01-06 22:37:56 -08:00
Manikanta Sivapala
47c3da9b77 ARM: dts: msm: Enable early firmware loading for SDM660
This will ensure that the FW is always loaded and will
save the load time.

CRs-Fixed: 1103405
Change-Id: I40341f50852fb1df418c72fd0fa952af5670be23
Signed-off-by: Manikanta Sivapala <msivap@codeaurora.org>
Signed-off-by: Deepak Kushwah <dkushwah@codeaurora.org>
2017-01-06 22:11:10 -08:00
Siddartha Mohanadoss
c5fd9dbe9d thermal: tsens: Switch from usleep_range() to msleep
On certain cases we have seen usleep_range() return before
the intended minimum time parameter passed to this function.
There is no protection against wakeups and we may return
early. msleep() already has code to handle this cases since
it loops as long as there is still time.

Change-Id: I3cf1e2d7f61f5a6d42d66afb86ae3b3fe141a9e7
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2017-01-06 16:04:55 -08:00
Derek Chen
97f8286b25 ASoC: msm: qdsp6v2: add support for ADM_OPEN_V6 for multi-mic ec
Add support for ADM_CMD_DEVICE_OPEN_V6 when the mixer path
specifies to use the multi-mic-echo-reference, which configures
the EndPoint2 for Echo Reference.

CRs-fixed: 1022080
Change-Id: I474f39a3437fa18003f4342e003d689b95837699
Signed-off-by: Derek Chen <chenche@codeaurora.org>
2017-01-06 13:38:55 -08:00
Karthikeyan Mani
145c630b36 ASoC: msm: qdsp6v2: Fix out-of-bounds access in put functions
Add out of bounds check in routing put functions
for the mux value before accessing the texts
pointer of soc_enum struct with mux as index.

CRs-fixed: 1097569
Change-Id: If1161ea918680deacc0d322d11f42637f377a9ab
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
2017-01-06 12:26:10 -08:00
David Collins
07f2f9952c input: move qpnp-power-on driver into input/misc directory
Move the qpnp-power-on driver from the drivers/input directory
into the drivers/input/misc directory.  This is the standard
location where other power key drivers are kept.

Also make a small fix to use octal instead of symbolic
permissions for the ship_mode_en module parameter.

Change-Id: I4d80c2ca0f161bd443dbfe0fcef822459c9fe44b
Signed-off-by: David Collins <collinsd@codeaurora.org>
2017-01-06 10:52:46 -08:00
Yan He
642effc4f6 msm: sps: add the checking of userspace input length
Add the checking of the input length from userspace so kernel space
will not copy any content outside the input buffer.

Change-Id: I3cef834ed1df836356ba40e6e950a534ec49819d
Signed-off-by: Yan He <yanhe@codeaurora.org>
2017-01-06 10:27:45 -08:00
Linux Build Service Account
e4e95be265 Merge "ARM: dts: msm: Add an entry to the Silver memlat table for msm8998" 2017-01-06 08:11:50 -08:00
Marty Faltesek
896bb81297 ath10k: cache calibration data when the core is stopped
Commit 0b8e3c4ca29f ("ath10k: move cal data len to hw_params") broke retrieving
the calibration data from cal_data debugfs file. The length of file was always
zero. The reason is:

    static ssize_t ath10k_debug_cal_data_read(struct file *file,
                                          char __user *user_buf,
                                          size_t count, loff_t *ppos)
    {
        struct ath10k *ar = file->private_data;
        void *buf = file->private_data;

This is obviously bogus, private_data cannot contain both struct ath10k and the
buffer. Fix it by caching calibration data to ar->debug.cal_data. This also
allows it to be accessed when the device is not active (interface is down).

The cal_data buffer is fixed size because during the first firmware probe we
don't yet know what will be the lenght of the calibration data. It was simplest
just to use a fixed length. There's a WARN_ON() in
ath10k_debug_cal_data_fetch() if the buffer is too small.

Tested with qca988x and firmware 10.2.4.70.56.

Reported-by: Nikolay Martynov <mar.kolya@gmail.com>
Fixes: 0b8e3c4ca29f ("ath10k: move cal data len to hw_params")
Cc: stable@vger.kernel.org # 4.7+
Signed-off-by: Marty Faltesek <mfaltesek@google.com>
[kvalo@qca.qualcomm.com: improve commit log and minor other changes]
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
2017-01-06 15:59:10 +05:30
Mohammed Shafi Shajakhan
c0466f0d4a ath10k: Ignore SWBA event for a vif if its marked for no beacon
Ignore processing further in SWBA event scheduled for a vif, if mac80211
has marked the particular vif for stop beaconing and brought the vdev
down in 'ath10k_control_beaconing'. This should potentially avoid ath10k
warning/error messages while running continuous wifi down/up with max
number of vaps configured. Found this change during code walk through
and going through other beacon configuration related functions in ath10k

Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
2017-01-06 15:59:10 +05:30
Wei Yongjun
f3adb5a356 ath10k: fix error return code in ahb
Fix to return a negative error code from the error handling case
instead of 0, as done elsewhere in function ath10k_ahb_probe() or
ath10k_ahb_resource_init().

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
2017-01-06 15:59:10 +05:30
Ben Greear
0d1f3862c2 ath10k: support up to 64 vdevs
The (1 << x) - 1 trick won't work when you
are trying to fill up all 64 bits, so add special
case for that.

Signed-off-by: Ben Greear <greearb@candelatech.com>
[kvalo@qca.qualcomm.com: remove the sentence about moving limits]
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
2017-01-06 15:59:09 +05:30