OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
6 years agoMerge "drm: msm: improve early splash mechanism"
Linux Build Service Account [Wed, 9 May 2018 12:09:47 +0000 (05:09 -0700)]
Merge "drm: msm: improve early splash mechanism"

6 years agoMerge "ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr"
Linux Build Service Account [Tue, 8 May 2018 20:46:01 +0000 (13:46 -0700)]
Merge "ipvs: use IPVS_CMD_ATTR_MAX for family.maxattr"

6 years agoMerge "power: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type"
Linux Build Service Account [Tue, 8 May 2018 20:45:59 +0000 (13:45 -0700)]
Merge "power: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type"

6 years agoMerge "power: smb-lib: Add support for SW based OV detection"
Linux Build Service Account [Tue, 8 May 2018 20:45:58 +0000 (13:45 -0700)]
Merge "power: smb-lib: Add support for SW based OV detection"

6 years agoMerge "smb-lib: add support of DP/DM pulsing for fix 5V, 9V and 12V"
Linux Build Service Account [Tue, 8 May 2018 20:45:58 +0000 (13:45 -0700)]
Merge "smb-lib: add support of DP/DM pulsing for fix 5V, 9V and 12V"

6 years agoMerge "ion: Consider ion pool pages as indirectly reclaimable"
Linux Build Service Account [Tue, 8 May 2018 20:45:56 +0000 (13:45 -0700)]
Merge "ion: Consider ion pool pages as indirectly reclaimable"

6 years agoMerge "mm: treat indirectly reclaimable memory as free in overcommit logic"
Linux Build Service Account [Tue, 8 May 2018 20:45:55 +0000 (13:45 -0700)]
Merge "mm: treat indirectly reclaimable memory as free in overcommit logic"

6 years agoMerge "mm: treat indirectly reclaimable memory as available in MemAvailable"
Linux Build Service Account [Tue, 8 May 2018 20:45:54 +0000 (13:45 -0700)]
Merge "mm: treat indirectly reclaimable memory as available in MemAvailable"

6 years agoMerge "soc: qcom: glink_smem_native_xprt: Move rx_worker in irq handler"
Linux Build Service Account [Tue, 8 May 2018 20:45:53 +0000 (13:45 -0700)]
Merge "soc: qcom: glink_smem_native_xprt: Move rx_worker in irq handler"

6 years agoMerge "diag: Add new Diag IDs"
Linux Build Service Account [Tue, 8 May 2018 20:45:52 +0000 (13:45 -0700)]
Merge "diag: Add new Diag IDs"

6 years agoMerge "input: touchscreen: synaptics_dsx: Fix buffer overflow"
Linux Build Service Account [Tue, 8 May 2018 20:45:51 +0000 (13:45 -0700)]
Merge "input: touchscreen: synaptics_dsx: Fix buffer overflow"

6 years agopower: smb-lib: Enable TypeC crude sensor PBS WA based on PMIC type
Umang Agrawal [Tue, 17 Apr 2018 14:46:01 +0000 (20:16 +0530)]
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>
6 years agopower: smb-lib: Add support for SW based OV detection
Umang Agrawal [Mon, 16 Apr 2018 09:11:11 +0000 (14:41 +0530)]
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>
6 years agosmb-lib: add support of DP/DM pulsing for fix 5V, 9V and 12V
Umang Agrawal [Tue, 8 May 2018 11:42:30 +0000 (17:12 +0530)]
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>
6 years agoMerge "soc: qcom: glink_ssr: Initialize waitqueue in probe function"
Linux Build Service Account [Tue, 8 May 2018 11:21:31 +0000 (04:21 -0700)]
Merge "soc: qcom: glink_ssr: Initialize waitqueue in probe function"

6 years agoMerge "defconfig: msm: add bluetooth related defconfigs for gvm"
Linux Build Service Account [Tue, 8 May 2018 11:21:29 +0000 (04:21 -0700)]
Merge "defconfig: msm: add bluetooth related defconfigs for gvm"

