Commit graph

593544 commits

Author SHA1 Message Date
Linux Build Service Account
1b2c9a8e53 Merge "msm: kgsl: Do not allocate scratch memory for A3xx" 2017-09-11 19:12:55 -07:00
Linux Build Service Account
38b0615244 Merge "ath10k: Destroy QMI handle during driver unload" 2017-09-11 19:12:54 -07:00
Linux Build Service Account
5bfea4d5e6 Merge "msm: sensor: flash: add conditional check for ioctl" 2017-09-11 19:12:53 -07:00
Linux Build Service Account
42a50b337e Merge "msm: kgsl: Fix gpu fault issue while enabling stall on page fault" 2017-09-11 19:12:52 -07:00
Linux Build Service Account
a3f5570db9 Merge "msm: kgsl: Add debug log in adreno_of_get_pwrlevels()" 2017-09-11 19:12:51 -07:00
Linux Build Service Account
80e3abb9dc Merge "ARM: dts: msm: Add Support for new PM660L/A versions for SDM660/SDM630" 2017-09-11 19:12:49 -07:00
Linux Build Service Account
1e90ddd7a0 Merge "ARM: dts: msm: Add FAN cooling device to msm8996 CV2X boards" 2017-09-11 19:12:48 -07:00
Linux Build Service Account
f8af069c22 Merge "msm: ais: isp: Check null pointer for VFE0 base" 2017-09-11 19:12:47 -07:00
Linux Build Service Account
f6927cde75 Merge "ARM: dts: msm: enable camera on SDM636 MTP" 2017-09-11 19:12:46 -07:00
Linux Build Service Account
bdb943e519 Merge "mmc: core: enable async suspend of card" 2017-09-11 19:12:44 -07:00
Linux Build Service Account
ac9c82fdd9 Merge "Revert "ARM: dts: msm: Add initial support for msm8998-9x55"" 2017-09-11 19:12:43 -07:00
Linux Build Service Account
1cbd1cdf84 Merge "mmc: sdhci: Add logs when ignoring timeout due to quirk" 2017-09-10 10:20:25 -07:00
Linux Build Service Account
05782da9c4 Merge "drivers: media: broadcast: Fix security vulnerability issue" 2017-09-09 16:48:38 -07:00
Linux Build Service Account
6cdb81fdcf Merge "tty: serial_core: add tty NULL check to uart_tx_stopped" 2017-09-09 06:32:42 -07:00
Linux Build Service Account
c85421c41a Merge "ARM: dts: msm: Enable CAN controller for msm8996 CV2X boards" 2017-09-08 22:04:16 -07:00
Linux Build Service Account
ef93f7a163 Merge "Merge android-4.4@4b8fc9f (v4.4.82) into msm-4.4" 2017-09-08 22:04:15 -07:00
Linux Build Service Account
8027efd3cc Merge "soc: qcom: initialize glink link state" 2017-09-08 22:04:14 -07:00
Govind Singh
49bb00b877 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>
2017-09-08 06:57:01 -07:00
Tanvi Aggarwal
f33863c42e 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>
2017-09-08 04:45:28 -07:00
Hareesh Gundu
273f50746c 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>
2017-09-08 02:02:40 -07:00
Hareesh Gundu
40e0712361 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>
2017-09-08 14:08:57 +05:30
Linux Build Service Account
ccfb8c3db0 Merge "mmc: sdhci: Fix SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD handling" 2017-09-07 22:42:20 -07:00
Linux Build Service Account
f906a06b89 Merge "mmc: core: power off host if SD card resume fails" 2017-09-07 22:42:20 -07:00
Lei wang
b8f1ab847c 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>
2017-09-07 21:46:18 -07:00
Linux Build Service Account
cb8f9c4da7 Merge "power: qpnp-fg-gen3: update SOC masking algorithm" 2017-09-07 11:05:40 -07:00
Gustavo Solaira
1b1517142f 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>
2017-09-07 10:35:31 -07:00
Gustavo Solaira
c283bfe1d5 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>
2017-09-07 10:35:23 -07:00
Linux Build Service Account
aa450b1d93 Merge "drivers: net: can: Add K61 CAN controller driver" 2017-09-07 00:46:05 -07:00
Linux Build Service Account
7edaca927d Merge "diag: Support buffering mode for non-diag_id peripherals" 2017-09-07 00:46:04 -07:00
Linux Build Service Account
329b7b4c99 Merge "lib/stackdepot.c: use __GFP_NOWARN for stack allocations" 2017-09-07 00:46:03 -07:00
Linux Build Service Account
b864286bdb Merge "diag: Proper Update of the PD packet buffer status and length" 2017-09-06 12:55:56 -07:00
Linux Build Service Account
b42a5cc33b Merge "msm: mdss: Enable clocks for WFD setup" 2017-09-06 12:55:55 -07:00
Linux Build Service Account
02411b451a Merge "msm: sde: Avoid NULL pointer dereference in cancel request" 2017-09-06 12:55:54 -07:00
Linux Build Service Account
120dd65a36 Merge "defconfig: msm: enable Linux Kernel Dump Test Tool" 2017-09-06 12:55:53 -07:00
Linux Build Service Account
aa748b591b Merge "msm: camera: Return -NOTTY on invalid ioctl command." 2017-09-06 12:55:52 -07:00
Linux Build Service Account
bb516d3651 Merge "cnss2: Increase QMI ATHDIAG maximum data size" 2017-09-06 12:55:51 -07:00
Subbaraman Narayanamurthy
491c46fc13 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>
2017-09-06 11:21:25 -07:00
Gustavo Solaira
be06210b35 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>
2017-09-06 10:45:33 -07:00
Gustavo Solaira
79be912c14 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>
2017-09-06 10:44:54 -07:00
Gustavo Solaira
36d4d74d63 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>
2017-09-06 10:44:42 -07:00
Abinaya P
4cf8fd54ec 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>
2017-09-06 10:13:38 -07:00
Trishansh Bhardwaj
f80627ce13 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>
2017-09-06 01:49:32 -07:00
Linux Build Service Account
b92b0cea6d Merge "ASoC: wsa881x: Fix wsa881x speaker damage" 2017-09-06 01:42:39 -07:00
Manoj Prabhu B
a5464d3b72 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>
2017-09-05 22:45:52 -07:00
Linux Build Service Account
e91bfdb176 Merge "soc: qcom: ipc_router_glink_xprt: Add wakeup source in RX path" 2017-09-05 13:45:23 -07:00
Yue Ma
04fe10b916 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>
2017-09-05 10:39:55 -07:00
Kirill A. Shutemov
042adcefd0 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>
2017-09-05 20:16:27 +05:30
Udaya Bhaskara Reddy Mallavarapu
bbacde467c 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>
2017-09-05 15:05:01 +05:30
Can Guo
aaf56cab21 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>
2017-09-05 02:27:28 -07:00
Rahul Sharma
e34ed9a339 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>
2017-09-05 01:27:17 -07:00