Commit graph

594767 commits

Author SHA1 Message Date
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
Abhinav Kumar
a005a1e954 drm/msm: reset sink hdr capabilities during bridge disable
Reset the HDR capabilities during the bridge disable.
The capabilities are re-programmed the next time
the userspace issues the call to populate the modes.

Change-Id: I04dbaa99c291de13b81e12cb9742cc97d9b02593
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-10-24 18:45:29 -07:00
Subbaraman Narayanamurthy
1b9a30ef0e regulator: qpnp-labibb: Allow 0 ms for IBB PWRUP_DLY1 and PWRDN_DLY2
Currently, IBB PWRUP_DLY1 and PWRDN_DLY2 settings are configured
only for values greater than 0. However, 0 ms (no delay) can be
allowed by disabling EN_PWRUP_DLY1 or EN_PWRDN_DLY2 bits. Add
support to allow this configuration.

CRs-Fixed: 2125062
Change-Id: I8ef3b5522b8d4db6befb3fb1c2e58ea24c0f5ea0
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 17:37:50 -07:00
Subbaraman Narayanamurthy
ce1d2a8266 regulator: qpnp-labibb: Fix LAB PS_CTL configuration for pmi8998
PMI8998 LAB pulse skip configuration is different from PMI8996
and earlier PMICs. Fix it by using the right configuration API
to configure LAB PS_CTL along with supporting PM660A properly.
Since the existing LAB PS configuration threshold for pmi8998 is
incorrect in device tree, update it along with this change.

Change-Id: I2686733867ec3e2909d0c071a5881d3d824c713e
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 17:35:58 -07:00
Subbaraman Narayanamurthy
7d1d130a1b leds: qpnp-wled: Improve auto calibration algorithm
If CABC is enabled and auto calibration is attempted, then OVP
fault can be seen even with a valid sink configuration and a
brightness level greater than or equal to 0.4 % dimming. This is
because of the modulation done through CABC pin which if low
enough can cause the brightness level to still go further down.

Fix this by disabling CABC on all sinks before running auto
calibration and re-enable it if the feature is enabled. Also,
modify the auto calibration brightness level to 200 so that the
load increase on WLED_VOUT can bring the voltage below OVP
threshold quick enough on a valid sink configuration.

Finally, disable WLED module before switching the sink
configuration and enable it after configuring sinks.

CRs-Fixed: 2125217
Change-Id: I570dc9eba540cd96328afd7c68f4643a112c4962
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
2017-10-24 16:36:59 -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
Yasir Malik
1d96b7fa96 uapi: Export msm_ipc.h
Export msm_ipc.h for use by user-space.

Change-Id: I53b96c4cb0b6fe785d3e73e7f00565c68dadf411
CRs-Fixed: 2125734
Acked-by: Jennifer L Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
2017-10-24 16:48:20 -04:00
Yasir Malik
06346e6b89 defconfig: arm64: fsm: Add configs for FSM platforms
Add configuration for 64-bit FSM platforms.

Change-Id: Icd5fb7875674e537a102af3fbc7d7c8b90c59740
CRs-Fixed: 2125734
Acked-by: Jennifer L Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
2017-10-24 16:47:48 -04:00
Rakesh Pillai
28095e48ce ath10k: increase the allowed num of tx pending pkts
HL1.0 has more number of descriptors and hence we can
queue more packets for tx.

Allow a higher number of tx pending packets for better
throughput in concurrency cases.

CRs-Fixed: 2104072
Change-Id: I8dd98cee04200fbeccf655dcb1d982d037077101
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-10-24 19:01:02 +05:30
Rakesh Pillai
d2185a8c09 ath10k: Add radar detect width for wcn3990 interface combination
radar detect widths were not added for wcn3990 interface
combinations.

Add the radar detect widths for wcn3990 interface
combinations.

CRs-Fixed: 2122264
Change-Id: If212aa238944078541168fa633db64b8bb15bf44
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
2017-10-24 05:15:21 -07:00
Abhinav Kumar
45a0076674 drm/msm: clear deep color bits in the HDMI controller
Clear the deep color bits in the HDMI controller in case
the mode does not need OR support deep color.

Otherwise it causes issues while switching across modes where
the sink supports deep color in one of the modes but not in the
other.

Change-Id: I8accf00e89868ccaa781a3f18eb9a662d9c9235c
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-10-24 01:36:18 -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
Liangliang Lu
b150ef84c4 usb: gadget: Add check gadget function bind or not
For NCM gadget function, net device structure opts->net
will be freed when NCM unbind, but user space related
device node doesn't know it, will access net structre
without checking it exist or not, finally lead to crash.

Fix this by adding check gadget function bind or not.

Change-Id: I6af9e3868f71e7fa923600721e1f716508de9b55
Signed-off-by: Liangliang Lu <luliang@codeaurora.org>
2017-10-24 13:19:10 +08: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
Vatsal Bucha
bc6d56b947 ASoC: sdm660_cdc: Fix pop noise issue at DMIC
Pop noise occurs during switch from handset to speaker mode
during voice call. This is because sufficient delay
is not provided for tx to unmute. A delayed workqueue
that will do unmute at the end solves the issue.