6 years agoMerge "ARM: dts: msm: add bluetooth chip device node for gvm"
Linux Build Service Account [Tue, 8 May 2018 11:21:26 +0000 (04:21 -0700)]
Merge "ARM: dts: msm: add bluetooth chip device node for gvm"

6 years agoion: Consider ion pool pages as indirectly reclaimable
Vijayanand Jitta [Wed, 18 Apr 2018 04:58:16 +0000 (10:28 +0530)]
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>
6 years agosoc: qcom: glink_ssr: Initialize waitqueue in probe function
Dhoat Harpal [Mon, 12 Mar 2018 11:42:13 +0000 (17:12 +0530)]
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>
6 years agosoc: qcom: glink_smem_native_xprt: Move rx_worker in irq handler
Dhoat Harpal [Fri, 13 Apr 2018 13:36:42 +0000 (19:06 +0530)]
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>
6 years agomm: treat indirectly reclaimable memory as free in overcommit logic
Vijayanand Jitta [Tue, 10 Apr 2018 23:27:47 +0000 (16:27 -0700)]
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>
6 years agodiag: Add new Diag IDs
Sreelakshmi Gownipalli [Mon, 23 Apr 2018 20:41:14 +0000 (13:41 -0700)]
diag: Add new Diag IDs

Update to latest diag IDs

Change-Id: I57a25f570484f2cd8255275015ca2c70294a78fb
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
6 years agomm: treat indirectly reclaimable memory as available in MemAvailable
Vijayanand Jitta [Tue, 10 Apr 2018 23:27:40 +0000 (16:27 -0700)]
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>
6 years agoMerge "irqchip: gic: print correct resume irq name"
Linux Build Service Account [Tue, 8 May 2018 02:23:43 +0000 (19:23 -0700)]
Merge "irqchip: gic: print correct resume irq name"

6 years agoMerge "mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES"
Linux Build Service Account [Tue, 8 May 2018 02:23:40 +0000 (19:23 -0700)]
Merge "mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES"

6 years agoMerge "taskstats: fix the length of cgroupstats_cmd_get_policy"
Linux Build Service Account [Tue, 8 May 2018 02:23:37 +0000 (19:23 -0700)]
Merge "taskstats: fix the length of cgroupstats_cmd_get_policy"

6 years agodefconfig: msm: add bluetooth related defconfigs for gvm
Song Gao [Mon, 7 May 2018 04:38:58 +0000 (12:38 +0800)]
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>
6 years agoARM: dts: msm: add bluetooth chip device node for gvm
Song Gao [Mon, 7 May 2018 04:20:29 +0000 (12:20 +0800)]
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>
6 years agoMerge "ARM: dts: msm: update mem region on msm8996 auto boards"
Linux Build Service Account [Mon, 7 May 2018 17:03:56 +0000 (10:03 -0700)]
Merge "ARM: dts: msm: update mem region on msm8996 auto boards"

6 years agoMerge "Android.bp: Initial header export bp for Android (qseecom only)"
Linux Build Service Account [Mon, 7 May 2018 07:58:54 +0000 (00:58 -0700)]
Merge "Android.bp: Initial header export bp for Android (qseecom only)"

6 years agomm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES
Roman Gushchin [Tue, 10 Apr 2018 23:27:36 +0000 (16:27 -0700)]
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>
6 years agoMerge "ASoC: msm: qdsp6v2 : Add AFE port validation for MULTICHAN_HDMI_RX"
Linux Build Service Account [Sun, 6 May 2018 09:07:13 +0000 (02:07 -0700)]
Merge "ASoC: msm: qdsp6v2 : Add AFE port validation for MULTICHAN_HDMI_RX"

6 years agoMerge "ASoC: sdm660_cdc: Fix pop after PDR on SDM660 internal codec"
Linux Build Service Account [Sun, 6 May 2018 09:07:12 +0000 (02:07 -0700)]
Merge "ASoC: sdm660_cdc: Fix pop after PDR on SDM660 internal codec"

