Commit graph

594451 commits

Author SHA1 Message Date
vpalvai
f7ac82b8a0 defconfig: msm: Enable USB video class support on msm-4.4 kernel
Enable USB video class for USB camera support on
msm8996-auto devices

Change-Id: I2a385cf4c935d5bc2a4c1171f185baf30322ed1d
Signed-off-by: vpalvai <vpalvai@codeaurora.org>
2017-10-25 10:01:06 -07:00
Linux Build Service Account
59099c712f Merge "leds: qpnp-wled: Fix parameters passed to of_get_address_byname()" 2017-10-24 20:02:57 -07:00
Linux Build Service Account
9765263bbe Merge "soc: qcom: ipc_router_glink_xprt: Change wake source name" 2017-10-24 20:02:56 -07:00
Linux Build Service Account
25d590e3f8 Merge "net: restore upstream changes which break routing in tunnel scenarios" 2017-10-24 20:02:53 -07:00
Linux Build Service Account
b3ede85de2 Merge "ARM: dts: msm: add support for QBT1000 on SDM630" 2017-10-24 20:02:52 -07:00
Linux Build Service Account
13b2fc0bc3 Merge "drm: msm: fix list corruption problem" 2017-10-24 20:02:51 -07:00
Linux Build Service Account
4021b93ec3 Merge "msm: vidc: Fix the type of frame size" 2017-10-24 20:02:50 -07:00
Linux Build Service Account
458c7d15b5 Merge "ARM: dts: msm: Use system time timestamp for PPS on msm8996 CV2X" 2017-10-24 20:02:48 -07:00
Linux Build Service Account
682b7f4ae8 Merge "pps-gpio: Add new property to use system time timestamp for PPS GPIO" 2017-10-24 20:02:47 -07:00
Linux Build Service Account
0fd0ad8913 Merge "defconfig: msm: Disable USELIB and INET_LRO" 2017-10-24 20:02:46 -07:00
Linux Build Service Account
b895f07a61 Merge "scsi: ufs: Fix stack overflow read in ufs debugfs driver" 2017-10-24 20:02:45 -07:00
Subbaraman Narayanamurthy
df035333ce leds: qpnp-wled: Fix parameters passed to of_get_address_byname()
Pass NULL pointer to of_get_address_byname() for size and flags
parameters instead of an integer value 0.

Change-Id: I53984141bb8f1164c27b6a9a5d90853b4d077ee1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:35:46 -07:00
Anirudh Ghayal
11e17644b7 leds: qpnp-wled: Run auto-calibration during init
If the OVP fault is present during boot-up run
a WLED string auto-calibration.

Change-Id: I4b0e85cd64a1e8bca9bc7de17521d1f83798ed12
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2017-10-24 16:34:20 -07:00
Guchun Chen
d0db21101b drm: msm: fix list corruption problem
When multiple worker threads compete to update event_list, with current
vblank_ctrl_worker mechanism, there is one risk which can casue list node
is deleted for twice. This is because, due to the protected scope by
the spin_lock, mutex can exit when one thread is transvering the list,
but another queue thread may continue to add new event to the list.
This brings conflict risk. This patch is to correct this.

Change-Id: Ice31462d196c57ce18d7b998c1a1f0b7feeb08fc
Signed-off-by: Xiaowen Wu <wxiaowen@codeaurora.org>
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-10-24 01:09:54 -07:00
Sayali Lokhande
644b4b6131 scsi: ufs: Fix stack overflow read in ufs debugfs driver
When getting string from userspace by simple_write_to_buffer
in ufs_qcom_dbg_testbus_cfg_write() function, the string
copied to configuration is not terminated with '\0'. Thus
stack overflow read may occur while copying configuration to
host->testbus.select_major, which will result in information
leak later while printing error message. This change adds null
character at the end of the input string to avoid information
leak.

Change-Id: Ic9a9204def4bd6976f42f5f80ae5c0a9730afeb1
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2017-10-23 20:42:05 -07:00
Linux Build Service Account
9551e129dd Merge "cnss2: Decouple WLAN host driver and PCI/MHI for suspend/resume" 2017-10-23 17:16:45 -07:00
Gustavo Solaira
0b9b71635d ARM: dts: msm: Use system time timestamp for PPS on msm8996 CV2X
Use system time timestamp for the PPS GPIO driver on
msm8996 CV2X boards.