CRs-Fixed: 2101423
Change-Id: Idc1fd8e770eb0d361bd436ce35940200173106ef
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
2017-10-23 02:30:59 -07:00
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
Blagovest Kolenichev
f9719b203c Merge android-4.4@d6fbbe5 (v4.4.93) into msm-4.4
* refs/heads/tmp-d6fbbe5
  Linux 4.4.93
  x86/alternatives: Fix alt_max_short macro to really be a max()
  USB: serial: console: fix use-after-free after failed setup
  USB: serial: qcserial: add Dell DW5818, DW5819
  USB: serial: option: add support for TP-Link LTE module
  USB: serial: cp210x: add support for ELV TFD500
  USB: serial: ftdi_sio: add id for Cypress WICED dev board
  fix unbalanced page refcounting in bio_map_user_iov
  direct-io: Prevent NULL pointer access in submit_page_section
  usb: gadget: composite: Fix use-after-free in usb_composite_overwrite_options
  ALSA: line6: Fix leftover URB at error-path during probe
  ALSA: caiaq: Fix stray URB at probe error path
  ALSA: seq: Fix copy_from_user() call inside lock
  ALSA: seq: Fix use-after-free at creating a port
  ALSA: usb-audio: Kill stray URB at exiting
  iommu/amd: Finish TLB flush in amd_iommu_unmap()
  usb: renesas_usbhs: Fix DMAC sequence for receiving zero-length packet
  KVM: nVMX: fix guest CR4 loading when emulating L2 to L1 exit
  crypto: shash - Fix zero-length shash ahash digest crash
  HID: usbhid: fix out-of-bounds bug
  dmaengine: edma: Align the memcpy acnt array size with the transfer
  MIPS: math-emu: Remove pr_err() calls from fpu_emu()
  USB: dummy-hcd: Fix deadlock caused by disconnect detection
  rcu: Allow for page faults in NMI handlers
  iwlwifi: mvm: use IWL_HCMD_NOCOPY for MCAST_FILTER_CMD
  nl80211: Define policy for packet pattern attributes
  CIFS: Reconnect expired SMB sessions
  ext4: in ext4_seek_{hole,data}, return -ENXIO for negative offsets
  brcmfmac: add length check in brcmf_cfg80211_escan_handler()
  ANDROID: HACK: arm64: use -mno-implicit-float instead of -mgeneral-regs-only
  sched: Update task->on_rq when tasks are moving between runqueues
  FROMLIST: f2fs: expose some sectors to user in inline data or dentry case
  crypto: Work around deallocated stack frame reference gcc bug on sparc.
  UPSTREAM: f2fs: fix potential panic during fstrim
  ANDROID: fscrypt: remove unnecessary fscrypto.h
  ANDROID: binder: fix node sched policy calculation
  ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple
  CHROMIUM: arm64: Disable asm-operand-width warning for clang
  CHROMIUM: kbuild: clang: Disable the 'duplicate-decl-specifier' warning
  UPSTREAM: x86/build: Use cc-option to validate stack alignment parameter
  UPSTREAM: x86/build: Fix stack alignment for CLang
  UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub
  BACKPORT: efi/libstub/arm64: Force 'hidden' visibility for section markers
  UPSTREAM: compiler, clang: always inline when CONFIG_OPTIMIZE_INLINING is disabled
  UPSTREAM: x86/boot: #undef memcpy() et al in string.c
  UPSTREAM: crypto: arm64/sha - avoid non-standard inline asm tricks
  UPSTREAM: kbuild: clang: Disable 'address-of-packed-member' warning
  UPSTREAM: x86/build: Specify stack alignment for clang
  UPSTREAM: x86/build: Use __cc-option for boot code compiler options
  BACKPORT: kbuild: Add __cc-option macro
  UPSTREAM: x86/hweight: Don't clobber %rdi
  BACKPORT: x86/hweight: Get rid of the special calling convention
  BACKPORT: x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
  UPSTREAM: crypto, x86: aesni - fix token pasting for clang
  UPSTREAM: x86/kbuild: Use cc-option to enable -falign-{jumps/loops}
  UPSTREAM: compiler, clang: properly override 'inline' for clang
  UPSTREAM: compiler, clang: suppress warning for unused static inline functions
  UPSTREAM: Kbuild: provide a __UNIQUE_ID for clang
  UPSTREAM: modules: mark __inittest/__exittest as __maybe_unused
  BACKPORT: kbuild: Add support to generate LLVM assembly files
  UPSTREAM: kbuild: use -Oz instead of -Os when using clang
  BACKPORT: kbuild, LLVMLinux: Add -Werror to cc-option to support clang
  UPSTREAM: kbuild: drop -Wno-unknown-warning-option from clang options
  UPSTREAM: kbuild: fix asm-offset generation to work with clang
  UPSTREAM: kbuild: consolidate redundant sed script ASM offset generation
  UPSTREAM: kbuild: Consolidate header generation from ASM offset information
  UPSTREAM: kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS
  UPSTREAM: kbuild: Add better clang cross build support

Conflicts:
	arch/x86/lib/Makefile
	net/wireless/nl80211.c

Change-Id: I76032e8d1206903bc948b9ed918e7ddee7e746c7
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-20 06:07:34 -07:00