6 years agoMerge "ASoC: msm: add TDM routing for DTMF driver and dtmf fe dai to apq8096"
Linux Build Service Account [Sun, 6 May 2018 09:07:10 +0000 (02:07 -0700)]
Merge "ASoC: msm: add TDM routing for DTMF driver and dtmf fe dai to apq8096"

6 years agoMerge "ASoC: msm: qdsp6v2: enable DMA channel control"
Linux Build Service Account [Sun, 6 May 2018 09:07:09 +0000 (02:07 -0700)]
Merge "ASoC: msm: qdsp6v2: enable DMA channel control"

6 years agoMerge "ARM: dts: msm: enable sensor node on msm8996 and apq8096"
Linux Build Service Account [Sun, 6 May 2018 09:07:07 +0000 (02:07 -0700)]
Merge "ARM: dts: msm: enable sensor node on msm8996 and apq8096"

6 years agodrm: msm: improve early splash mechanism
Guchun Chen [Fri, 13 Apr 2018 09:29:40 +0000 (17:29 +0800)]
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>
6 years agodrm: msm: read SDE registers for splash case
Guchun Chen [Fri, 20 Apr 2018 11:10:04 +0000 (19:10 +0800)]
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>
6 years agodrm: msm: hw ctl needs to care reserved pipe
Guchun Chen [Wed, 25 Apr 2018 14:13:43 +0000 (22:13 +0800)]
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>
6 years agoAndroid.bp: Initial header export bp for Android (qseecom only)
David Ng [Fri, 4 May 2018 02:36:14 +0000 (19:36 -0700)]
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>
6 years agoARM: dts: msm: update mem region on msm8996 auto boards
Guchun Chen [Wed, 25 Apr 2018 13:48:39 +0000 (21:48 +0800)]
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>
6 years agoARM: dts: msm: add reserved plane node on msm8996 auto boards
Guchun Chen [Thu, 12 Apr 2018 09:16:35 +0000 (17:16 +0800)]
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>
6 years agoMerge "drm/msm/hdmi: partial revert for hdmi->power_on changes"
Linux Build Service Account [Fri, 4 May 2018 23:11:21 +0000 (16:11 -0700)]
Merge "drm/msm/hdmi: partial revert for hdmi->power_on changes"

6 years agoMerge "ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform"
Linux Build Service Account [Fri, 4 May 2018 02:58:45 +0000 (19:58 -0700)]
Merge "ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform"

6 years agoipvs: use IPVS_CMD_ATTR_MAX for family.maxattr
WANG Cong [Fri, 4 Nov 2016 00:14:03 +0000 (17:14 -0700)]
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>
6 years agoASoC: msm: add TDM routing for DTMF driver and dtmf fe dai to apq8096
Timothy Sham [Thu, 26 Apr 2018 20:20:57 +0000 (16:20 -0400)]
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>
6 years agotaskstats: fix the length of cgroupstats_cmd_get_policy
WANG Cong [Thu, 3 Nov 2016 16:42:36 +0000 (09:42 -0700)]
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>
6 years agoMerge "sched/walt: Fix use after free in trace_sched_update_task_ravg()"
Linux Build Service Account [Thu, 3 May 2018 18:23:20 +0000 (11:23 -0700)]
Merge "sched/walt: Fix use after free in trace_sched_update_task_ravg()"

6 years agoMerge "msm: ais: isp: Handling buffer use after getting it freed"
Linux Build Service Account [Thu, 3 May 2018 09:07:35 +0000 (02:07 -0700)]
Merge "msm: ais: isp: Handling buffer use after getting it freed"

6 years agoMerge "gpio: No NULL owner"
Linux Build Service Account [Thu, 3 May 2018 09:07:34 +0000 (02:07 -0700)]
Merge "gpio: No NULL owner"

