OSDN Git Service
Linux Build Service Account [Thu, 14 Sep 2017 01:59:40 +0000 (18:59 -0700)]
Merge "msm: camera: isp: Check null pointer for VFE0 base"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:19 +0000 (10:58 -0700)]
Merge "msm: mdss: dp: fix wdog_bite while disconnecting DP cable"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:18 +0000 (10:58 -0700)]
Merge "msm: mdss: hdmi: correctly validate the cec msg frame size"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:17 +0000 (10:58 -0700)]
Merge "msm: ais: isp: Reducing ISPIF stop waiting time"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:15 +0000 (10:58 -0700)]
Merge "msm: mdss: hdmi: fix no audio over HDMI on device bootup"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:14 +0000 (10:58 -0700)]
Merge "msm: mdss: Increase the max layer count to 13"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:13 +0000 (10:58 -0700)]
Merge "adv7481: return error when PLL lock fails"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:13 +0000 (10:58 -0700)]
Merge "ARM: dts: msm: Early init changes for vendor image on msm8996"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:12 +0000 (10:58 -0700)]
Merge "mmc: host: Update the USE_PIO_FOR_EMMC_TUNING quirk value"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:10 +0000 (10:58 -0700)]
Merge "cgroup/cpuset: remove circular dependency deadlock"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:09 +0000 (10:58 -0700)]
Merge "power: smblib: correct PD voting when inactive"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:08 +0000 (10:58 -0700)]
Merge "adv7481: Add support for CSI 4 lane for ADV7481"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:08 +0000 (10:58 -0700)]
Merge "msm: camera: fix off-by-one overflow in msm_isp_get_bufq"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:07 +0000 (10:58 -0700)]
Merge "msm: ais: sensor: flash: add conditional check for ioctl"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:06 +0000 (10:58 -0700)]
Merge "msm: ais: Return -NOTTY on invalid ioctl command"
Linux Build Service Account [Wed, 13 Sep 2017 17:58:05 +0000 (10:58 -0700)]
Merge "msm: mdss: hdmi: configure hdcp feature support"
Prateek Sood [Fri, 8 Sep 2017 07:40:55 +0000 (13:10 +0530)]
cgroup/cpuset: remove circular dependency deadlock
Remove circular dependency deadlock in a scenario where hotplug of CPU is
being done while there is updation in cgroup and cpuset triggered from
userspace.
Process A => kthreadd => Process B => Process C => Process A
Process A
cpu_subsys_offline();
cpu_down();
_cpu_down();
mutex_lock(&cpuhotplug.lock); //held
__cpu_notify();
workqueue_cpu_down_callback();
queue_work_on(system_highpri_wq);
__queue_work();
insert_work();
wake_up_worker(); //pool->nr_running = 0
flush_work();
wait_for_completion();
worker_thread();
need_more_worker(); // returns true
manage_workers();
maybe_create_worker();
create_worker();
kthread_create_on_node();
wake_up_process(kthreadd_task);
kthreadd
kthreadd();
kernel_thread();
do_fork();
copy_process();
percpu_down_read(&cgroup_threadgroup_rwsem);
__rwsem_down_read_failed_common(); //waiting
Process B
kernfs_fop_write();
cgroup_file_write();
cgroup_tasks_write();
percpu_down_write(&cgroup_threadgroup_rwsem); //held
cgroup_attach_task();
cgroup_migrate();
cgroup_taskset_migrate();
cpuset_can_attach();
mutex_lock(&cpuset_mutex); //waiting
Process C
kernfs_fop_write();
cgroup_file_write();
cpuset_write_resmask();
mutex_lock(&cpuset_mutex); //held
update_cpumask();
update_cpumasks_hier();
rebuild_sched_domains_locked();
get_online_cpus();
mutex_lock(&cpuhotplug.lock); //waiting
Eliminate this dependecy by reordering locking of cpuset_mutex
and cpuhotplug.lock.
Change-Id: Ifd76373d717c53b531623a3be76b7d32e0d959fd
Signed-off-by: Prateek Sood <prsood@codeaurora.org>
Linux Build Service Account [Wed, 13 Sep 2017 07:17:51 +0000 (00:17 -0700)]
Merge "power: qcom: smb135x: change OTG regulator ops to static"
Linux Build Service Account [Wed, 13 Sep 2017 07:17:51 +0000 (00:17 -0700)]
Merge "power: qpnp-fg-gen3: adjust ki coefficient for full soc dynamically"
Linux Build Service Account [Wed, 13 Sep 2017 07:17:50 +0000 (00:17 -0700)]
Merge "usb: gadget: u_ether: Add NULL check in helper APIs"
Linux Build Service Account [Wed, 13 Sep 2017 07:17:49 +0000 (00:17 -0700)]
Merge "usb: gadget: Update default class subclass and protocol for rndis"
Rahul Sharma [Tue, 5 Sep 2017 11:14:07 +0000 (16:44 +0530)]
msm: ais: isp: Reducing ISPIF stop waiting time
Initial ISPIF waiting was one second which causes
hang for one second in case of sensor removal hence
wait is reduced to 200ms.
Change-Id: I531a880435983fe2e1e4f0f7616c6a6b1632dac8
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Krishna Chaitanya Devarakonda [Mon, 4 Sep 2017 10:13:55 +0000 (15:43 +0530)]
msm: mdss: Increase the max layer count to 13
The maximum number of layers could be 13 including the
cursor layer. Increasing the maximum layer count to
accommodate cursor layer.
Change-Id: I907feb14fbd2d2ab5de66b4dee83d90d94c59595
Signed-off-by: Krishna Chaitanya Devarakonda <kdevarak@codeaurora.org>
Jaiju Yesudasan [Mon, 31 Jul 2017 10:37:38 +0000 (16:07 +0530)]
adv7481: return error when PLL lock fails
Return error instead of default width and height when PLL lock fails.
Suggested-by: Suprith Malligere <c_suprit@qti.qualcomm.com>
Change-Id: I80880e9d1f6bcd5d6df87f74d005f9c79f91f096
Signed-off-by: Jaiju Yesudasan <cjaijuy@codeaurora.org>
Jaiju Yesudasan [Mon, 31 Jul 2017 10:51:58 +0000 (16:21 +0530)]
adv7481: Add support for CSI 4 lane for ADV7481
Enable CSI 4 lane in adv7481 to support 1080p and 60fps.
Suggested-by: Suprith Malligere <c_suprit@qti.qualcomm.com>
Change-Id: I053602fc73fe300cff780dfe75c546ff3768ee3c
Signed-off-by: Jaiju Yesudasan <cjaijuy@codeaurora.org>
Gaoxiang Chen [Wed, 17 May 2017 07:14:36 +0000 (15:14 +0800)]
msm: camera: fix off-by-one overflow in msm_isp_get_bufq
In msm_isp_get_bufq, if bufq_index == buf_mgr->num_buf_q,
it will pass the check, leading to off-by-one overflow
(exceed the length of array by one element).
CRs-Fixed:
2031677
Change-Id: I7ea465897e2c37de6ca0155c3e225f1444b3cf13
Signed-off-by: Gaoxiang Chen <gaochen@codeaurora.org>
Anthony Mah [Tue, 22 Aug 2017 23:36:35 +0000 (16:36 -0700)]
ARM: dts: msm: Early init changes for vendor image on msm8996
For use with A/B partition feature, remove early mount of system
image. Change fs mgr flags from verify to slotselect.
System image is to be mounted in the lk when enabling A/B.
Change-Id: I4fc2ac5f5bd22dea2fd6ff832cd31d1f3697b4d4
Signed-off-by: Anthony Mah <amah@codeaurora.org>
Linux Build Service Account [Tue, 12 Sep 2017 21:41:59 +0000 (14:41 -0700)]
Merge "Merge android-4.4@
610af85 (v4.4.85) into msm-4.4"
Linux Build Service Account [Tue, 12 Sep 2017 21:41:58 +0000 (14:41 -0700)]
Merge "msm: kgsl: Protect the bind object against bad dereference"
Linux Build Service Account [Tue, 12 Sep 2017 21:41:48 +0000 (14:41 -0700)]
Merge "msm: ipa: ipa_usb: teth_prot and ttype validation"
Harry Yang [Tue, 12 Sep 2017 18:15:04 +0000 (11:15 -0700)]
power: smblib: correct PD voting when inactive
Currently, when becoming inactive, PD leaves the HDC and input
limited interrupt enabled.
Correct it by disabling it.
Change-Id: I62a1d837f6126951cb428a982fe1d8876f1d5bdc
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Rahul Sharma [Tue, 12 Sep 2017 05:31:57 +0000 (11:01 +0530)]
msm: ais: sensor: flash: add conditional check for ioctl
Add conditional check when sending VIDIOC_MSM_FLASH_CFG
in 32-bit process.
Change-Id: Ia4255aba26c634018163e2cc3c1170f71b1eb661
CRs-Fixed:
2092793
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Linux Build Service Account [Tue, 12 Sep 2017 12:25:47 +0000 (05:25 -0700)]
Merge "msm: camera: isp: Avoid stats data corruption."
Linux Build Service Account [Tue, 12 Sep 2017 12:25:46 +0000 (05:25 -0700)]
Merge "drm/msm/sde: remove out of bound access for qos lut parsing"
Linux Build Service Account [Tue, 12 Sep 2017 12:25:45 +0000 (05:25 -0700)]
Merge "drm/msm: fix non-zero offset register dumping"
Linux Build Service Account [Tue, 12 Sep 2017 12:25:44 +0000 (05:25 -0700)]
Merge "msm: vidc: Avoid adding failed instance into list"
Linux Build Service Account [Tue, 12 Sep 2017 12:25:35 +0000 (05:25 -0700)]
Merge "ARM: dts: msm: add dummy SPSS ETM device for msm8998"
Linux Build Service Account [Tue, 12 Sep 2017 12:25:34 +0000 (05:25 -0700)]
Merge "ASoc: msm: Add pm_qos_request_active condition check"
Narender Ankam [Mon, 24 Jul 2017 12:56:12 +0000 (18:26 +0530)]
msm: mdss: hdmi: fix no audio over HDMI on device bootup
In case of HDMI interface as primary, if device boots up with
HDMI connected, external interface driver is unable to notify
audio events as audio codec is getting registered later.
Add change to send audio event once audio codec gets registered.
Change-Id: I8d630adf892714ff2eb4d6039dc058b54c425b83
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
Narender Ankam [Mon, 24 Jul 2017 11:58:46 +0000 (17:28 +0530)]
msm: mdss: hdmi: notify hdmi audio event after video is up
Modify HDMI driver so that video and audio events are notified
separately. Notify video events asynchronously. send audio
events only after video is up.
Change-Id: Ie6e4e564456d65f6b6d733b8accd14b9ce4c7e15
Signed-off-by: Narender Ankam <nankam@codeaurora.org>
Ramesh V [Mon, 4 Sep 2017 11:50:15 +0000 (17:20 +0530)]
msm: camera: isp: Avoid stats data corruption.
When several threads permanently, e.g., read/write the debugfs
file that triggers vfe_debugfs_statistics_read(), the content of
stats will be modified in an unintended manner, add spin_lock
to protect that.
Change-Id: I15d46498e669132ef1d1f5ad9c4305ee5fdb0da4
Signed-off-by: Ramesh V <ramev@codeaurora.org>
Linux Build Service Account [Tue, 12 Sep 2017 02:13:16 +0000 (19:13 -0700)]
Merge "msm: kgsl: Limit the kgsl log frequency in kgsl_get_unmapped_area()"
Linux Build Service Account [Tue, 12 Sep 2017 02:13:15 +0000 (19:13 -0700)]
Merge "usb_bam: Delete IPA resources in usb_bam_remove()"
Linux Build Service Account [Tue, 12 Sep 2017 02:13:06 +0000 (19:13 -0700)]
Merge "scripts: correct cflags for kasan"
Linux Build Service Account [Tue, 12 Sep 2017 02:13:05 +0000 (19:13 -0700)]
Merge "ASoC: sdm660_cdc: Fix mute if compander is disabled"
Linux Build Service Account [Tue, 12 Sep 2017 02:13:04 +0000 (19:13 -0700)]
Merge "dts: msm: Add QSEECOM heap node on msm8996 lfv platform"
Linux Build Service Account [Tue, 12 Sep 2017 02:13:03 +0000 (19:13 -0700)]
Merge "msm: thermal: Check cpu variables are initialized before setting threshold"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:59 +0000 (19:12 -0700)]
Merge "wil6210: ensure P2P device is stopped before removing interface"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:58 +0000 (19:12 -0700)]
Merge "wil6210: increase connect timeout"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:58 +0000 (19:12 -0700)]
Merge "wil6210: clear PAL_UNIT_ICR part of device reset"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:57 +0000 (19:12 -0700)]
Merge "wil6210: move pre-FW configuration to separate function"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:56 +0000 (19:12 -0700)]
Merge "msm: ipa: Cache CNE event"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:55 +0000 (19:12 -0700)]
Merge "msm: kgsl: Do not allocate scratch memory for A3xx"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:54 +0000 (19:12 -0700)]
Merge "ath10k: Destroy QMI handle during driver unload"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:53 +0000 (19:12 -0700)]
Merge "msm: sensor: flash: add conditional check for ioctl"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:52 +0000 (19:12 -0700)]
Merge "msm: kgsl: Fix gpu fault issue while enabling stall on page fault"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:51 +0000 (19:12 -0700)]
Merge "msm: kgsl: Add debug log in adreno_of_get_pwrlevels()"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:50 +0000 (19:12 -0700)]
Merge "ARM: dts: msm: Add Support for new PM660L/A versions for SDM660/SDM630"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:48 +0000 (19:12 -0700)]
Merge "ARM: dts: msm: Add FAN cooling device to msm8996 CV2X boards"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:47 +0000 (19:12 -0700)]
Merge "msm: ais: isp: Check null pointer for VFE0 base"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:46 +0000 (19:12 -0700)]
Merge "ARM: dts: msm: enable camera on SDM636 MTP"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:44 +0000 (19:12 -0700)]
Merge "mmc: core: enable async suspend of card"
Linux Build Service Account [Tue, 12 Sep 2017 02:12:43 +0000 (19:12 -0700)]
Merge "Revert "ARM: dts: msm: Add initial support for msm8998-9x55""
Yigang Zheng [Fri, 28 Jul 2017 09:34:34 +0000 (17:34 +0800)]
msm: vidc: Avoid adding failed instance into list
Fix system crash bug when run multiple vidc instances
Change-Id: I7716854c210bf8d1191e2744e555d42f42e4a1f5
Signed-off-by: Yigang Zheng <yigangz@codeaurora.org>
Abhinav Kumar [Thu, 31 Aug 2017 22:29:55 +0000 (15:29 -0700)]
drm/msm: fix non-zero offset register dumping
Remove format identifiers in the register dumping
function which incorrectly recognizes the offset and
the count of the registers to be dumped.
Also, reduce the chunk of memory copied from the SDE
hardware register range to align with the existing
register dumping mechanism.
Change-Id: I1ce7148275f5287e568fe6efc8774f4d495cdaa4
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Mao Jinlong [Tue, 5 Sep 2017 08:04:00 +0000 (16:04 +0800)]
scripts: correct cflags for kasan
Enable address sanitizer flags for kasan by default.
Change-Id: Ib08149a7d1af589fed3ce30659cb495d4bb2fb81
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
Vijayavardhan Vennapusa [Fri, 8 Sep 2017 10:10:21 +0000 (15:40 +0530)]
usb_bam: Delete IPA resources in usb_bam_remove()
Whenever dwc3_msm_probe() fails, it calls of_depopulate() to remove child
devices as part of cleanup. Due to this, usb_bam_remove() gets called to
do cleanup. But this API is not deleting IPA resources created during
probe and leads to creation of IPA resources fail, when probe is called
again. This eventually results in crash, when IPA driver calls notify
callback after PROD resource granted. Hence fix it by deleting IPA
resources in usb_bam_remove().
Also change enum type of ipa_rm_resource_prod/ipa_rm_resource_cons arrays
to enum ipa_rm_resource_name to fix sparse errors.
Change-Id: I3d9d0e1b26f1de0ba2b56b42c7e10a097d4fa8be
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Vatsal Bucha [Thu, 31 Aug 2017 07:15:24 +0000 (12:45 +0530)]
ASoC: sdm660_cdc: Fix mute if compander is disabled
Compander disable sequence does not get called
after headphone playback on fm. This results in
mute at one channel and low volume at other channel.
Low volume is resolved by setting analog mode to manual
while compander is off.
Also compander clock should be disabled at the end to
resolve mute issue.
CRs-Fixed:
2102126
Change-Id: I68e72f3b333117a8fdf379db30dc24de9bed7270
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
Dhaval Patel [Mon, 19 Jun 2017 23:51:21 +0000 (16:51 -0700)]
drm/msm/sde: remove out of bound access for qos lut parsing
QOS LUT dtsi entries use existing hardware parsing APIs
but dos not increase the size of array. This causes out of
bound access while reading u32 lut array entry. This patch
fixes the array size and also adds checks to avoid future
out of bound access. It also fixes the memory leak in
qos lut parsing.
Change-Id: I98de052d03e1bcfd79d15ab99ca41d7782e56682
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Saranya Chidura [Thu, 7 Sep 2017 04:23:59 +0000 (09:53 +0530)]
ARM: dts: msm: add dummy SPSS ETM device for msm8998
Add dummy device for SPSS ETM. This device can be used to
configure SPSS ETM trace path.
Change-Id: Idd060ce0de61acab7842103f47c838f4a618d9df
Signed-off-by: Saranya Chidura <schidura@codeaurora.org>
Rahul Sharma [Fri, 8 Sep 2017 13:21:43 +0000 (18:51 +0530)]
msm: ais: Return -NOTTY on invalid ioctl command
Check validity of command before processing.
Change-Id: Iecd66b90922f8ed4b7d8d50f7c3d7f27d5d93309
CR-fixed:
2083314
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Amit Blay [Wed, 6 Sep 2017 06:45:32 +0000 (09:45 +0300)]
dts: msm: Add QSEECOM heap node on msm8996 lfv platform
Add the QSEECOM ION heap node, to allow QSEECOM driver and QSEECOM
API library to allocate ION memory from QSEECOM heap.
Change-Id: Ia0b346bbac9378b79d1b7683ee1cc0ade533b4fa
Signed-off-by: Amit Blay <ablay@codeaurora.org>
Linux Build Service Account [Sun, 10 Sep 2017 17:20:26 +0000 (10:20 -0700)]
Merge "mmc: sdhci: Add logs when ignoring timeout due to quirk"
Lior David [Mon, 4 Sep 2017 09:03:21 +0000 (12:03 +0300)]
wil6210: ensure P2P device is stopped before removing interface
User space can remove the P2P management interface while it is active
(for example, while listen/search is active) and this can cause
a crash. Ensure the P2P device is fully stopped before removing.
Change-Id: Ibc94f12bc63f2ba31ede24afffd9c5acbf95467a
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
69fecf599f48e258984b2ffdf0a4c65a35a31287
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lior David [Mon, 4 Sep 2017 09:01:49 +0000 (12:01 +0300)]
wil6210: increase connect timeout
Connect can take longer than current timeout in some scenarios,
for example with long-range antenna array. Increase the timeout
to support these scenarios.
Change-Id: Id59cf4f11f8381ab8eab748171ef2b7949dde887
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
d83ad4c4fd78b22935711f865048bab78b43fc86
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Dedy Lansky [Mon, 4 Sep 2017 09:00:50 +0000 (12:00 +0300)]
wil6210: clear PAL_UNIT_ICR part of device reset
When FW starts running it can get D0 to D3 interrupt that is a leftover
from previous system suspend while FW was not running.
As this interrupt is not relevant anymore, clear it part of device reset
procedure.
Change-Id: I213a18fd59a500914ab22f75a72393786188a08e
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
7086d861753bc0aaa8b6445f657d8e39953e4fcd
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Dedy Lansky [Mon, 4 Sep 2017 08:58:34 +0000 (11:58 +0300)]
wil6210: move pre-FW configuration to separate function
Re-arrange the code to have dedicated function for device configuration
which takes place before FW starts running.
Change-Id: Ia0f2b33f85ba9547bee9415e34143e5b09e28447
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
1490846d256af947a4743f04ba8c97dc3bc37073
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lazar Alexei [Mon, 4 Sep 2017 08:57:30 +0000 (11:57 +0300)]
wil6210: align to latest auto generated wmi.h
Align to latest version of the auto generated wmi file
describing the interface with FW.
Change-Id: I5cd2130c17457544d055aaff15f5747a3d241e23
Signed-off-by: Lazar Alexei <qca_ailizaro@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
761f8e4d463e1cbf6da0d228bc74cecc800d4de5
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Gidon Studinski [Mon, 4 Sep 2017 07:55:55 +0000 (10:55 +0300)]
wil6210: make debugfs compilation optional
Since debugfs is a kernel configuration option, enable the driver to
compile without debugfs.
Change-Id: Id1b162172e2662a59af5b031a71ccd22250e4b6d
Signed-off-by: Gidon Studinski <qca_gidons@qca.qualcomm.com>
Signed-off-by: Hamad Kadmany <qca_hkadmany@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
5f591dac9f20f76439df2e18570765d384a94070
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lior David [Mon, 4 Sep 2017 07:32:10 +0000 (10:32 +0300)]
wil6210: ratelimit errors in TX/RX interrupts
Sometimes there is a firmware crash but the hardware
is not fully stopped and continue to send TX/RX interrupts.
This can cause an overload of messages which can bring the
host down. Add ratelimit to these error messages to fix this.
Change-Id: If0f8bfbec1df1c5d98c87d64191ef14bf6579ae1
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
40cbd88be702a2455b6e047dc13f5d51ed542063
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Linux Build Service Account [Sat, 9 Sep 2017 23:48:38 +0000 (16:48 -0700)]
Merge "drivers: media: broadcast: Fix security vulnerability issue"
Linux Build Service Account [Sat, 9 Sep 2017 13:32:42 +0000 (06:32 -0700)]
Merge "tty: serial_core: add tty NULL check to uart_tx_stopped"
Linux Build Service Account [Sat, 9 Sep 2017 05:04:17 +0000 (22:04 -0700)]
Merge "ARM: dts: msm: Enable CAN controller for msm8996 CV2X boards"
Linux Build Service Account [Sat, 9 Sep 2017 05:04:15 +0000 (22:04 -0700)]
Merge "Merge android-4.4@
4b8fc9f (v4.4.82) into msm-4.4"
Linux Build Service Account [Sat, 9 Sep 2017 05:04:14 +0000 (22:04 -0700)]
Merge "soc: qcom: initialize glink link state"
Manaf Meethalavalappu Pallikunhi [Wed, 6 Sep 2017 18:53:51 +0000 (00:23 +0530)]
msm: thermal: Check cpu variables are initialized before setting threshold
Userspace thermal daemon initiate KTM hotplug monitor related
initialization. Thermal core control can be disabled/enabled from
userspace via KTM sysfs for cpu related initialization after boot.
There is a possible race condition between KTM hotplug initialization
from thermal daemon and KTM core control re-enablement from userpsace
shell. When these both events are triggered at the same time,
thermal core control enablement tries to set emergency hotplug
threshold prior to per cpu hotplug related initialization like sensor
id, trip and threshold value etc. This leads to wrong sensor
threshold settings and eventually thermal core sensor threshold list
will be broken.
To avoid this wrong threshold settings during thermal core control
enablement, check KTM hotplug related initialization is done prior
to threshold setting for each core.
Change-Id: I916527d187146d5e292dd57897aa70b21cf87fbc
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Govind Singh [Thu, 7 Sep 2017 14:49:24 +0000 (20:19 +0530)]
ath10k: Destroy QMI handle during driver unload
QMI handle was not destroyed during unload and server exit
and resulting in qmi handle leak.
Fix this problem by destroying the QMI handle during
driver unload and server exit.
Change-Id: I7557de7c2ff2cb7d82d6e8a3480e8d5f4be6a5f4
Signed-off-by: Govind Singh <govinds@codeaurora.org>
Tanvi Aggarwal [Thu, 24 Aug 2017 06:21:35 +0000 (11:51 +0530)]
msm: sensor: flash: add conditional check for ioctl
Add conditional check when sending VIDIOC_MSM_FLASH_CFG
in 32-bit process.
Change-Id: I73bcce85a212495ce94e6265947c11a6bc0e4040
CRs-Fixed:
2092793
Signed-off-by: Tanvi Aggarwal <tanvia@codeaurora.org>
VijayaKumar T M [Tue, 5 Sep 2017 09:34:20 +0000 (15:04 +0530)]
msm: camera: isp: Check null pointer for VFE0 base
Add NULL pointer check for vfe_base of VFE0.
CRs-Fixed:
1032715
Change-Id: I540d9ff831fc9447ecf145f75ea84da3668c4f6f
Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
Signed-off-by: VijayaKumar T M <vtmuni@codeaurora.org>
Hareesh Gundu [Tue, 22 Aug 2017 13:25:50 +0000 (18:55 +0530)]
msm: kgsl: Do not allocate scratch memory for A3xx
A3xx device gets the ring buffer read pointer directly
from the GPU registers. So don’t allocate scratch memory
which can’t be used for A3xx GPU devices.
Change-Id: I95016dfc169b9fee74e978f5560592740f34515e
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Hareesh Gundu [Wed, 6 Sep 2017 13:03:29 +0000 (18:33 +0530)]
msm: kgsl: Fix gpu fault issue while enabling stall on page fault
Stall on page fault feature is supported on A5XX and later GPUs.
Enabling this feature on unsupported GPUs causes GPU faults.
So don't insert GPU stall related commands in ringbuffer if
not supported. But allow user to capture the GPU snapshot on
GPU page fault.
Change-Id: Ied26a5b4f44c1877b289a0ff5c0a6d47901e453d
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Linux Build Service Account [Fri, 8 Sep 2017 05:42:21 +0000 (22:42 -0700)]
Merge "mmc: sdhci: Fix SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD handling"
Linux Build Service Account [Fri, 8 Sep 2017 05:42:20 +0000 (22:42 -0700)]
Merge "mmc: core: power off host if SD card resume fails"
Lei wang [Fri, 8 Sep 2017 02:34:18 +0000 (10:34 +0800)]
tty: serial_core: add tty NULL check to uart_tx_stopped
Commit
761ed4a94582 ("tty: serial_core: convert uart_close to use
tty_port_close") created a case where a port used for a console does not
get shutdown on tty closing. Then a call to uart_tx_stopped() segfaults
because the tty is NULL. This could be fixed to restore old behavior,
but we also want to allow tty_ports to work without a tty attached. So
this change to allow a NULL tty_struct is needed either way.
Fixes:
761ed4a94582
("tty: serial_core: convert uart_close to use tty_port_close")
Reported-by: kernel test robot <xiaolong.ye@intel.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ifbeeacc89d396b857332ce94cc2d77bdd6e12bb7
Git-repo: git://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Git-commit:
a727b025f43d7952c0697562f5cecda9f42758aa
Signed-off-by: Lei wang <leiwan@codeaurora.org>
Linux Build Service Account [Thu, 7 Sep 2017 18:05:40 +0000 (11:05 -0700)]
Merge "power: qpnp-fg-gen3: update SOC masking algorithm"
Gustavo Solaira [Wed, 6 Sep 2017 18:13:44 +0000 (11:13 -0700)]
ARM: dts: msm: Add FAN cooling device to msm8996 CV2X boards
Add a node for a GPIO-based FAN cooling device for msm8996
CV2X boards. This GPIO has a single speed and can be controlled
from user space.
Change-Id: Iee427407f3c4032e1394c61dd1f225e24a091a99
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Gustavo Solaira [Wed, 6 Sep 2017 17:55:22 +0000 (10:55 -0700)]
defconfig: msm: Enable GPIO-based FAN for msm8996-auto
Enable the GPIO FAN driver to enable control of GPIO based
fans for cooling on msm8996-auto devices.
Change-Id: I5494fae1c7ab75362bc6c71c4e731f0581b01995
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Venkateswara Rao Tadikonda [Tue, 29 Aug 2017 05:32:38 +0000 (11:02 +0530)]
msm: kgsl: Limit the kgsl log frequency in kgsl_get_unmapped_area()
Reduce the frequency of kgsl logging when kgsl driver failed to get
memory mapping for requested memory.
Change-Id: If1a8832a9aa0396e3c990916deec7949697be12d
Signed-off-by: Venkateswara Rao Tadikonda <vtadik@codeaurora.org>
Sunil Khatri [Mon, 4 Sep 2017 08:35:03 +0000 (14:05 +0530)]
msm: kgsl: Protect the bind object against bad dereference
Sparse bind object are unbinded with bind id. This
can be exploited by any malicious application calling
unbind with same bind id again and again.
This can lead to a race condition between two threads
where one free the bind object and second thread uses
same object leading to bad dereference.
Change-Id: I542a008fc647489560667fb5016453a0c3448f7a
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
Veerabhadrarao Badiganti [Thu, 7 Sep 2017 09:44:49 +0000 (15:14 +0530)]
mmc: host: Update the USE_PIO_FOR_EMMC_TUNING quirk value
SDHCI_QUIRK2_USE_PIO_FOR_EMMC_TUNING quirk is defined with a bit position
of 23 (1 << 23). Since this bit position is already defined for some other
quirk, update its bit position to next available one.
Change-Id: I878b3c0b3f4cb32ecaf27fc77ccdfb7d4215a39c
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>