OSDN Git Service
Linux Build Service Account [Thu, 17 May 2018 10:38:29 +0000 (03:38 -0700)]
Merge "Revert "usb: host: xhci: Add helper function to return controller id""
Linux Build Service Account [Thu, 17 May 2018 10:38:27 +0000 (03:38 -0700)]
Merge "Revert "sound: usb: Provide controller number in QMI response""
Linux Build Service Account [Thu, 17 May 2018 10:38:25 +0000 (03:38 -0700)]
Merge "ARM: dts: msm: Add speed-bin 4 support for sdm660"
Linux Build Service Account [Thu, 17 May 2018 10:38:20 +0000 (03:38 -0700)]
Merge "[drm/sde/hdmi] move scrambler setup from mode-set to pre-enable"
Linux Build Service Account [Wed, 16 May 2018 17:28:48 +0000 (10:28 -0700)]
Merge "ARM: dts: msm: support msm-pcm-dtmf on msm8996 adsp/cdp"
Linux Build Service Account [Wed, 16 May 2018 17:28:45 +0000 (10:28 -0700)]
Merge "ASoC: msm: qdsp6v2: increase max Rx DTMF duration"
Linux Build Service Account [Wed, 16 May 2018 07:29:11 +0000 (00:29 -0700)]
Merge "ARM: dts: msm: add HAB physical channels for msm8996 baseline vplatform"
Linux Build Service Account [Wed, 16 May 2018 07:29:09 +0000 (00:29 -0700)]
Merge "Revert "sound: usb: Update QMI indication message""
Linux Build Service Account [Wed, 16 May 2018 07:29:07 +0000 (00:29 -0700)]
Merge "battery: handle early/late suspend/resume of i2c bus"
Camus Wong [Fri, 6 Apr 2018 00:40:15 +0000 (20:40 -0400)]
[drm/sde/hdmi] move scrambler setup from mode-set to pre-enable
when mode-set is called, HDP core is not enabled yet and scrambler
is not working. Move scrambler setup to pre-enable stage will fix
this problem.
Change-Id: I85d0ac22c6b789a9c0f6288b06cabf3225c20b45
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:50:51 +0000 (10:20 +0530)]
Revert "usb: host: xhci: Add helper function to return controller id"
This reverts commit
97618148cec392dd81aedbef03504c90b5ddaf26.
Remove helper function to return controller id.
Change-Id: I1c0f6cd5600630d77d986f9782e4b83e2919d22b
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:47:14 +0000 (10:17 +0530)]
Revert "sound: usb: Provide controller number in QMI response"
This reverts commit
9730f9cdc0874d372a3eb10680ed8622e26db2bb.
Remote entity does not require the controller number. Tunnel
mode audio will only work with the primary controller. Hence
remove support for providing controller num.
Change-Id: Ife8c0ca969334c57046a91bae428b5f89f9e0566
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:45:49 +0000 (10:15 +0530)]
Revert "sound: usb: Pass device speed instead of dcba information"
This reverts commit
8177d0955dfdcc7910a261af04d9214018e38d13.
ADSP requires dcba memory information. Hence pass it from driver.
Change-Id: Ibaf120ba130a24329ef88c7755154e50ba3a7335
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:45:01 +0000 (10:15 +0530)]
Revert "usb: core: Remove helper APIs returning dcba dma address"
This reverts commit
039bcf340ea35f1e5c4a81f290455570097d7d62.
Add back helper APIs to return dcba dma address.
Change-Id: Ia65e98691d1a3c241694f07215c12605832f574d
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Ajay Agarwal [Fri, 4 May 2018 04:44:04 +0000 (10:14 +0530)]
Revert "usb: host: xhci: Remove helper API retuning dcba dma address"
This reverts commit
9c1d883952b8430994a302d10aab2bc8130bcd97.
Add back helper API to return dcba dma address.
Change-Id: I769c42d53f19bbefb65d491823911b39ec620751
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
Linux Build Service Account [Tue, 15 May 2018 02:56:24 +0000 (19:56 -0700)]
Merge "asoc: sdm660: Add configuration for adaptive bitrate."
Linux Build Service Account [Tue, 15 May 2018 02:56:23 +0000 (19:56 -0700)]
Merge "regulator: cprh-kbss: Add speed-bin 4 support for sdm660"
Linux Build Service Account [Tue, 15 May 2018 02:56:22 +0000 (19:56 -0700)]
Merge "diag: Initialize memory device memory pools"
Linux Build Service Account [Tue, 15 May 2018 02:56:21 +0000 (19:56 -0700)]
Merge "Revert "defconfig: msm: Enable 802.11AD WiFi platform driver""
Linux Build Service Account [Tue, 15 May 2018 02:56:19 +0000 (19:56 -0700)]
Merge "ARM: dts: msm: add hab device node into the msm8996 ivi LA vplatform"
Linux Build Service Account [Tue, 15 May 2018 02:56:17 +0000 (19:56 -0700)]
Merge "ARM: dts: msm: Use peripheral nodes from QRD630 on QRD636"
Soumya Managoli [Tue, 8 May 2018 05:01:22 +0000 (10:31 +0530)]
asoc: sdm660: Add configuration for adaptive bitrate.
Add hostless front end DAI to trigger backend
configuration of BT backend dai required for
configuring BT ABR statistics. Add mixer ctrls
to independently configure TX and RX sample
rates to allow BT RX and TX backends.
Change-Id: I2370eccb10da666ecf267f2756b2efd66ecbf8f6
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
Jiangen Jiao [Fri, 8 Sep 2017 08:58:49 +0000 (16:58 +0800)]
ARM: dts: msm: Use peripheral nodes from QRD630 on QRD636
Include QRD630 device tree file to leverage peripherals nodes and
delete smb1351 node as it is not present on QRD630 board.
Change-Id: I91b6356bf7267d56af73eee1a1bea3fa5ae944f4
Signed-off-by: Jiangen Jiao <jiangenj@codeaurora.org>
Signed-off-by: Zhenhua Huang <zhenhuah@codeaurora.org>
Sreelakshmi Gownipalli [Thu, 11 Jan 2018 18:45:23 +0000 (10:45 -0800)]
diag: Initialize memory device memory pools
Initialize memory device memory pools for diag bridge
only during diag bridge initialization.
Change-Id: I6454ced55e020ade9e3bb99a266548f77f79e193
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Tirupathi Reddy [Fri, 27 Apr 2018 11:37:45 +0000 (17:07 +0530)]
ARM: dts: msm: Add speed-bin 4 support for sdm660
Add APC CPR configuration for sdm660 speed-bin 4
parts.
Change-Id: Iaeb5611218fbad22083f030a374db31c5774153b
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Tirupathi Reddy [Fri, 11 May 2018 09:35:13 +0000 (15:05 +0530)]
regulator: cprh-kbss: Add speed-bin 4 support for sdm660
Update fuse combo count supported for sdm660 to 40.
Change-Id: I9ee2c15792c3f006db5969be42bce19a4ebc180c
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Yong Ding [Tue, 8 May 2018 08:41:14 +0000 (16:41 +0800)]
ARM: dts: msm: add hab device node into the msm8996 ivi LA vplatform
HAB(Hypervisor ABstraction driver) is used to support
message tx/rx or buffer sharing between multiple OS in the
virtualization environment.
With such hab device node in the ivi LA vplatform's device
tree, hab driver will get its configurations dynamically.
So it will not use the default configurations any more.
Change-Id: Ie036799428bccac3685229c249b4943335807b68
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Vivek Kumar [Fri, 11 May 2018 06:47:59 +0000 (12:17 +0530)]
Revert "defconfig: msm: Enable 802.11AD WiFi platform driver"
This reverts commit
976d5ca5ddeff6f4b2b364edb916d39fa6448365.
Change-Id: I4b6bb0e3af39bcdf0238ca542ab3acfc584a5fd3
Signed-off-by: Vivek Kumar <vivekuma@codeaurora.org>
Linux Build Service Account [Thu, 10 May 2018 18:33:48 +0000 (11:33 -0700)]
Merge "soc: qcom: scm_qcpe: Add support for GHS"
Linux Build Service Account [Thu, 10 May 2018 18:33:45 +0000 (11:33 -0700)]
Merge "soc: qcom: hab: hold the message when the read buffer is smaller"
Timothy Sham [Fri, 27 Apr 2018 16:38:15 +0000 (12:38 -0400)]
ARM: dts: msm: support msm-pcm-dtmf on msm8996 adsp/cdp
Add msm-pcm-dtmf DAI for sound cards on msm8996
automotive ADP/CDP platforms.
Change-Id: I5015536ec7293892bb1da4547b2ea90b20d93123
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
Linux Build Service Account [Thu, 10 May 2018 08:25:18 +0000 (01:25 -0700)]
Merge "Merge android-4.4.131 (
d5d6526) into msm-4.4"
Linux Build Service Account [Wed, 9 May 2018 20:54:15 +0000 (13:54 -0700)]
Merge "diag: Add new WLAN_RSN event id"
Linux Build Service Account [Wed, 9 May 2018 12:09:47 +0000 (05:09 -0700)]
Merge "drm: msm: improve early splash mechanism"
Yong Ding [Mon, 23 Apr 2018 11:04:39 +0000 (19:04 +0800)]
soc: qcom: hab: hold the message when the read buffer is smaller
If the receive buffer in habmm_socket_recv() is smaller
than the message, it should be kept in the queue rather
than dropped.
Change-Id: Iabc1f73e5b443cc7ebdefc3961d5bec9049a265f
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Manoj Prabhu B [Fri, 4 May 2018 09:05:11 +0000 (14:35 +0530)]
diag: Add new WLAN_RSN event id
The patch adds new WLAN_RSN_INFO event as latest ID.
Change-Id: Ic76506632ea0aa61c79c52824556b6aaeb0b04e6
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Timothy Sham [Thu, 3 May 2018 15:45:54 +0000 (11:45 -0400)]
ASoC: msm: qdsp6v2: increase max Rx DTMF duration
Increase the maximum value of the DTMF Rx Generate
mixer command and change the read to int16 to allow
for clients to be able to set '-1', infinite tone.
Change-Id: I44eed4712bb05a70b4464d9db38c348c131a3f61
Signed-off-by: Timothy Sham <tsham@codeaurora.org>
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"
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"
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"
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"
Linux Build Service Account [Tue, 8 May 2018 20:45:56 +0000 (13:45 -0700)]
Merge "ion: Consider ion pool pages as indirectly reclaimable"
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"
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"
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"
Linux Build Service Account [Tue, 8 May 2018 20:45:52 +0000 (13:45 -0700)]
Merge "diag: Add new Diag IDs"
Linux Build Service Account [Tue, 8 May 2018 20:45:51 +0000 (13:45 -0700)]
Merge "input: touchscreen: synaptics_dsx: Fix buffer overflow"
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>
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>
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>
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"
Linux Build Service Account [Tue, 8 May 2018 11:21:29 +0000 (04:21 -0700)]
Merge "defconfig: msm: add bluetooth related defconfigs 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"
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>
Yong Ding [Tue, 8 May 2018 09:38:59 +0000 (17:38 +0800)]
ARM: dts: msm: add HAB physical channels for msm8996 baseline vplatform
MISC, QCPE and FDE physical channels are added for msm8996
baseline vplatform for test and security use cases.
Change-Id: I1ba984bf65b9aab8cf56f024a24494498b701fca
Signed-off-by: Yong Ding <yongding@codeaurora.org>
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>
Amit Blay [Thu, 3 May 2018 13:10:40 +0000 (16:10 +0300)]
soc: qcom: scm_qcpe: Add support for GHS
Add support for GHS
Change-Id: I454ee5e9c643b6521ae5072bb461b7c43bbe9dcc
Signed-off-by: Amit Blay <ablay@codeaurora.org>
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>
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>
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>
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>
Linux Build Service Account [Tue, 8 May 2018 02:23:43 +0000 (19:23 -0700)]
Merge "irqchip: gic: print correct resume irq name"
Linux Build Service Account [Tue, 8 May 2018 02:23:40 +0000 (19:23 -0700)]
Merge "mm: introduce NR_INDIRECTLY_RECLAIMABLE_BYTES"
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"
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>
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>
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"
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)"
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>
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"
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"
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"
Linux Build Service Account [Sun, 6 May 2018 09:07:09 +0000 (02:07 -0700)]
Merge "ASoC: msm: qdsp6v2: enable DMA channel control"
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"
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>
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>
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>
Ajay Agarwal [Fri, 4 May 2018 04:17:55 +0000 (09:47 +0530)]
Revert "sound: usb: Update QMI indication message"
This reverts commit
97097e761698edaa04f20df80c825ad288feabf0.
Remote QMI client does not require controller number. Delete the
support from uaudio_disconnect_cb() to send usb core id. Also
remove USB_AUDIO_DEVICE_SPEED_SUPER_PLUS_V01 from speed enum.
Change-Id: Ie000a0497d714eab361a8c30d68289e2f5c884e8
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
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>
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>
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>
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"
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"
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>
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>
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>
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()"
Srinivasarao P [Thu, 3 May 2018 10:22:09 +0000 (15:52 +0530)]
Merge android-4.4.131 (
d5d6526) into msm-4.4
* refs/heads/tmp-
d5d6526
Linux 4.4.131
serial: mctrl_gpio: Add missing module license
serial: mctrl_gpio: export mctrl_gpio_disable_ms and mctrl_gpio_init
x86/smpboot: Don't use mwait_play_dead() on AMD systems
x86/ipc: Fix x32 version of shmid64_ds and msqid64_ds
libceph: validate con->state at the top of try_write()
ASoC: fsl_esai: Fix divisor calculation failure at lower ratio
ARM: amba: Don't read past the end of sysfs "driver_override" buffer
ARM: amba: Fix race condition with driver_override
ARM: amba: Make driver_override output consistent with other buses
scsi: sd: Defer spinning up drive while SANITIZE is in progress
kobject: don't use WARN for registration failures
mtd: cfi: cmdset_0002: Do not allow read/write to suspend erase block.
mtd: cfi: cmdset_0001: Workaround Micron Erase suspend bug.
mtd: cfi: cmdset_0001: Do not allow read/write to suspend erase block.
ALSA: hda/realtek - Add some fixes for ALC233
ALSA: hda: Hardening for potential Spectre v1
ALSA: seq: oss: Hardening for potential Spectre v1
ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
ALSA: core: Report audio_tstamp in snd_pcm_sync_ptr
ALSA: control: Hardening for potential Spectre v1
ALSA: rme9652: Hardening for potential Spectre v1
ALSA: hdspm: Hardening for potential Spectre v1
ALSA: asihpi: Hardening for potential Spectre v1
ALSA: opl3: Hardening for potential Spectre v1
tty: Use __GFP_NOFAIL for tty_ldisc_get()
tty: n_gsm: Fix DLCI handling for ADM mode if debug & 2 is not set
tty: n_gsm: Fix long delays with control frame timeouts in ADM mode
tty: Don't call panic() at tty_ldisc_init()
drm/virtio: fix vq wait_event condition
virtio_console: free buffers after reset
virtio: add ability to iterate over vqs
ALSA: usb-audio: Skip broken EU on Dell dock USB-audio
USB: Increment wakeup count on remote wakeup.
usb: core: Add quirk for HP v222w 16GB Mini
USB: serial: cp210x: add ID for NI USB serial console
USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster
USB: serial: simple: add libtransistor console
usbip: vhci_hcd: Fix usb device and sockfd leaks
usbip: usbip_host: fix to hold parent lock for device_attach() calls
ext4: fix bitmap position validation
ext4: add validity checks for bitmap block numbers
ext4: set h_journal if there is a failure starting a reserved handle
ext4: prevent right-shifting extents beyond EXT_MAX_BLOCKS
goldfish: pipe: ANDROID: Allocate memory with GFP_KERNEL.
goldfish: pipe: ANDROID: Do not crash
goldfish: pipe: ANDROID: remove redundant casting
goldfish: pipe: ANDROID: Add 'pipe' to pipe functions
goldfish: pipe: ANDROID: fix whitespace
goldfish: pipe: ANDROID: rename global variables
goldfish: pipe: ANDROID: remove a redundant target
goldfish: pipe: ANDROID: add blank lines
goldfish: pipe: ANDROID: replace 'BUG_ON' with 'BUILD_BUG_ON'
goldfish: pipe: ANDROID: use the 'BIT' macro for wakeup flags
goldfish: pipe: ANDROID: fix logging format strings
Linux 4.4.130
s390/uprobes: implement arch_uretprobe_is_alive()
s390/cio: update chpid descriptor after resource accessibility event
cdrom: information leak in cdrom_ioctl_media_changed()
scsi: mptsas: Disable WRITE SAME
ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
net: af_packet: fix race in PACKET_{R|T}X_RING
tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
net: fix deadlock while clearing neighbor proxy table
tipc: add policy for TIPC_NLA_NET_ADDR
llc: fix NULL pointer deref for SOCK_ZAPPED
llc: hold llc_sap before release_sock()
sctp: do not check port in sctp_inet6_cmp_addr
vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
pppoe: check sockaddr length in pppoe_connect()
packet: fix bitfield update race
team: fix netconsole setup over team
team: avoid adding twice the same option to the event list
tcp: don't read out-of-bounds opsize
llc: delete timers synchronously in llc_sk_free()
net: validate attribute sizes in neigh_dump_table()
l2tp: check sockaddr length in pppol2tp_connect()
KEYS: DNS: limit the length of option strings
bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
s390: correct module section names for expoline code revert
s390: correct nospec auto detection init order
s390: add sysfs attributes for spectre
s390: report spectre mitigation via syslog
s390: add automatic detection of the spectre defense
s390: move nobp parameter functions to nospec-branch.c
s390/entry.S: fix spurious zeroing of r0
s390: do not bypass BPENTER for interrupt system calls
s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
s390: introduce execute-trampolines for branches
s390: run user space and KVM guests with modified branch prediction
s390: add options to change branch prediction behaviour for the kernel
s390/alternative: use a copy of the facility bit mask
s390: add optimized array_index_mask_nospec
s390: scrub registers on kernel entry and KVM exit
KVM: s390: wire up bpb feature
s390: enable CPU alternatives unconditionally
s390: introduce CPU alternatives
Revert "ath10k: send (re)assoc peer command when NSS changed"
jbd2: fix use after free in kjournald2()
ath9k_hw: check if the chip failed to wake up
Input: drv260x - fix initializing overdrive voltage
r8152: add Linksys USB3GIGV1 id
staging: ion : Donnot wakeup kswapd in ion system alloc
perf: Return proper values for user stack errors
x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
cifs: do not allow creating sockets except with SMB1 posix exensions
UPSTREAM: tracing: always define trace_{irq,preempt}_{enable_disable}
ANDROID: staging: ion: Obey kptr_restrict
ANDROID: sdcardfs: Set s_root to NULL after putting
ANDROID: sdcardfs: d_make_root calls iput
ANDROID: sdcardfs: Check for private data earlier
Conflicts:
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_cma_heap.c
drivers/staging/android/ion/ion_system_heap.c
Change-Id: I8155103b3787bb800f85291cc7378a8e29a8436f
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
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"
Linux Build Service Account [Thu, 3 May 2018 09:07:34 +0000 (02:07 -0700)]
Merge "gpio: No NULL owner"
Linux Build Service Account [Thu, 3 May 2018 09:07:28 +0000 (02:07 -0700)]
Merge "defconfig: Enable preemptirq tracing for msm8998 and sdm660"
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>
Gerrit - the friendly Code Review server [Thu, 3 May 2018 07:33:44 +0000 (00:33 -0700)]
Merge changes into msm-4.4
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>
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>
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>
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>
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>
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>
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"