6 years agoMerge "defconfig: Enable preemptirq tracing for msm8998 and sdm660"
Linux Build Service Account [Thu, 3 May 2018 09:07:28 +0000 (02:07 -0700)]
Merge "defconfig: Enable preemptirq tracing for msm8998 and sdm660"

6 years agoirqchip: gic: print correct resume irq name
Maulik Shah [Wed, 25 May 2016 10:38:12 +0000 (16:08 +0530)]
irqchip: gic: print correct resume irq name

Currently hwirq number is used to get descriptor for irq
in gic_show_resume_irq function which returns incorrect
irq descriptor.

Update it to use correct irq number using irq_find_mapping.

Change-Id: Ib61ebcb3d5e520566b157ee5781d11b70d0f513d
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
6 years agoMerge changes into msm-4.4
Gerrit - the friendly Code Review server [Thu, 3 May 2018 07:33:44 +0000 (00:33 -0700)]
Merge changes  into msm-4.4

6 years agomsm: show_resume_irq: print the irq name
Abhijeet Dharmapurikar [Mon, 19 Aug 2013 22:03:14 +0000 (15:03 -0700)]
msm: show_resume_irq: print the irq name

Just printing the irq number is not informative. Update the code
to show the name of the interrupt's irq action.

Change-Id: Ia3e7d37948860b23d4390808769cd198656eba48
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
6 years agoGIC: Show interrupts that triggered wakeup
Abhijeet Dharmapurikar [Mon, 13 Dec 2010 20:04:27 +0000 (12:04 -0800)]
GIC: Show interrupts that triggered wakeup

This change is to satisfy the logging requirement of
wakeup interrupts. Add code to log the trigger status
of wakeup interrupts. This helps in debugging
the cause of wakeup when the system is suspended

Change-Id: I0f724296f9133433cdbc3271a9b91c6fa992a2ff
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
6 years agoGIC: implement suspend and resume
Abhijeet Dharmapurikar [Thu, 12 Aug 2010 00:18:28 +0000 (17:18 -0700)]
GIC: implement suspend and resume

While in suspend state, the system should not wake up due to triggering
of a non wakeup interrupt. Implement suspend and resume functions to be
called from power management code to switch enabled interrupts between
wakeup set or normal set.

Change-Id: Iaceae286707460eadc5f05c0baef72b43c942777
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
6 years agoARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform
Zhaoyang Liu [Wed, 18 Apr 2018 08:57:51 +0000 (16:57 +0800)]
ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform

Enable IEEE802.11AD WiFi device wil6210.
Change wil6210 PCIe parent for MSM8996 platform.

Change-Id: I58919c766c0e6f0090d309492de1ecf12718824d
Signed-off-by: Zhaoyang Liu <zhaoyang@codeaurora.org>
6 years agosched/walt: Fix use after free in trace_sched_update_task_ravg()
Pavankumar Kondeti [Tue, 13 Mar 2018 10:33:15 +0000 (16:03 +0530)]
sched/walt: Fix use after free in trace_sched_update_task_ravg()

commit 4d09122c1868 ("sched: Fix spinlock recursion in sched_exit()")
moved freeing of task's current and previous window arrays outside
the rq->lock. These arrays can be accessed from another CPU in parallel
and end up using freed memory. For example,

CPU#0                                 CPU#1
----------------------------------    -------------------------------
sched_exit()                          try_to_wake_up()--> The task wakes
                                                          up on CPU#0
 task_rq_lock()                        set_task_cpu()
                                        fixup_busy_time() --> waiting for
                  CPU#0's rq->lock

 task_rq_unlock()                       fixup_busy_time()-->lock acquired
 free_task_load_ptrs()
  kfree(p->ravg.curr_window_cpu)         update_task_ravg()-->called on
                                                          current of CPU#0
  trace_sched_update_task_ravg()
          --> access freed memory
  p->ravg.curr_window_cpu = NULL;

To fix this issue, window array pointers must be set to NULL before
freeing the memory. Since this happens outside the lock, memory barriers
are needed on write and read paths. A much simpler alternative would be
skipping update_task_ravg() trace point for tasks that are marked as dead.
The window stats of dead tasks are not updated any ways. While at it, skip
this trace point for newly created tasks for which also window stats are
not updated.