Change-Id: Ib7231d9b182c956d3c169d6979dbb5fe7f185353
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-10-23 10:36:52 -07:00
Gustavo Solaira
215533f02a pps-gpio: Add new property to use system time timestamp for PPS GPIO
If the device tree property "use-system-time-ts" is defined
then the timestamp used for PPS events will be the system time,
otherwise it will be the monotonic boot time.

Change-Id: I92fab1d8861e1d652fcb68066b417f44c1f8e29b
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-10-23 10:36:47 -07:00
Dhoat Harpal
253635c10f soc: qcom: ipc_router_glink_xprt: Change wake source name
Name added for wake source is stored in stack memory. It does
not exist after the stack is gone, this leads to use after free
case.

Added name from Glink xprt struct which persists until
IPCRTR is not removed.

CRs-Fixed: 2124767
Change-Id: I580cf6d6d12682f1f3f25c2506c2b1a969ee89b8
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2017-10-23 20:50:14 +05:30
Linux Build Service Account
82e598b10a Merge "mmc: core: Prevent accessing user space buffer directly" 2017-10-23 05:47:58 -07:00
Linux Build Service Account
68579162c7 Merge "msm: camera: isp: Initialize the isp clock index before enable" 2017-10-23 05:47:57 -07:00
Linux Build Service Account
0267b3cfac Merge "msm: isp: Clear irq status if irq is set again with same value" 2017-10-23 05:47:56 -07:00
Linux Build Service Account
5de1a28a4b Merge "msm: isp: increase UB size for isp40" 2017-10-23 05:47:55 -07:00
Linux Build Service Account
7ddf625a2f Merge "msm: isp: Fix Ub allocation for image WM" 2017-10-23 05:47:54 -07:00
Srinivas Ramana
f3fec90a93 defconfig: msm: Disable USELIB and INET_LRO
Disable the below defconfigs for SDM660 to address the
VTS KernelConfig test case failures.
Disable:
CONFIG_USELIB
CONFIG_INET_LRO

Enable:
CONFIG_CGROUP_DEBUG

Change-Id: I20ea6e4f7ac2350ad6a57a61a5b42464cfb273ef
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
2017-10-23 16:04:15 +05:30
Abir Ghosh
08dcce6a73 ARM: dts: msm: add support for QBT1000 on SDM630
Add QBT100 device for SDM630 with necessary clocks and GPIO
configurations. QBT1000 is fingerprint driver to communicate
with fingerprint trustzone app through QSEECOM. It also
receives interrupts from fingerprint sensor.

Change-Id: I0945f6377013f86ad531d9490ccbfa327bca034e
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
2017-10-23 14:22:34 +05:30
Linux Build Service Account
3f344fd011 Merge "ARM: dts: msm: Disable ASPM for MDM EP on msm8996 CV2X boards" 2017-10-22 20:29:34 -07:00
Linux Build Service Account
252c16792e Merge "msm: ipa: Set ep delay on rmnet/mbim tether pipe" 2017-10-21 14:11:48 -07:00
Gerrit - the friendly Code Review server
3f7ce4d543 Merge changes into msm-4.4 2017-10-21 13:10:14 -07:00
Linux Build Service Account
812303444b Merge "ASoC: msm: qdsp6v2: Add MM28 and MM29 for record usecase" 2017-10-21 02:30:41 -07:00
Linux Build Service Account
1154a35f64 Merge "ASoC: msm: qdsp6v2: modify API to configure output PCM block" 2017-10-21 02:30:40 -07:00
Linux Build Service Account
2f33324f5d Merge "ASoC: msm: qdsp6v2: Fix information leak in kernel" 2017-10-21 02:30:39 -07:00
Linux Build Service Account
2bd9b02756 Merge "ASoC: msm: Support Secondary TDM RX interface" 2017-10-21 02:30:37 -07:00
Linux Build Service Account
c8463db8f4 Merge "ARM: dts: msm: Support Secondary TDM RX Interface for msm8996" 2017-10-21 02:30:37 -07:00
Linux Build Service Account
1fa2e9357b Merge "soc: qcom: add SMMU support for virtualized audio ION driver" 2017-10-21 02:30:26 -07:00
Linux Build Service Account
044b983514 Merge "ASoC: msm: add soc audio snd virtualization support" 2017-10-21 02:30:25 -07:00
Linux Build Service Account
164f8dcb96 Merge "ARM: dts: msm: add audio ion vm dev on msm8996 vplatform" 2017-10-21 02:30:24 -07:00
Linux Build Service Account
949c55567d Merge "Revert "leds: remove unused driver leds-qpnp-flash.c"" 2017-10-20 16:49:29 -07:00
Linux Build Service Account
e7e32d875f Merge "Revert "power: supply: qcom: remove unused drivers"" 2017-10-20 16:49:28 -07:00
Linux Build Service Account
8fb8de73fa Merge "ARM: dts: msm: Enable MPP06 for graphics support in MSM8996 CV2X" 2017-10-20 16:49:27 -07:00
Linux Build Service Account
9cf08e811e Merge "power: qpnp_smb2: configure to extend DRP.DFP time in try.SNK" 2017-10-20 16:49:18 -07:00
Linux Build Service Account
bd398385b3 Merge "power: smblib: extend wait time after force sink in try.SNK" 2017-10-20 16:49:17 -07:00
Linux Build Service Account
15bfd17433 Merge "power: smblib: SW implementation of typeC try.SNK" 2017-10-20 16:49:16 -07:00
Gustavo Solaira
c0aa964715 ARM: dts: msm: Disable ASPM for MDM EP on msm8996 CV2X boards
Disable L1/L1ss modes for the RC2 link with MDM9x55 EP on
msm8996 CV2X boards to avoid bursty MSI interrupts and
unstable communication channel.

