Commit graph

599227 commits

Author SHA1 Message Date
Linux Build Service Account
d718058109 Merge "drm: msm: improve early splash mechanism" 2018-05-09 05:09:47 -07:00
Linux Build Service Account
43fb4adbdc Merge "ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr" 2018-05-08 13:46:00 -07:00
Linux Build Service Account
058359baba Merge "power: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type" 2018-05-08 13:45:59 -07:00
Linux Build Service Account
6b9ca47dab Merge "power: smb-lib: Add support for SW based OV detection" 2018-05-08 13:45:58 -07:00
Linux Build Service Account
4623da5bd0 Merge "smb-lib: add support of DP/DM pulsing for fix 5V, 9V and 12V" 2018-05-08 13:45:57 -07:00
Linux Build Service Account
49ff4084ee Merge "ion: Consider ion pool pages as indirectly reclaimable" 2018-05-08 13:45:55 -07:00
Linux Build Service Account
60fd114777 Merge "mm: treat indirectly reclaimable memory as free in overcommit logic" 2018-05-08 13:45:55 -07:00
Linux Build Service Account
d822f25d6d Merge "mm: treat indirectly reclaimable memory as available in MemAvailable" 2018-05-08 13:45:54 -07:00
Linux Build Service Account
c18ab0bcb7 Merge "soc: qcom: glink_smem_native_xprt: Move rx_worker in irq handler" 2018-05-08 13:45:53 -07:00
Linux Build Service Account
14effa597c Merge "diag: Add new Diag IDs" 2018-05-08 13:45:52 -07:00
Linux Build Service Account
78cb670fd2 Merge "input: touchscreen: synaptics_dsx: Fix buffer overflow" 2018-05-08 13:45:49 -07:00
Umang Agrawal
aa38c97b5e power: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type
Enable TypeC crude sensor PBS WA based on PMIC type since it is
required for PM660 and PMI8998 only.

Change-Id: Ib4f170ddba893e5b96372eecee9b9b74cb2a97e2
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2018-05-08 17:16:01 +05:30
Umang Agrawal
d9749262e8 power: smb-lib: Add support for SW based OV detection
Add support for software based USBIN OV detection, once
OV condition is detected, software will force USBIN to 5V
and continue charging with 5V.

Change-Id: Ie8f00f69db4ac6330d9da82b3455e4efab43861a
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2018-05-08 17:15:56 +05:30
Umang Agrawal
0d177827e0 smb-lib: add support of DP/DM pulsing for fix 5V, 9V and 12V
This change will enable userspace to control adapter's output
voltage. Userspace can force adapter's output voltage to
5V/9V/12V.

Change-Id: I4a60a681c136df6864294dbd19849503a2be2e7b
Signed-off-by: Umang Agrawal <uagrawal@codeaurora.org>
2018-05-08 17:15:50 +05:30
Linux Build Service Account
46b4f44537 Merge "soc: qcom: glink_ssr: Initialize waitqueue in probe function" 2018-05-08 04:21:31 -07:00
Linux Build Service Account
4964becbba Merge "defconfig: msm: add bluetooth related defconfigs for gvm" 2018-05-08 04:21:28 -07:00
Linux Build Service Account
f89961666e Merge "ARM: dts: msm: add bluetooth chip device node for gvm" 2018-05-08 04:21:26 -07:00
Vijayanand Jitta
f17bd0f328 ion: Consider ion pool pages as indirectly reclaimable
An issue is observed where mallocs are failing due to overcommit failure.
The failure happens when there is high ION page pool since ION page
pool is not considered reclaimable by the overcommit calculation code.
This change considers ion pool pages as indirectly reclaimable and thus
accounted as available memory in the overcommit calculation.

Change-Id: I8d63209b8c19286e55c407459ff124fdc58fdcc2
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
2018-05-08 04:03:37 -07:00
Dhoat Harpal
c3aacf2341 soc: qcom: glink_ssr: Initialize waitqueue in probe function
waitqueue is initialized on every call to notify_for_subsystem.
This leads to stability issue if one thread is waiting for completion
and another thread re-initializes it.

Waitqueue is initialized only in probe function.

CRs-Fixed: 2197181
Change-Id: I3509a7c4a197c727b2025c1aeb6a35690c3c8501
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2018-05-07 23:35:18 -07:00
Dhoat Harpal
92caad5b2e soc: qcom: glink_smem_native_xprt: Move rx_worker in irq handler
Tx_data cmd is processed in tasklet which is not guranteed to be
scheduled immidiatley. This decreases performance of glink.

Process tx_data command in irq handler.

CRs-Fixed: 2225619
Change-Id: Ida5e51b83fa46c76f72ae886260752baa8b942b9
Signed-off-by: Dhoat Harpal <hdhoat@codeaurora.org>
2018-05-08 11:38:18 +05:30
Vijayanand Jitta
d97c09c153 mm: treat indirectly reclaimable memory as free in overcommit logic
Indirectly reclaimable memory can consume a significant part of total
memory and it's actually reclaimable (it will be released under actual
memory pressure).This patch considers it as free in overcommit logic.