Change-Id: I4d7cb8a3cf7cf84270b09721140d35205643b7ab
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
[spathi@codeaurora.org: moved changes to hmp.c since EAS is not supported]
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
6 years agogpio: No NULL owner
Linus Walleij [Tue, 16 Jan 2018 07:42:12 +0000 (08:42 +0100)]
gpio: No NULL owner

Sometimes a GPIO is fetched with NULL as parent device, and
that is just fine. So under these circumstances, avoid using
dev_name() to provide a name for the GPIO line.

Change-Id: Iacf2ef35d50118cd755e26ed4211c3c4b1289ff2
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Git-commit: 7d18f0a14aa6a0d6bad39111c1fb655f07f71d59
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
6 years agoMerge "Merge android-4.4.129 (b1c4836) into msm-4.4"
Linux Build Service Account [Wed, 2 May 2018 20:38:40 +0000 (13:38 -0700)]
Merge "Merge android-4.4.129 (b1c4836) into msm-4.4"

6 years agoMerge "ANDROID: sound: rawmidi: Hold lock around realloc"
Linux Build Service Account [Wed, 2 May 2018 20:38:39 +0000 (13:38 -0700)]
Merge "ANDROID: sound: rawmidi: Hold lock around realloc"

6 years agoMerge "msm: ipa: using debug logging instead of error logging"
Linux Build Service Account [Wed, 2 May 2018 20:38:38 +0000 (13:38 -0700)]
Merge "msm: ipa: using debug logging instead of error logging"

6 years agoMerge "mmc: core: power cycle card when sd card switch voltage operation fails"
Linux Build Service Account [Wed, 2 May 2018 20:38:37 +0000 (13:38 -0700)]
Merge "mmc: core: power cycle card when sd card switch voltage operation fails"

6 years agoMerge "mmc: card: WARN_ON in cmdq completion context"
Linux Build Service Account [Wed, 2 May 2018 20:38:36 +0000 (13:38 -0700)]
Merge "mmc: card: WARN_ON in cmdq completion context"

6 years agoMerge "defconfig: Enable cellular hints in regulatory cfg80211"
Linux Build Service Account [Wed, 2 May 2018 20:38:35 +0000 (13:38 -0700)]
Merge "defconfig: Enable cellular hints in regulatory cfg80211"

6 years agoANDROID: sound: rawmidi: Hold lock around realloc
Daniel Rosenberg [Tue, 31 Oct 2017 23:55:26 +0000 (16:55 -0700)]
ANDROID: sound: rawmidi: Hold lock around realloc

The SNDRV_RAWMIDI_STREAM_{OUTPUT,INPUT} ioctls may reallocate
runtime->buffer while other kernel threads are accessing it.  If the
underlying krealloc() call frees the original buffer, then this can turn
into a use-after-free.

Most of these accesses happen while the thread is holding runtime->lock,
and can be fixed by just holding the same lock while replacing
runtime->buffer, however we can't hold this spinlock while
snd_rawmidi_kernel_{read1,write1} are copying to/from userspace.  We
need to add and acquire a new mutex to prevent this from happening
concurrently with reallocation.  We hold this mutex during the entire
reallocation process, to also prevent multiple concurrent reallocations
leading to a double-free.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
bug: 64315347
Change-Id: I05764d4f1a38f373eb7c0ac1c98607ee5ff0eded
[dcagle@codeaurora.org: Resolve trivial merge conflict]
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: d7193540482d11ff0ad3a07fc18717811641c6eb
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
6 years agoMerge "leds: qpnp-flash-v2: Modify current code calculation"
Linux Build Service Account [Wed, 2 May 2018 11:54:42 +0000 (04:54 -0700)]
Merge "leds: qpnp-flash-v2: Modify current code calculation"

