Commit graph

594786 commits

Author SHA1 Message Date
Blagovest Kolenichev
dbad9b8f72 Merge android-4.4@89074de (v4.4.94) into msm-4.4
* refs/heads/tmp-89074de
  Linux 4.4.94
  Revert "tty: goldfish: Fix a parameter of a call to free_irq"
  cpufreq: CPPC: add ACPI_PROCESSOR dependency
  nfsd/callback: Cleanup callback cred on shutdown
  target/iscsi: Fix unsolicited data seq_end_offset calculation
  uapi: fix linux/mroute6.h userspace compilation errors
  uapi: fix linux/rds.h userspace compilation errors
  ceph: clean up unsafe d_parent accesses in build_dentry_path
  i2c: at91: ensure state is restored after suspending
  net: mvpp2: release reference to txq_cpu[] entry after unmapping
  scsi: scsi_dh_emc: return success in clariion_std_inquiry()
  slub: do not merge cache if slub_debug contains a never-merge flag
  ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock
  crypto: xts - Add ECB dependency
  net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs
  sparc64: Migrate hvcons irq to panicked cpu
  md/linear: shutup lockdep warnning
  f2fs: do not wait for writeback in write_begin
  Btrfs: send, fix failure to rename top level inode due to name collision
  iio: adc: xilinx: Fix error handling
  netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
  net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
  mac80211: fix power saving clients handling in iwlwifi
  mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length
  irqchip/crossbar: Fix incorrect type of local variables
  watchdog: kempld: fix gcc-4.3 build
  locking/lockdep: Add nest_lock integrity test
  Revert "bsg-lib: don't free job in bsg_prepare_job"
  tipc: use only positive error codes in messages
  net: Set sk_prot_creator when cloning sockets to the right proto
  packet: only test po->has_vnet_hdr once in packet_snd
  packet: in packet_do_bind, test fanout with bind_lock held
  tun: bail out from tun_get_user() if the skb is empty
  l2tp: fix race condition in l2tp_tunnel_delete
  l2tp: Avoid schedule while atomic in exit_net
  vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit
  isdn/i4l: fetch the ppp_write buffer in one shot
  bpf: one perf event close won't free bpf program attached by another perf event
  packet: hold bind lock when rebinding to fanout hook
  net: emac: Fix napi poll list corruption
  ip6_gre: skb_push ipv6hdr before packing the header in ip6gre_header
  udpv6: Fix the checksum computation when HW checksum does not apply
  bpf/verifier: reject BPF_ALU64|BPF_END
  sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
  MIPS: Fix minimum alignment requirement of IRQ stack
  drm/dp/mst: save vcpi with payloads
  percpu: make this_cpu_generic_read() atomic w.r.t. interrupts
  trace: sched: Fix util_avg_walt in sched_load_avg_cpu trace
  sched/fair: remove erroneous RCU_LOCKDEP_WARN from start_cpu()
  sched: EAS/WALT: finish accounting prior to task_tick
  cpufreq: sched: update capacity request upon tick always
  sched/fair: prevent meaningless active migration
  sched: walt: Leverage existing helper APIs to apply invariance

Conflicts:
	kernel/sched/core.c
	kernel/sched/fair.c
	kernel/sched/sched.h

Change-Id: I0effac90fb6a4db559479bfa2fefa31c41200ce9
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-27 10:56:12 -07:00
Blagovest Kolenichev
7ed4cfd83b sched: restore discarded ifdef CONFIG_SCHED_WALT code
Code closed in ifdef CONFIG_SCHED_WALT blocks is not used in
msm-4.4 builds, hence in order to be as much as closer to
upstream and subsequently to have less merge conflicts in the
future, let's restore this code.

Restore below CONFIG_SCHED_WALT changes in file [1]:

  3c5c4e9 trace/sched: add rq utilization signal for WALT
  3a29814 sched: fix wrong truncation of walt_avg
  efb86bd sched: Introduce Window Assisted Load Tracking (WALT)

[1] include/trace/events/sched.h

The above changes were discarded during android-4.4 merging
into msm-4.4 starting from change 1758716.

Change-Id: I1dfe59689ee5f1207e0951a8362a497a8c67c6a7
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2017-10-27 08:58:59 -07:00
Linux Build Service Account
2db878d52e Merge "Merge android-4.4@d6fbbe5 (v4.4.93) into msm-4.4" 2017-10-26 07:35:30 -07:00
Linux Build Service Account
dd2d19cd96 Merge "ath10k: Add radar detect width for wcn3990 interface combination" 2017-10-26 07:35:29 -07:00
Linux Build Service Account
3b637f746d Merge "drm/msm: clear deep color bits in the HDMI controller" 2017-10-26 07:35:28 -07:00
Linux Build Service Account
40530e7b4e Merge "drm/msm: reset sink hdr capabilities during bridge disable" 2017-10-26 07:35:27 -07:00
Linux Build Service Account
b6171c845c Merge "usb: gadget: Add check gadget function bind or not" 2017-10-26 07:35:26 -07:00
Linux Build Service Account
4c5c6905e4 Merge "defconfig: msm: Enable USB video class support on msm-4.4 kernel" 2017-10-25 15:58:59 -07:00
Linux Build Service Account
5177652ad0 Merge "Merge android-4.4@73a2b70 (v4.4.92) into msm-4.4" 2017-10-25 15:58:58 -07:00
Linux Build Service Account
b3161dca6c Merge "ARM: dts: msm: modify interrupt flag for wled device on PMI8994" 2017-10-25 15:58:57 -07:00
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
f0ae27b1af Merge "ath10k: increase the allowed num of tx pending pkts" 2017-10-25 07:26:51 -07:00
Linux Build Service Account
2a42942814 Merge "leds: qpnp-wled: Improve auto calibration algorithm" 2017-10-25 07:26:50 -07:00
Linux Build Service Account
77383f7a13 Merge "regulator: qpnp-labibb: Allow 0 ms for IBB PWRUP_DLY1 and PWRDN_DLY2" 2017-10-25 07:26:48 -07:00
Linux Build Service Account
06c1491488 Merge "regulator: qpnp-labibb: Fix LAB PS_CTL configuration for pmi8998" 2017-10-25 07:26:47 -07:00
Linux Build Service Account
d9ec6c6960 Merge "ARM: dts: msm: enable camera on SDM636 CDP" 2017-10-25 07:26:46 -07:00
Tirupathi Reddy
473edcfeb6 ARM: dts: msm: modify interrupt flag for wled device on PMI8994
The wled driver is not statically handling interrupt flags.
Pass proper flag such as IRQ_TYPE_EDGE_RISING for wled
"sc-irq" interrupt through device node.

Change-Id: I90974bd7995949a97bb7070e86c469cde646096a
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
2017-10-25 14:08:33 +05:30
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
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
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
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