Commit graph

593516 commits

Author SHA1 Message Date
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
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
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
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
Linux Build Service Account
a9457cb5d5 Merge "qpnp-smb2: provide means to suspend dcin" 2017-09-05 00:20:37 -07:00
Krishna Chaitanya Devarakonda
cd2291139f 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>
2017-09-04 22:43:23 -07:00
Krishna Chaitanya Devarakonda
f696aed9e7 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>
2017-09-04 22:43:21 -07:00
Abhijeet Dharmapurikar
633b5ff609 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>
2017-09-04 20:58:03 -07:00
Linux Build Service Account
d727a95d2e Merge "msm: ipa3: fix compatibility with ipa user space" 2017-09-04 15:01:54 -07:00
Linux Build Service Account
a2e923bd7d Merge "ARM: dts: msm: Add truly panel support for SDM636" 2017-09-04 06:37:56 -07:00
Linux Build Service Account
c607ed2561 Merge "spcom: avoid implicit casting from size_t to uint32 for file ops" 2017-09-04 06:37:55 -07:00
Linux Build Service Account
2cce7b65df Merge "f2fs: Revert duplicate F2FS_MAX_SEGMENT" 2017-09-04 06:37:54 -07:00
Linux Build Service Account
fd43ba03a8 Merge "power: qpnp-fg-gen3: apply SOC linearization based on user input" 2017-09-04 06:37:52 -07:00
Linux Build Service Account
a65b91a0c4 Merge "soc: qcom: dump current task stack and task_struct for minidump" 2017-09-04 06:37:51 -07:00
Linux Build Service Account
acd46c78a2 Merge "dwc3: core: remove calling phy_set_suspend() in dwc3_remove()" 2017-09-04 06:37:50 -07:00
Linux Build Service Account
0b131e49d8 Merge "ARM: dts: msm: Add GPU maximum frequency 370Mhz support for SDM636" 2017-09-04 06:37:49 -07:00
Amir Levy
86eb047ba5 msm: ipa3: fix compatibility with ipa user space
Implement several IOCTLs to allow IPA user space work.

Change-Id: I726f665ada12c5524dabeab1b89cdc8db4dc6f1e
Acked-by: Dmitry Kogan <dmitryk@qti.qualcomm.com>
Signed-off-by: Amir Levy <alevy@codeaurora.org>
2017-09-04 01:06:11 -07:00
Sahitya Tummala
55aa8417ca mmc: sdhci: Fix SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD handling
If this quirk is set, then data timeout interrupt must not be
handled for R1B commands, as those commands may need larger
timeout value (larger than max timeout that controller can handle).

Change-Id: I7453b1914add21b47393b3eb1578d88e72da7406
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
2017-09-04 12:56:15 +05:30
Linux Build Service Account
eb80711888 Merge "msm: mdss: hdmi: validate HDMI EDID's max number of CEA blocks" 2017-09-03 23:04:21 -07:00
Linux Build Service Account
78cc6c172a Merge "Merge branch 'dev/msm-4.4-8996au' into msm-4.4" 2017-09-03 23:04:20 -07:00
Linux Build Service Account
6d54dd3d0a Merge "defconfig: msm: Disable DEVPORT config for sdm660" 2017-09-03 23:04:19 -07:00
Linux Build Service Account
9001eeb55d Merge "defconfig: msm: enable Minidump support on SDM660" 2017-09-03 23:04:18 -07:00
Linux Build Service Account
1e485663dd Merge "diag: Proper feature mask update to Glink supported peripherals" 2017-09-03 23:04:17 -07:00
Rashi Bindra
fdb5a89b1c ARM: dts: msm: Add truly panel support for SDM636
Add the changes to support the 1080p truly panel as default panel
for SDM636.

Change-Id: Ia6d9b26fb7efb1d8ed362da42e3b6f22798f6f5e
Signed-off-by: Rashi Bindra <rbindra@codeaurora.org>
2017-09-03 22:34:29 -07:00
Linux Build Service Account
2c76acdba2 Merge "ath10k: Enable interrupt for pktlog CE11" 2017-09-03 11:43:32 -07:00