6 years agoMerge "hab: import/export between remote buffer and dmafd"
Linux Build Service Account [Wed, 2 May 2018 11:54:41 +0000 (04:54 -0700)]
Merge "hab: import/export between remote buffer and dmafd"

6 years agoMerge "i2c-msm-v2: Add support for suspend to disk"
Linux Build Service Account [Wed, 2 May 2018 11:54:40 +0000 (04:54 -0700)]
Merge "i2c-msm-v2: Add support for suspend to disk"

6 years agoMerge "diag: Validate query dci event and log mask size properly"
Linux Build Service Account [Wed, 2 May 2018 11:54:39 +0000 (04:54 -0700)]
Merge "diag: Validate query dci event and log mask size properly"

6 years agoMerge "Merge android-4.4.128 (89904cc) into msm-4.4"
Linux Build Service Account [Wed, 2 May 2018 11:54:38 +0000 (04:54 -0700)]
Merge "Merge android-4.4.128 (89904cc) into msm-4.4"

6 years agoMerge "usb: gadget: ffs: Multi-instance fix for use after free case"
Linux Build Service Account [Wed, 2 May 2018 11:54:36 +0000 (04:54 -0700)]
Merge "usb: gadget: ffs: Multi-instance fix for use after free case"

6 years agoMerge "tracing: always define trace_{irq,preempt}_{enable_disable}"
Linux Build Service Account [Wed, 2 May 2018 11:54:35 +0000 (04:54 -0700)]
Merge "tracing: always define trace_{irq,preempt}_{enable_disable}"

6 years agoMerge "cpuidle: lpm-levels: Fix snprintf string format"
Linux Build Service Account [Wed, 2 May 2018 11:54:34 +0000 (04:54 -0700)]
Merge "cpuidle: lpm-levels: Fix snprintf string format"

6 years agoMerge "soc: qcom: rpm_stats: Fix snprintf string format"
Linux Build Service Account [Wed, 2 May 2018 11:54:32 +0000 (04:54 -0700)]
Merge "soc: qcom: rpm_stats: Fix snprintf string format"

6 years agomsm: ipa: using debug logging instead of error logging
Mohammed Javid [Wed, 3 Jan 2018 11:59:57 +0000 (17:29 +0530)]
msm: ipa: using debug logging instead of error logging

Adding code changes to controlling logs printing
on the console changing error logging to debug logging

Change-Id: I35f4c0e3380ad700899808d9cd6c260befb8be8f
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
6 years agommc: core: power cycle card when sd card switch voltage operation fails
Ram Prakash Gupta [Thu, 26 Apr 2018 10:54:46 +0000 (16:24 +0530)]
mmc: core: power cycle card when sd card switch voltage operation fails

As per the sd card spec, mmc need to power cycle sd card in case sd
card voltage switch operation fails. Currently we are directly going
for low speed mode without power cycle, which is in violation of sd
card spec. Now we will retry for 10 times in case timeout happens
while switching voltage and at last, in case, it did not succeed in
switching sd card voltage, mmc would go for low speed mode.

Change-Id: Icece08732b8d52104e0890dce81ad16844265edd
Signed-off-by: Ram Prakash Gupta <rampraka@codeaurora.org>
6 years agommc: card: WARN_ON in cmdq completion context
Pradeep P V K [Thu, 19 Apr 2018 09:12:44 +0000 (14:42 +0530)]
mmc: card: WARN_ON in cmdq completion context

Due to command queuing, there is a possibility of servicing
completion of multiple requests from hw irq context. So in
this case, hw irq will launch softirq for all requests which
were completed (irrespective of whether it was success or failure).

If one of the requests failed, then the softirq corresponding
to error ed request will set current cmdq state to CMDQ_STATE_ERR.
Because of this, subsequent completion softirqs for successful
requests will BUG_ON.

We should let higher layers know of completion of successful
requests. Hence change the BUG_ON to WARN_ON and skip
blk_end_request() only if the corresponding request has
an error (instead of checking if the cmdq state is in error)