This patch is referenced from commit d79f7aa496fc ("mm: treat indirectly
reclaimable memory as free in overcommit logic") on upstream, as node
based vmstat global_node_page_state is not present zone based vmstat
global_page_state is used instead.

Change-Id: I9af71c566c83e24cd12e7653782b1898ccc7d680
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
2018-05-08 11:08:42 +05:30
Sreelakshmi Gownipalli
92c6b2970e diag: Add new Diag IDs
Update to latest diag IDs

Change-Id: I57a25f570484f2cd8255275015ca2c70294a78fb
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
2018-05-07 22:34:07 -07:00
Vijayanand Jitta
1f350f02fc mm: treat indirectly reclaimable memory as available in MemAvailable
Adjust /proc/meminfo MemAvailable calculation by adding the amount of
indirectly reclaimable memory (rounded to the PAGE_SIZE).

This change is referenced from commit 034ebf65c3c2 ("mm: treat indirectly
reclaimable memory as available in MemAvailable") on upstream, as node
based vmstat global_node_page_state is not present, zone based vmstat
global_page_state is used instead.

Change-Id: I7303d0f8ccd5993c7234a5187430d418d49e5763
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
2018-05-08 10:56:53 +05:30
Linux Build Service Account
7a89028866 Merge "irqchip: gic: print correct resume irq name" 2018-05-07 19:23:42 -07:00
Linux Build Service Account
215096ec8e Merge "mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES" 2018-05-07 19:23:40 -07:00
Linux Build Service Account
f79ef2334a Merge "taskstats: fix the length of cgroupstats_cmd_get_policy" 2018-05-07 19:23:37 -07:00
Song Gao
732bd7b936 defconfig: msm: add bluetooth related defconfigs for gvm
Currently, bluetooth are not enabled in gvm. It depends
on bluetooth power and rfkill related deconfigs.

Add these deconfigs to enable bluetooth in gvm.

Change-Id: Ib4b8d07e183852e77b02722584e5467127e68879
Signed-off-by: Song Gao <songg@codeaurora.org>
2018-05-07 19:18:17 -07:00
Song Gao
acf4a13cc4 ARM: dts: msm: add bluetooth chip device node for gvm
Currently, bluetooth chip reset function can not be
controlled through BT_EN gpio pin.

Add bluetooth chip device node along with bt-reset-gpio
to make this function workable.

Change-Id: I8cb9a274f4d5991587a299693d00609128742395
Signed-off-by: Song Gao <songg@codeaurora.org>
2018-05-07 19:18:14 -07:00
Linux Build Service Account
463cf73368 Merge "ARM: dts: msm: update mem region on msm8996 auto boards" 2018-05-07 10:03:55 -07:00
Linux Build Service Account
371512066a Merge "Android.bp: Initial header export bp for Android (qseecom only)" 2018-05-07 00:58:54 -07:00
Roman Gushchin
7e22f75445 mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES
Patch series "indirectly reclaimable memory", v2.

This patchset introduces the concept of indirectly reclaimable memory
and applies it to fix the issue of when a big number of dentries with
external names can significantly affect the MemAvailable value.

This patch (of 3):

Introduce a concept of indirectly reclaimable memory and adds the
corresponding memory counter and /proc/vmstat item.

Indirectly reclaimable memory is any sort of memory, used by the kernel
(except of reclaimable slabs), which is actually reclaimable, i.e.  will
be released under memory pressure.

The counter is in bytes, as it's not always possible to count such
objects in pages.  The name contains BYTES by analogy to
NR_KERNEL_STACK_KB.

Link: http://lkml.kernel.org/r/20180305133743.12746-2-guro@fb.com
Signed-off-by: Roman Gushchin <guro@fb.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-Commit: eb59254608bc1d42c4c6afdcdce9c0d3ce02b318
Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Change-Id: Ie15abc33dcb13091e3acfa04dd55c664e1a24e70
Signed-off-by: Vijayanand Jitta <vjitta@codeaurora.org>
2018-05-07 10:44:31 +05:30
Linux Build Service Account
b4728dbe0e Merge "ASoC: msm: qdsp6v2 : Add AFE port validation for MULTICHAN_HDMI_RX" 2018-05-06 02:07:12 -07:00
Linux Build Service Account
86d96481ed Merge "ASoC: sdm660_cdc: Fix pop after PDR on SDM660 internal codec" 2018-05-06 02:07:11 -07:00
Linux Build Service Account
fb913f564f Merge "ASoC: msm: add TDM routing for DTMF driver and dtmf fe dai to apq8096" 2018-05-06 02:07:10 -07:00
Linux Build Service Account
5c49e73d6d Merge "ASoC: msm: qdsp6v2: enable DMA channel control" 2018-05-06 02:07:09 -07:00
Linux Build Service Account
6830cc910e Merge "ARM: dts: msm: enable sensor node on msm8996 and apq8096" 2018-05-06 02:07:07 -07:00
Guchun Chen
c96659a88a drm: msm: improve early splash mechanism
Early RVC will keep running even if all display's splash
in bootloader are stopped. So kernel splash handoff
mechanism needs to be modified to match the scenario.

CRs-Fixed: 2225630
Change-Id: I0e00403f6cae0401ea23465f78cf092abfa2a611
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-05-05 20:09:00 +08:00
Guchun Chen
6fb8f903df drm: msm: read SDE registers for splash case
Read sde registers like layer mixer and ctrl information
from bootloader when early splash is enabled in bootloader.
These information will be updated to kernel resource
manager to let bootloader and kernel use the same hardware
setting.

CRs-Fixed: 2225630
Change-Id: I0e971de1992b380e30933f476b1a7e185ce0ad96
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
Signed-off-by: Camus Wong <camusw@codeaurora.org>
2018-05-05 19:01:48 +08:00
Guchun Chen
06af1c706e drm: msm: hw ctl needs to care reserved pipe
When kernel operates hw ctls, early RVC in bootloader
can also co-exist to update hardware registers. So it's
needed to care the reserved pipe by early RVC before
kernel starts to handle ctl setup.

CRs-Fixed: 2225630
Change-Id: I2df06350a44bd128dfb89cc0668c41d2edfb26a6
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-05-05 18:54:34 +08:00
David Ng
1a0aae2861 Android.bp: Initial header export bp for Android (qseecom only)
Initial Android blueprint makefile for kernel header export;
qseecom.h UAPI for now.

Change-Id: Ia0af480167e19d099789548a2229b46abbd977f8
Signed-off-by: David Ng <dave@codeaurora.org>
2018-05-04 19:50:40 -07:00
Guchun Chen
1c11027786 ARM: dts: msm: update mem region on msm8996 auto boards
Due to early RVC will continue running during the whole device
bootup period, so RVC's reserved memory should be updated to
contiguous-region to avoid smmu fault.

CRs-Fixed: 2225630
Change-Id: I5d1510f4e9079f6ddd5630b0b736d0d49bc0992b
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-05-05 09:42:53 +08:00
Guchun Chen
62017b91a1 ARM: dts: msm: add reserved plane node on msm8996 auto boards
Early RVC will enable vig0 layer if it's on in bootloader. So to
meet the purpose LK and kernel can access display hardware at the
same time, this pipe should be reserved in LK and set to not available
to others before RVC exits.

CRs-Fixed: 2225630
Change-Id: I1398db5750c01523e4b755fb4744a6fc976ee8da
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-05-05 09:35:56 +08:00
Linux Build Service Account
bf3bda0f81 Merge "drm/msm/hdmi: partial revert for hdmi->power_on changes" 2018-05-04 16:11:21 -07:00
Linux Build Service Account
6b0ad7611a Merge "ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform" 2018-05-03 19:58:45 -07:00
WANG Cong
dd25b013ce ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr
family.maxattr is the max index for policy[], the size of
ops[] is determined with ARRAY_SIZE().

Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Git-commit: 8fbfef7f505bba60fb57078b7621270ee57cd1c4
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I4a8cff16935c6b7edb3f4fa86faddd8258b0ef57
CRs-Fixed: 2236015
Signed-off-by: Jeff Johnson <jjohnson@codeaurora.org>
2018-05-03 16:31:19 -07:00
Timothy Sham
a98fd17446 ASoC: msm: add TDM routing for DTMF driver and dtmf fe dai to apq8096
Added DTMF mixer routing for QUAT_TDM_RX2 for automotive. Also added
the DTMF front-end dai to apq8096 driver.

Change-Id: I3652efd939774ff8cb7c40445747f0edbf6b3c7f
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
2018-05-03 18:05:49 -04:00
WANG Cong
28307e7f24 taskstats: fix the length of cgroupstats_cmd_get_policy
cgroupstats_cmd_get_policy is [CGROUPSTATS_CMD_ATTR_MAX+1],
taskstats_cmd_get_policy[TASKSTATS_CMD_ATTR_MAX+1],
but their family.maxattr is TASKSTATS_CMD_ATTR_MAX.
CGROUPSTATS_CMD_ATTR_MAX is less than TASKSTATS_CMD_ATTR_MAX,
so we could end up accessing out-of-bound.

Change cgroupstats_cmd_get_policy to TASKSTATS_CMD_ATTR_MAX+1,
this is safe because the rest are initialized to 0's.

Reported-by: Andrey Konovalov <andreyknvl@google.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: 243d52126184b072a18fe2130ce0008f8aa3a340
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: Ie03c41de881d8e0e88ba35f5369e4e955d8d8682
CRs-Fixed: 2234354
Signed-off-by: Jeff Johnson <jjohnson@codeaurora.org>
2018-05-03 14:03:24 -07:00
Linux Build Service Account
ea40a6c521 Merge "sched/walt: Fix use after free in trace_sched_update_task_ravg()" 2018-05-03 11:23:20 -07:00
Linux Build Service Account
cebf59e494 Merge "msm: ais: isp: Handling buffer use after getting it freed" 2018-05-03 02:07:35 -07:00
Linux Build Service Account
3fe5a8a331 Merge "gpio: No NULL owner" 2018-05-03 02:07:33 -07:00