Change-Id: I12549ec37ceda09ebc9104b0182e53efdcfc8d2f
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
2017-10-20 11:38:31 -07:00
Yue Ma
e938800669 cnss2: Decouple WLAN host driver and PCI/MHI for suspend/resume
Decouple WLAN host driver suspend/resume and PCI link and MHI
suspend/resume so that PCI link and MHI can be suspended/resumeed
separately without WLAN host driver.

Change-Id: I82cb7b8b54c61657c5d0bbaead0ffc1c55ecee8d
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-10-20 10:33:54 -07:00
Hugh Guan
0ad4818702 ASoC: msm: Support Secondary TDM RX interface
Support Secondary TDM RX interface dai link and export kcontrols to
update Secondary TDM RX interface Channels and Bit Format configuration.

CRs-fixed: 2112052
Change-Id: Idb1d06cd6c0af385a46c775205bb3f6e45d411d7
Signed-off-by: Hugh Guan <hhguan@codeaurora.org>
2017-10-19 22:11:04 -07:00
Hugh Guan
d2ca82a2bc ARM: dts: msm: Support Secondary TDM RX Interface for msm8996
Support Secondary TDM RX Interface for automotive.

CRs-fixed: 2112052
Change-Id: Iae7bde93e8af851e470fb4f81b37d513ce3dfd02
Signed-off-by: Hugh Guan <hhguan@codeaurora.org>
2017-10-19 22:10:31 -07:00
Blagovest Kolenichev
709d3a4e3e net: restore upstream changes which break routing in tunnel scenarios
This reverts commit:

  3d78e43 net: Revert upstream changes which break routing in
          tunnel scenarios

Restored changes are:

  f1900fb net: Really fix vti6 with oif in dst lookups
  4148987 net: Fix vti use case with oif in dst lookups for IPv6
  42a7b32 xfrm: Add oif to dst lookups

Now it is save to restore the reverted upstream changes. Also
below upstream changes are coming with android@73a2b70 (4.4.92)
which will hit conflict if the above changes are not restored.

  c6a272a BACKPORT: net: xfrm: support setting an output mark.
  511953d UPSTREAM: xfrm: Only add l3mdev oif to dst lookups

Change-Id: Ia34abd5b9e2625d44922c018756d2214e2bd47bf
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-19 16:58:20 -07:00
Blagovest Kolenichev
ed213eda1c f2fs: cleanup not used anymore max_file_size()
Remove declaration of function max_file_size(). It was added
with:

63ba8a3 BACKPORT: f2fs: add a max block check for get_data_block_bmap

On merging of android-4.4@d68ba9f (4.4.89) functional part of
the above change was replaced with the upstream's one, which do
not use max_file_size() and also this function was renamed to
max_file_blocks() in its definition with change c1286ff. In
android-4.4 this func was static, hence no declaration line in
f2fs.h and this is why it was left alone in msm-4.4 without to
be noticed.

c1286ff f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9'
        of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)

Change-Id: I197e8fa912f645f49acd1f97180944e303f3d314
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-19 15:52:41 -07:00
Linux Build Service Account
b99844d8a3 Merge "ALSA: usb-audio: Add length check after string desc copy" 2017-10-18 21:38:46 -07:00