Change-Id: Ieb7f9d12ba04b6ab6499bf29f3716b0ddfb880fb
Signed-off-by: Pradeep P V K <ppvk@codeaurora.org>
6 years agomsm: ais: isp: Handling buffer use after getting it freed
Suprith Malligere Shankaregowda [Wed, 25 Apr 2018 05:47:30 +0000 (11:17 +0530)]
msm: ais: isp: Handling buffer use after getting it freed

In the code, start_fetch can try to access the buffer
pointer variable after free, as the same pointer can
can be freed at RELEASE_BUF call too at the same time.
Hence fixing this race condition.

Change-Id: I05825fb3423f95bc251e79416de50dc32cf086dc
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
6 years agoMerge "usb: dwc3-msm: Resume PHY before notify_connect on start_host"
Linux Build Service Account [Wed, 2 May 2018 00:00:41 +0000 (17:00 -0700)]
Merge "usb: dwc3-msm: Resume PHY before notify_connect on start_host"

6 years agoMerge "ASoC: msm: move tdm grp mgt to afe for anc support"
Linux Build Service Account [Wed, 2 May 2018 00:00:38 +0000 (17:00 -0700)]
Merge "ASoC: msm: move tdm grp mgt to afe for anc support"

6 years agodefconfig: Enable cellular hints in regulatory cfg80211
Amar Singhal [Tue, 17 Apr 2018 18:32:26 +0000 (11:32 -0700)]
defconfig: Enable cellular hints in regulatory cfg80211

The user-space may send regulatory hint that has cellular sub-type
enabled. To process such events, enable
CONFIG_CFG80211_REG_CELLULAR_HINTS.

Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Change-Id: I79aceece8e7f17bbcf8186b03c74d82be82c5a4c
CRs-Fixed: 2201959

6 years agoASoC: sdm660_cdc: Fix pop after PDR on SDM660 internal codec
Vatsal Bucha [Mon, 30 Apr 2018 07:19:34 +0000 (12:49 +0530)]
ASoC: sdm660_cdc: Fix pop after PDR on SDM660 internal codec

Pop is heard after PDR is triggered. This is
resolved by disable PA before boost is discharged.

CRs-Fixed: 2186640
Change-Id: Ie48668725f5162251cf09215f9448a6965fac3e2
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
6 years agoMerge "drm/msm/sde: increase gpu input fence timeout to 10 seconds"
Linux Build Service Account [Tue, 1 May 2018 13:26:41 +0000 (06:26 -0700)]
Merge "drm/msm/sde: increase gpu input fence timeout to 10 seconds"

6 years agoMerge "drm: msm: add uevent handler to release pipes"
Linux Build Service Account [Tue, 1 May 2018 13:26:39 +0000 (06:26 -0700)]
Merge "drm: msm: add uevent handler to release pipes"

6 years agoMerge "drm: msm: add early splash support on triple displays"
Linux Build Service Account [Tue, 1 May 2018 13:26:38 +0000 (06:26 -0700)]
Merge "drm: msm: add early splash support on triple displays"

6 years agoMerge "msm: ipa: rmnet: Make code changes with respect to CR#2046006"
Linux Build Service Account [Tue, 1 May 2018 13:26:37 +0000 (06:26 -0700)]
Merge "msm: ipa: rmnet: Make code changes with respect to CR#2046006"

6 years agoMerge "Revert "adv7481: return error when PLL lock fails""
Linux Build Service Account [Tue, 1 May 2018 13:26:36 +0000 (06:26 -0700)]
Merge "Revert "adv7481:  return error when PLL lock fails""

6 years agoMerge "ath10k: update wowlan config and rekey data store method"
Linux Build Service Account [Tue, 1 May 2018 13:26:35 +0000 (06:26 -0700)]
Merge "ath10k: update wowlan config and rekey data store method"

6 years agoMerge "net: ipc_router: Remove wakeup-source for Sensor ports"
Linux Build Service Account [Tue, 1 May 2018 13:26:34 +0000 (06:26 -0700)]
Merge "net: ipc_router: Remove wakeup-source for Sensor ports"

