OSDN Git Service
Animesh Kishore [Sat, 23 Sep 2017 16:38:10 +0000 (22:08 +0530)]
mdss: mdp: Validate null commit for secure display
Secure display entry/exit should be accompanied
by null commit in video mode to make sure there is
no non secure access.
Change-Id: I7928a2465de9c46f69e963977931f7a6618f01fb
Signed-off-by: Animesh Kishore <animeshk@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"
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"
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>
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>
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>
Linux Build Service Account [Thu, 7 Sep 2017 07:46:05 +0000 (00:46 -0700)]
Merge "drivers: net: can: Add K61 CAN controller driver"
Linux Build Service Account [Thu, 7 Sep 2017 07:46:04 +0000 (00:46 -0700)]
Merge "diag: Support buffering mode for non-diag_id peripherals"
Linux Build Service Account [Thu, 7 Sep 2017 07:46:03 +0000 (00:46 -0700)]
Merge "lib/stackdepot.c: use __GFP_NOWARN for stack allocations"
Mohammed Javid [Mon, 28 Aug 2017 19:35:46 +0000 (01:05 +0530)]
msm: ipa: Cache CNE event
Provide support to cache CNE event for debugging purpose.
Change-Id: I00d101d3b9a627d7aba3e4524ff301797ea6085e
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Linux Build Service Account [Wed, 6 Sep 2017 19:55:56 +0000 (12:55 -0700)]
Merge "diag: Proper Update of the PD packet buffer status and length"
Linux Build Service Account [Wed, 6 Sep 2017 19:55:55 +0000 (12:55 -0700)]
Merge "msm: mdss: Enable clocks for WFD setup"
Linux Build Service Account [Wed, 6 Sep 2017 19:55:54 +0000 (12:55 -0700)]
Merge "msm: sde: Avoid NULL pointer dereference in cancel request"
Linux Build Service Account [Wed, 6 Sep 2017 19:55:53 +0000 (12:55 -0700)]
Merge "defconfig: msm: enable Linux Kernel Dump Test Tool"
Linux Build Service Account [Wed, 6 Sep 2017 19:55:52 +0000 (12:55 -0700)]
Merge "msm: camera: Return -NOTTY on invalid ioctl command."
Linux Build Service Account [Wed, 6 Sep 2017 19:55:51 +0000 (12:55 -0700)]
Merge "cnss2: Increase QMI ATHDIAG maximum data size"
Skylar Chang [Tue, 29 Aug 2017 17:54:04 +0000 (10:54 -0700)]
msm: ipa: ipa_usb: teth_prot and ttype validation
Add input validation logic for accessing teth_prot and ttype
members.
Change-Id: I05780fb3b09616b7a9cf0c36f71e9f1e5e49f136
CRs-Fixed:
2091803
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Subbaraman Narayanamurthy [Wed, 26 Jul 2017 23:46:41 +0000 (16:46 -0700)]
power: qpnp-fg-gen3: update SOC masking algorithm
Currently, FULL_SOC and MONOTONIC_SOC registers are updated
multiple times when the recharge SOC threshold is close enough to
trigger the recharging frequently. This was leading to a SOC
fluctuation when SOC masking algorithm is enabled.
Rearrange charge_full_update used in SOC masking algorithm such
that FULL_SOC and MONOTONIC_SOC registers are updated just once
when the charge_full flag is cleared.
Also, when the device is rebooted/shutdown and if charge_full
flag is set, write to FULL_SOC with battery_soc and a full value
to MONOTONIC_SOC registers. This helps to maintain the same SOC
across a device reboot.
Change-Id: I95afa90f27e4c0f948f301ff8d6a1f84ae422ef0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Gustavo Solaira [Wed, 23 Aug 2017 18:30:39 +0000 (11:30 -0700)]
ARM: dts: msm: Enable CAN controller for msm8996 CV2X boards
Add a device tree node for the SPI CAN controller to enable
a CAN network interface for msm8996 CV2X boards.
Change-Id: Ib9c1d63bf86e3b823aa8d762065ed374bdfeaa0e
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Gustavo Solaira [Thu, 24 Aug 2017 05:53:27 +0000 (22:53 -0700)]
defconfig: msm: Enable the K61 CAN driver
Enable configuration for K61 CAN over SPI driver.
Change-Id: I801629ac04303582530bed354282960db8f9c9ab
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Gustavo Solaira [Thu, 24 Aug 2017 07:49:13 +0000 (00:49 -0700)]
can: k61: Changes to support the mpc5746c controller
Add new parameters to account for different MCUs that can
be used with this driver. These devices have different reset
sequences and number of bits per word supported via SPI. Add
bindings for the mpc5746c controller and make the reset signal
optional.
Change-Id: I616dd3cfedf18a6e21683e1c07551c57c62a675d
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Abinaya P [Thu, 1 Dec 2016 12:55:03 +0000 (18:25 +0530)]
drivers: net: can: Add K61 CAN controller driver
This driver creates Network device of type CAN
and processes tx and rx frames that it sends and
receives over SPI protocol.
Change-Id: I54a8665d1b9eda7e9b1ff695bd67de312c410195
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
Trishansh Bhardwaj [Mon, 4 Sep 2017 05:32:14 +0000 (11:02 +0530)]
msm: camera: Return -NOTTY on invalid ioctl command.
Check validity of command before processing.
Change-Id: Icc5c57eac999b7c40fbb9505b2b88745167adc66
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
Linux Build Service Account [Wed, 6 Sep 2017 08:42:39 +0000 (01:42 -0700)]
Merge "ASoC: wsa881x: Fix wsa881x speaker damage"
Manoj Prabhu B [Tue, 29 Aug 2017 05:14:00 +0000 (10:44 +0530)]
diag: Support buffering mode for non-diag_id peripherals
The patch adds the support for buffering mode configuration
for peripherals not supporting diag_id.
CRs-Fixed:
2104591
Change-Id: I2ed34a5141a9b9042dc925c9109d22009b272484
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Linux Build Service Account [Tue, 5 Sep 2017 20:45:24 +0000 (13:45 -0700)]
Merge "soc: qcom: ipc_router_glink_xprt: Add wakeup source in RX path"
Yue Ma [Tue, 5 Sep 2017 17:16:01 +0000 (10:16 -0700)]
cnss2: Increase QMI ATHDIAG maximum data size
Increase QMI ATHDIAG maximum data size to 6144 bytes so that it
can dump more bytes for debugging.
Change-Id: I21d6197ad67829c38586318d4e76a7c7fd4149c4
CRs-fixed:
2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
Kirill A. Shutemov [Thu, 28 Jul 2016 22:49:10 +0000 (15:49 -0700)]
lib/stackdepot.c: use __GFP_NOWARN for stack allocations
This (large, atomic) allocation attempt can fail. We expect and handle
that, so avoid the scary warning.
Change-Id: I3e5d7dbe7d264c2bbeab46db6e0cb8fc9a20e607
Link: http://lkml.kernel.org/r/20160720151905.GB19146@node.shutemov.name
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Rik van Riel <riel@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Git-commit:
87cc271d5e4320d705cfdf59f68d4d037b3511b2
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
Udaya Bhaskara Reddy Mallavarapu [Tue, 5 Sep 2017 06:31:41 +0000 (12:01 +0530)]
drivers: media: broadcast: Fix security vulnerability issue
Information leak issue is reported in mpq_sdmx_log_level_write
function. Added check to validate count is not zero and initialize
the string.
Change-Id: Ieb2ed88c2d7d778c56be2ec3b9875270a9c74dce
Signed-off-by: Udaya Bhaskara Reddy Mallavarapu <udaym@codeaurora.org>
Can Guo [Thu, 27 Jul 2017 02:15:49 +0000 (10:15 +0800)]
mmc: core: power off host if SD card resume fails
Current SD card resume function does not handle card
init failure but only prints resume error message.
This change powers off mmc host before exit resume
if card init fails.
Change-Id: Idc27d8ed8769b92373bb9770f5e706b18e76404d
Signed-off-by: Can Guo <cang@codeaurora.org>
Rahul Sharma [Tue, 5 Sep 2017 06:49:59 +0000 (12:19 +0530)]
msm: ais: isp: Check null pointer for VFE0 base
Add NULL pointer check for vfe_base of VFE0.
CRs-Fixed:
1032715
Change-Id: Ie8ed5d14947d9894eb902ea514a1888be98961ef
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Linux Build Service Account [Tue, 5 Sep 2017 07:20:38 +0000 (00:20 -0700)]
Merge "qpnp-smb2: provide means to suspend dcin"
Krishna Chaitanya Devarakonda [Thu, 17 Aug 2017 10:46:42 +0000 (16:16 +0530)]
msm: mdss: Enable clocks for WFD setup
The WFD setup path has few register writes. If the MDP clocks
aren't switched on, the register access might cause SMMU
faults. Turn on the clocks, before calling WFD setup.
Change-Id: Icc865178f43dc6068b6b4b201b8f9eada2570598
Signed-off-by: Krishna Chaitanya Devarakonda <kdevarak@codeaurora.org>
Krishna Chaitanya Devarakonda [Thu, 31 Aug 2017 15:54:53 +0000 (21:24 +0530)]
msm: sde: Avoid NULL pointer dereference in cancel request
There is a race condition possible when two threads are calling
the rotator cancel request. This might result in accessing a pointer
which was already assigned NULL. Fixing this by adding an extra check.
Change-Id: I9ce321a5f033d1fdc9d8b70a04098bfba3d7baaa
Signed-off-by: Krishna Chaitanya Devarakonda <kdevarak@codeaurora.org>
Abhijeet Dharmapurikar [Thu, 3 Aug 2017 17:44:02 +0000 (10:44 -0700)]
qpnp-smb2: provide means to suspend dcin
Provide means to suspend the DC path using the power supply
property.
Change-Id: I97f83f5f7c892fc078a92914af0a923b6aacf02e
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Blagovest Kolenichev [Mon, 4 Sep 2017 14:42:22 +0000 (07:42 -0700)]
Merge android-4.4@
610af85 (v4.4.85) into msm-4.4
* refs/heads/tmp-
610af85
Linux 4.4.85
ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
ACPI: ioapic: Clear on-stack resource before using it
ntb_transport: fix bug calculating num_qps_mw
ntb_transport: fix qp count bug
ASoC: rsnd: don't call update callback if it was NULL
ASoC: rsnd: ssi: 24bit data needs right-aligned settings
ASoC: rsnd: Add missing initialization of ADG req_rate
ASoC: rsnd: avoid pointless loop in rsnd_mod_interrupt()
ASoC: rsnd: disable SRC.out only when stop timing
ASoC: simple-card: don't fail if sysclk setting is not supported
staging: rtl8188eu: add RNX-N150NUB support
iio: hid-sensor-trigger: Fix the race with user space powering up sensors
iio: imu: adis16480: Fix acceleration scale factor for adis16480
ANDROID: binder: fix proc->tsk check.
binder: Use wake up hint for synchronous transactions.
binder: use group leader instead of open thread
Bluetooth: bnep: fix possible might sleep error in bnep_session
Bluetooth: cmtp: fix possible might sleep error in cmtp_session
Bluetooth: hidp: fix possible might sleep error in hidp_session_thread
perf/core: Fix group {cpu,task} validation
nfsd: Limit end of page list when decoding NFSv4 WRITE
cifs: return ENAMETOOLONG for overlong names in cifs_open()/cifs_lookup()
cifs: Fix df output for users with quota limits
tracing: Fix freeing of filter in create_filter() when set_str is false
drm: rcar-du: Fix H/V sync signal polarity configuration
drm: rcar-du: Fix display timing controller parameter
drm: rcar-du: Fix crash in encoder failure error path
drm: rcar-du: lvds: Rename PLLEN bit to PLLON
drm: rcar-du: lvds: Fix PLL frequency-related configuration
drm/atomic: If the atomic check fails, return its value first
drm: Release driver tracking before making the object available again
i2c: designware: Fix system suspend
ARCv2: PAE40: Explicitly set MSB counterpart of SLC region ops addresses
ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978)
ALSA: core: Fix unexpected error at replacing user TLV
Input: elan_i2c - add ELAN0602 ACPI ID to support Lenovo Yoga310
Input: trackpoint - add new trackpoint firmware ID
mei: me: add lewisburg device ids
mei: me: add broxton pci device ids
net_sched: fix order of queue length updates in qdisc_replace()
net: sched: fix NULL pointer dereference when action calls some targets
irda: do not leak initialized list.dev to userspace
tcp: when rearming RTO, if RTO time is in past then fire RTO ASAP
ipv6: repair fib6 tree in failure case
ipv6: reset fn->rr_ptr when replacing route
tipc: fix use-after-free
sctp: fully initialize the IPv6 address in sctp_v6_to_addr()
ipv4: better IP_MAX_MTU enforcement
net_sched/sfq: update hierarchical backlog when drop packet
ipv4: fix NULL dereference in free_fib_info_rcu()
dccp: defer ccid_hc_tx_delete() at dismantle time
dccp: purge write queue in dccp_destroy_sock()
af_key: do not use GFP_KERNEL in atomic contexts
ANDROID: NFC: st21nfca: Fix memory OOB and leak issues in connectivity events handler
Linux 4.4.84
usb: qmi_wwan: add D-Link DWM-222 device ID
usb: optimize acpi companion search for usb port devices
perf/x86: Fix LBR related crashes on Intel Atom
pids: make task_tgid_nr_ns() safe
Sanitize 'move_pages()' permission checks
irqchip/atmel-aic: Fix unbalanced refcount in aic_common_rtc_irq_fixup()
irqchip/atmel-aic: Fix unbalanced of_node_put() in aic_common_irq_fixup()
x86/asm/64: Clear AC on NMI entries
xen: fix bio vec merging
mm: revert x86_64 and arm64 ELF_ET_DYN_BASE base changes
mm/mempolicy: fix use after free when calling get_mempolicy
ALSA: usb-audio: Add mute TLV for playback volumes on C-Media devices
ALSA: usb-audio: Apply sample rate quirk to Sennheiser headset
ALSA: seq: 2nd attempt at fixing race creating a queue
Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB
Input: elan_i2c - add ELAN0608 to the ACPI table
crypto: x86/sha1 - Fix reads beyond the number of blocks passed
parisc: pci memory bar assignment fails with 64bit kernels on dino/cujo
audit: Fix use after free in audit_remove_watch_rule()
netfilter: nf_ct_ext: fix possible panic after nf_ct_extend_unregister
ANDROID: check dir value of xfrm_userpolicy_id
ANDROID: NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
ANDROID: nfc: fdp: Fix possible buffer overflow in WCS4000 NFC driver
ANDROID: NFC: st21nfca: Fix out of bounds kernel access when handling ATR_REQ
UPSTREAM: usb: dwc3: gadget: don't send extra ZLP
BACKPORT: usb: dwc3: gadget: handle request->zero
ANDROID: usb: gadget: assign no-op request complete callbacks
ANDROID: usb: gadget: configfs: fix null ptr in android_disconnect
ANDROID: uid_sys_stats: Fix implicit declaration of get_cmdline()
uid_sys_stats: log task io with a debug flag
Linux 4.4.83
pinctrl: samsung: Remove bogus irq_[un]mask from resource management
pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
pnfs/blocklayout: require 64-bit sector_t
iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
usb: core: unlink urbs from the tail of the endpoint's urb_list
USB: Check for dropped connection before switching to full speed
uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
iio: light: tsl2563: use correct event code
iio: accel: bmc150: Always restore device to normal mode after suspend-resume
staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
USB: hcd: Mark secondary HCD as dead if the primary one died
usb: musb: fix tx fifo flush handling again
USB: serial: pl2303: add new ATEN device id
USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
USB: serial: option: add D-Link DWM-222 device ID
nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
fuse: initialize the flock flag in fuse_file on allocation
iscsi-target: Fix iscsi_np reset hung task during parallel delete
iscsi-target: fix memory leak in iscsit_setup_text_cmd()
mm: ratelimit PFNs busy info message
cpuset: fix a deadlock due to incomplete patching of cpusets_enabled()
ANDROID: Use sk_uid to replace uid get from socket file
UPSTREAM: arm64: smp: Prevent raw_smp_processor_id() recursion
UPSTREAM: arm64: restore get_current() optimisation
ANDROID: arm64: Fix a copy-paste error in prior init_thread_info build fix
Conflicts:
drivers/misc/Kconfig
drivers/usb/dwc3/gadget.c
include/linux/sched.h
mm/migrate.c
net/netfilter/xt_qtaguid.c
Change-Id: I3a0107fcb5c7455114b316426c9d669bb871acd1
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Linux Build Service Account [Mon, 4 Sep 2017 22:01:54 +0000 (15:01 -0700)]
Merge "msm: ipa3: fix compatibility with ipa user space"
Linux Build Service Account [Mon, 4 Sep 2017 13:37:57 +0000 (06:37 -0700)]
Merge "ARM: dts: msm: Add truly panel support for SDM636"
Linux Build Service Account [Mon, 4 Sep 2017 13:37:56 +0000 (06:37 -0700)]
Merge "spcom: avoid implicit casting from size_t to uint32 for file ops"