6 years agoMerge "ASoC: msm: Update channel mixer weight mixer control"
Linux Build Service Account [Tue, 1 May 2018 13:26:33 +0000 (06:26 -0700)]
Merge "ASoC: msm: Update channel mixer weight mixer control"

6 years agoMerge "soc: msm: add apr sensor domain support"
Linux Build Service Account [Tue, 1 May 2018 13:26:31 +0000 (06:26 -0700)]
Merge "soc: msm: add apr sensor domain support"

6 years agoMerge "audio: qdsp6v2: add retry when EAGAIN for habmm_socket_recv"
Linux Build Service Account [Tue, 1 May 2018 13:26:29 +0000 (06:26 -0700)]
Merge "audio: qdsp6v2: add retry when EAGAIN for habmm_socket_recv"

6 years agoinput: touchscreen: synaptics_dsx: Fix buffer overflow
Venkata Prahlad Valluru [Tue, 1 May 2018 05:53:32 +0000 (11:23 +0530)]
input: touchscreen: synaptics_dsx: Fix buffer overflow

Limit the index to buffer length while copying from
'strptr' to 'firmware_id'.

Change-Id: I1d7cb7a3d9593ca213c7f7341776632e635eb0df
Signed-off-by: Venkata Prahlad Valluru <vvalluru@codeaurora.org>
6 years agoMerge "msm: camera: sensor: Adjust csiphy skew filter setting"
Linux Build Service Account [Tue, 1 May 2018 04:09:08 +0000 (21:09 -0700)]
Merge "msm: camera: sensor: Adjust csiphy skew filter setting"

6 years agoMerge "msm: camera: Change data type of data rate"
Linux Build Service Account [Tue, 1 May 2018 04:09:07 +0000 (21:09 -0700)]
Merge "msm: camera: Change data type of data rate"

6 years agoMerge "esoc: Use standard reset time for mdm9x55 atomic reset"
Linux Build Service Account [Tue, 1 May 2018 04:09:03 +0000 (21:09 -0700)]
Merge "esoc: Use standard reset time for mdm9x55 atomic reset"

6 years agoARM: dts: msm: enable sensor node on msm8996 and apq8096
Derek Chen [Mon, 30 Oct 2017 19:37:30 +0000 (15:37 -0400)]
ARM: dts: msm: enable sensor node on msm8996 and apq8096

Enable sensor device node to allow Anti-Noise
Cancellation (ANC) algorithm to be running on
sensor subsystem for automotive msm8996 and
apq8096 platforms.

CRs-fixed: 2153236
Change-Id: I213c2eb94f6fe01e7c2ceca2d9033616817db38b
Signed-off-by: Derek Chen <chenche@codeaurora.org>
6 years agosoc: msm: add sensor dsp framework support for anc
Derek Chen [Thu, 19 Oct 2017 22:06:35 +0000 (18:06 -0400)]
soc: msm: add sensor dsp framework support for anc

Add Sensor DSP framework support for Active
Engine Noise Cancellation (ANC).

CRs-fixed: 2153236
Signed-off-by: Derek Chen <chenche@codeaurora.org>
Change-Id: I4cd28ac1bbfd3fcd21174e0216c70cd664cfa319

6 years agoASoC: msm: qdsp6v2 : Add AFE port validation for MULTICHAN_HDMI_RX
Ramu Gottipati [Thu, 26 Apr 2018 11:25:41 +0000 (16:55 +0530)]
ASoC: msm: qdsp6v2 : Add AFE port validation for MULTICHAN_HDMI_RX

validate port doesn't handle MULTICHAN_HDMI_RX
and causes failure to set afe params.
Included MULTICHAN_HDMI_RX in port validation

Change-Id: I3603ec2a3d392970cb48be1658b6030d3f4107f2
Signed-off-by: Ramu Gottipati <ramug@codeaurora.org>