OSDN Git Service
Linux Build Service Account [Thu, 4 May 2017 15:45:26 +0000 (08:45 -0700)]
Merge "ion:synchronize debugfs callback and ion_client_destroy"
Linux Build Service Account [Thu, 4 May 2017 15:45:25 +0000 (08:45 -0700)]
Merge "btfm: Program multi channel registers in wcn3990 for Tx/Rx"
Linux Build Service Account [Thu, 4 May 2017 15:45:24 +0000 (08:45 -0700)]
Merge "regulator: onsemi-ncp6335d: Add is_enabled API support"
Linux Build Service Account [Thu, 4 May 2017 15:45:23 +0000 (08:45 -0700)]
Merge "drm/msm: Fix the SNAPSHOT_HEADER macro"
Linux Build Service Account [Thu, 4 May 2017 15:45:22 +0000 (08:45 -0700)]
Merge "fs/mbcache: fix use after free issue in mb_cache_shrink_scan()"
Linux Build Service Account [Thu, 4 May 2017 15:45:21 +0000 (08:45 -0700)]
Merge "ARM: dts: msm: Add batt_therm coefficients for QRD SDM660/630"
Linux Build Service Account [Thu, 4 May 2017 15:45:19 +0000 (08:45 -0700)]
Merge "qbt1000: Initialize drvdata structure before usage"
Linux Build Service Account [Thu, 4 May 2017 15:45:18 +0000 (08:45 -0700)]
Merge "qbt1000: Validate FP app name before qseecom_start_app"
Linux Build Service Account [Thu, 4 May 2017 15:45:11 +0000 (08:45 -0700)]
Merge "msm: mdss: Add plane_count range check in mdss WFD"
Linux Build Service Account [Thu, 4 May 2017 15:45:10 +0000 (08:45 -0700)]
Merge "msm: mdss: Add plane_count limit check for mdss_rotator buffer"
Linux Build Service Account [Thu, 4 May 2017 15:45:09 +0000 (08:45 -0700)]
Merge "ARM: dts: msm: enable SMMU stage1 for 11AD devices on msm8998"
Linux Build Service Account [Thu, 4 May 2017 15:45:08 +0000 (08:45 -0700)]
Merge "ASoC: msm: qdsp6v2: Add routing controls for fm over mi2s"
Linux Build Service Account [Thu, 4 May 2017 15:45:07 +0000 (08:45 -0700)]
Merge "ASoC: sdm660_cdc: Avoid unclocked register access to digital codec"
Linux Build Service Account [Thu, 4 May 2017 15:45:06 +0000 (08:45 -0700)]
Merge "msm: ipa3: configure WLAN resource group on connect"
Satish Kodishala [Mon, 1 May 2017 13:47:06 +0000 (19:17 +0530)]
btfm: Program multi channel registers in wcn3990 for Tx/Rx
For A2DP/SCO Rx, SCO/FM Tx use cases, we need to program
multi channel registers. Without this there would be
glitches and random silence during A2DP playback.
While at it, add the function name to the debug print macro.
CRs-Fixed:
2027268
Change-Id: Ia8e5fde48bb94e97346fe323e92dc32ed60b0e65
Signed-off-by: Satish Kodishala <skodisha@codeaurora.org>
Neil Zhang [Tue, 26 Jan 2016 09:39:06 +0000 (17:39 +0800)]
ion:synchronize debugfs callback and ion_client_destroy
There are race condition B/T ion_client_destroy and debugfs callbacks.
Let's use a mutex to synchronize them.
Change-Id: I3373dc1dbb551b615105a485cc2d3c4bcc0e5e99
Signed-off-by: Neil Zhang <neilzhang1123@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit:
948c4db4ee10d85fe78ed3755dcaeb85cd37a148
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[guptap@codeaurora.org: resolve trivial merge conflicts and
change usage of %p with %pK]
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
Prakash Gupta [Fri, 28 Apr 2017 13:18:15 +0000 (18:48 +0530)]
ion: revert downstream fix for debugfs synchronization
revert msm specific changes conflicting with commit I3373dc1dbb5
("ion:synchronize debugfs callback and ion_client_destroy")
- revert commit I7bc7562400d ("ion: destroy ion handles under
client->lock")
- revert commit Ic4c2f9dff90 ("ion: validate ion client in
ion_debug_client_show() and extract data")
- revert dev->lock usage in ion_debug_heap_show.
Change-Id: Iba5f527b57f39d628b8cd833f627481cc56f6617
Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
Kiran Gunda [Wed, 3 May 2017 06:41:20 +0000 (12:11 +0530)]
regulator: onsemi-ncp6335d: Add is_enabled API support
Without is_enabled function support, regualtor framework treats
it as an always on regulator and does not invoke the regulator enable
function call. Hence, add support for it.
Also, define a parent supply ("vin") for the regulator. This parent
can be used to pin-control the regulator. While at it, change the initcall
level to subsys_init. so that the driver registers after the parent supply
("vin" - provided by fixed-regualtor).
Change-Id: I93e870d2e4b89f7874c3e17be91bc417dadf1777
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Linux Build Service Account [Thu, 4 May 2017 06:32:11 +0000 (23:32 -0700)]
Merge "drm/msm: Add preemption records to QTI GPU snapshot"
Linux Build Service Account [Thu, 4 May 2017 06:32:10 +0000 (23:32 -0700)]
Merge "msm: camera: ispif: extend interface with line width"
Linux Build Service Account [Thu, 4 May 2017 06:32:09 +0000 (23:32 -0700)]
Merge "msm: camera: Allow driver file to be opend only once."
Linux Build Service Account [Thu, 4 May 2017 06:32:07 +0000 (23:32 -0700)]
Merge "msm: camera2: cpp: Fix out-of-bounds frame or command buffer access"
Linux Build Service Account [Thu, 4 May 2017 06:32:06 +0000 (23:32 -0700)]
Merge "iommu/iommu-debug: Add validation support for per-buffer coherent mappings"
Linux Build Service Account [Thu, 4 May 2017 06:31:51 +0000 (23:31 -0700)]
Merge "Revert "smb138x: introduce support for smb1355""
Linux Build Service Account [Thu, 4 May 2017 06:31:50 +0000 (23:31 -0700)]
Merge "Revert "smb138x: use chg src bit to disable parallel charger""
Linux Build Service Account [Thu, 4 May 2017 06:31:49 +0000 (23:31 -0700)]
Merge "Merge branch 'android-4.4@
e4528dd' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 4 May 2017 06:31:47 +0000 (23:31 -0700)]
Merge "defconfigs: Sync up defconfigs"
Linux Build Service Account [Thu, 4 May 2017 06:31:45 +0000 (23:31 -0700)]
Merge "soc: qcom: minidump: move elf global variables to structure"
Linux Build Service Account [Thu, 4 May 2017 06:31:44 +0000 (23:31 -0700)]
Merge "soc: qcom: minidump: update error message log level"
Linux Build Service Account [Thu, 4 May 2017 06:31:13 +0000 (23:31 -0700)]
Merge "icnss: Initialize the structure member properly"
Linux Build Service Account [Thu, 4 May 2017 06:31:08 +0000 (23:31 -0700)]
Merge "regulator: onsemi-ncp6335d: Fix compilation issues"
Linux Build Service Account [Thu, 4 May 2017 06:31:07 +0000 (23:31 -0700)]
Merge "profiler: Reorder the bandwidth counter structure"
Abir Ghosh [Tue, 11 Apr 2017 04:40:23 +0000 (10:10 +0530)]
qbt1000: Initialize drvdata structure before usage
Fix uninitialized local variable error which might have lead to
crash.
CRs-Fixed:
2030137
Change-Id: I3fd95cb343c3175e4190c8ebfe209399db0602a6
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
Abir Ghosh [Tue, 11 Apr 2017 04:31:15 +0000 (10:01 +0530)]
qbt1000: Terminate fingerprint TA name with null
Terminate the string, coming from userspace and containing the name
of fingerprint trusted app, with null character, to make sure kernel
memory does not leak into logs
Change-Id: I1668a64fcb6747ce3ef3b1ee6321fa5fa4a1798a
CRs-Fixed:
2029409
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
Abir Ghosh [Tue, 2 May 2017 17:11:06 +0000 (22:41 +0530)]
qbt1000: Validate FP app name before qseecom_start_app
Validate the name of the client app before passing it to
qseecom_start_app.
CRs-Fixed:
2006695
Change-Id: I9c6b16050d4f6fc94827021c7b0f2ab292452f60
Signed-off-by: Abir Ghosh <abirg@codeaurora.org>
Sahitya Tummala [Wed, 19 Apr 2017 06:20:03 +0000 (11:50 +0530)]
fs/mbcache: fix use after free issue in mb_cache_shrink_scan()
Fix the below potential race between these two contexts -
mb_cache_entry_get() and mb_cache_shrink_scan(), which results
into use after free issue.
task a:
mb_cache_shrink_scan()
|--if(!list_empty(&mb_cache_lru_list))
|--get the ce entry
|--list_del_init(&ce->e_lru_list);
|--check ce->e_used, ce->e_queued,
ce->e_refcnt and continue
-> gets prempted here
task b:
ext4_xattr_release_block()
|--mb_cache_entry_get()
|--get ce from hlist_bl_for_each_entry()
|--increment ce->e_used and
list_del_init(&ce->e_lru_list)
|--mb_cache_entry_free()
|--hlist_bl_lock(ce->e_block_hash_p);
-> results into use after free
Also, fix similar potential race between mb_cache_entry_alloc() and
mb_cache_entry_get() in case if cache->c_max_entries is reached.
Change-Id: I01049bae5d914cfb8494ab299ec2e068745d1110
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Yingwei Zhao [Tue, 25 Apr 2017 07:43:25 +0000 (15:43 +0800)]
ARM: dts: msm: Add batt_therm coefficients for QRD SDM660/630
Configure battery thermal coefficients for QRD660/630 to make sure the
device could read the correct battery temperatures.
CRs-Fixed:
2038922
Change-Id: I21d0eedfec0a0529d8864d11b703659f4ba43b6a
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
Abhijeet Dharmapurikar [Wed, 3 May 2017 01:05:48 +0000 (18:05 -0700)]
Revert "smb138x: introduce support for smb1355"
This reverts commit
566b44214cc08786375ac8266ee387e431413078 (smb138x:
introduce support for smb1355).
This is not required since smb1355 support is moved to its own driver.
Change-Id: Ibad8595c09a865e273adb6f30d6a75f931220131
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Wed, 3 May 2017 01:04:54 +0000 (18:04 -0700)]
Revert "smb138x: use chg src bit to disable parallel charger"
This reverts commit
0f0e36134d8a1082f099d543a122cd10d777beda ("smb138x:
use chg src bit to disable parallel charger)
This is not required, since smb1355 support is moved to its own driver.
Change-Id: I1bd454030d29195f03be132d167ec8294169b9d5
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Tue, 2 May 2017 03:00:25 +0000 (20:00 -0700)]
qpnp-smb2: Support faking input current limited state
Support faking input current limited state. This is very helpful
in testing/debugging the software based vbus changing algorithms.
Change-Id: I7cf548c94397ee680c9d65343c49ec7b16873e88
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Fenglin Wu [Tue, 25 Apr 2017 13:45:08 +0000 (21:45 +0800)]
power: qcom: smb2: Add REAL_TYPE property for usb power_supply
Add POWER_SUPPLY_PROP_REAL_TYPE property for usb_psy to present its real
charger type. POWER_SUPPLY_PROP_TYPE in usb_psy is always set to
POWER_SUPPLY_TYPE_USB_PD for healthd to recognize it as an AC charger.
Also add usb_port_psy with POWER_SUPPLY_TYPE_USB type is added for healthd
to recognize it as an USB host. Their ONLINE properties will be updated
according to the VBUS status, type-c mode and real charger type.
With this type being set statically, update the usb phy and pd policy
engine code to look at real type.
Change-Id: I90aa69325cc82b09dfb513c0eeecbc61e092a57f
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Lingutla Chandrasekhar [Tue, 25 Apr 2017 15:36:56 +0000 (21:06 +0530)]
soc: qcom: minidump: move elf global variables to structure
Current driver implementation uses global variables to create
minidump elf header.
Move all elf global variables into a structure, and also replace
'msm_minidump_enabled' API with 'minidump_enabled' global variable.
And also add minidump_table address in elf, which would be useful
for parsers to get memory dump table addresses without vmlinux symbols.
Change-Id: I8829d88ce234179f429ae9537a3582df794c2cdf
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Lingutla Chandrasekhar [Wed, 3 May 2017 09:22:45 +0000 (14:52 +0530)]
soc: qcom: minidump: fix logic checks in elf traversals
Fix logical checks in minidump elf traversal functions.
Change-Id: I649fc9ae66d616982a61f71f66f2abe378212660
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Lingutla Chandrasekhar [Tue, 25 Apr 2017 15:12:10 +0000 (20:42 +0530)]
soc: qcom: minidump: update error message log level
Current implementation uses pr_info to print error messages.
Update driver prints log level with pr_err instead of
pr_info, and also update with proper error number for
minidump table update failure return.
Change-Id: I27667715c71b361b9ee0f7856c94242d3ca21014
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Stephen Boyd [Fri, 28 Apr 2017 19:09:45 +0000 (12:09 -0700)]
defconfigs: Sync up defconfigs
We recently renamed CONFIG_UID_CPUTIME, but didn't update all the
defconfigs.
Change-Id: Ic52f904d6ada3d0e32a8278ec95f7b34b29f96b9
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Laxminath Kasam [Tue, 18 Apr 2017 09:17:56 +0000 (14:47 +0530)]
ASoC: msm: qdsp6v2: Add routing controls for fm over mi2s
When routing FM over MI2S, add support for required
port mixer controls.
CRs-Fixed:
2034932
Change-Id: I04e08ae8f876fe08390b3dae96d4522c2546fb32
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
Laxminath Kasam [Tue, 11 Apr 2017 09:21:30 +0000 (14:51 +0530)]
ASoC: sdm660_cdc: Avoid unclocked register access to digital codec
In particular SSR scenario, digital codec access happens without
clock enabled. While SSR down event notification in progress,
APR driver blocks request to DSP to enable clock since APR already
received down event. regmap access to digital codec register results in
AHB timeout error. If DSP clock enable request fails, set the regmap
access cache only mode to avoid any register access.
CRs-Fixed:
2034468
Change-Id: Id1141339d2673920167ed7ac74b13b6fee05173f
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
Linux Build Service Account [Wed, 3 May 2017 10:42:43 +0000 (03:42 -0700)]
Merge "net: wireless: Update regdb for 60G band"
Linux Build Service Account [Wed, 3 May 2017 10:42:41 +0000 (03:42 -0700)]
Merge "mmc: core: Use mmc_reset instead of power_restore"
Linux Build Service Account [Wed, 3 May 2017 10:42:41 +0000 (03:42 -0700)]
Merge "mmc: core: Do regular power cycle when lacking eMMC HW reset support"
Linux Build Service Account [Wed, 3 May 2017 10:42:40 +0000 (03:42 -0700)]
Merge "ASoC: sdm660_cdc: Update volatile register set for cache bypass"
Linux Build Service Account [Wed, 3 May 2017 10:42:39 +0000 (03:42 -0700)]
Merge "ASoC: msm: qdspv2: add result check when audio process fail"
Linux Build Service Account [Wed, 3 May 2017 10:42:38 +0000 (03:42 -0700)]
Merge "defconfig: msm8998: Enable MHI related drivers"
Linux Build Service Account [Wed, 3 May 2017 10:42:37 +0000 (03:42 -0700)]
Merge "tty: serial: msm: Move request_irq to the end of startup"
Kiran Gunda [Wed, 3 May 2017 06:05:28 +0000 (11:35 +0530)]
regulator: onsemi-ncp6335d: Fix compilation issues
Fix the compilation issue seen due to the regulator framework
changes from 3.10 to 4.4 kernel. Also remove the redundant error
messages during the memory allocation failures.
Change-Id: I4887c2d3acaff562fb41e6c2eaeb2c1ef2c1bde5
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Lingutla Chandrasekhar [Mon, 1 May 2017 08:40:21 +0000 (14:10 +0530)]
defconfig: msm: perf: disable cache dumps support
During Mini dump collection, cache dump needs extra memory
and time hence disable it in perf builds.
Change-Id: I68aae6edf676c27b8443fdcc88ece05fa3a26748
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Hardik Kantilal Patel [Wed, 3 May 2017 08:31:16 +0000 (14:01 +0530)]
icnss: Initialize the structure member properly
After cold boot calibration WLAN FW send pin connect result to
platform driver through qmi indication message. To avoid uninitialized
access of pin connect result structure member initialize it properly.
CRs-Fixed:
2042000
Change-Id: I5654583e890f9ee67ddcc632aecd9ecb8a160062
Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
Maya Erez [Wed, 3 May 2017 08:36:41 +0000 (11:36 +0300)]
ARM: dts: msm: enable SMMU stage1 for 11AD devices on msm8998
Set smmu-s1-en to enable SMMU stage1.
This change also sets SMMU base address and size, required when
SMMU stage1 is enabled.
Change-Id: I30f4528c665c7623cb56de0773a0a3da2b4c21bf
Signed-off-by: Maya Erez <merez@codeaurora.org>
Sharat Masetty [Wed, 3 May 2017 07:44:51 +0000 (13:14 +0530)]
drm/msm: Fix the SNAPSHOT_HEADER macro
The "_header" field of the macro was being incorrectly expanded to just
"header". This was only working because all the functions which used this
macro already had "header" defined in scope.
Change-Id: I19e77ae78cfff471ddffd428cb3fd055c6340737
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
Sharat Masetty [Mon, 1 May 2017 06:45:22 +0000 (12:15 +0530)]
drm/msm: Add preemption records to QTI GPU snapshot
This patch helps dump the full 64k per ring preemption
record to GPU snapshot which is collected during GPU
recovery step. We use the general object snapshot section
type to store these records and we only collect the preemption
records if preemption was going to kick in, which is when
the number of rings is greater than one.
Change-Id: I1872bc14c6b39c8c4963ce9c98e96b03cbfec907
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
Sayali Lokhande [Mon, 24 Apr 2017 08:10:50 +0000 (13:40 +0530)]
mmc: core: Use mmc_reset instead of power_restore
On 4.4 kernel, 'commit
364549ddc29d ("mmc: core: Remove
redundant ->power_restore() callback for MMC")' removed
power_restore callback for MMC since mmc_reset is
implemented. Hence use reset instead of power_restore in
mmc_cmdq_hw_reset. Also modify the caller function mmc_cmdq_hw_reset
to properly use the mmc_reset.
Change-Id: Ia06d579401b6a083b164dff7a253d1eb3caef1a3
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Gwendal Grignou [Fri, 1 Apr 2016 23:04:22 +0000 (16:04 -0700)]
mmc: core: Do regular power cycle when lacking eMMC HW reset support
The eMMC HW reset may be implemented either via the host ops ->hw_reset()
callback or through DT and the eMMC pwrseq. Additionally some eMMC cards
don't support HW reset.
To allow a reset to be done for the different combinations of mmc hosts
and eMMC/MMC cards, let's implement a fallback via trying a regular power
cycle. This improves the mmc block layer retry mechanism of failing I/O
requests.
Change-Id: I5cafd54327cde22ea9599543382f1b294272a42c
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
[Ulf: Rewrote changelog]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Git-commit:
4e6c71788d6bb0e5438fc9211fa6e52dcca01474
Git-repo: git://git.linaro.org/people/ulf.hansson/mmc.git
[vviswana@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Anirudh Ghayal [Tue, 2 May 2017 10:45:27 +0000 (16:15 +0530)]
drivers: regulator: Add snapshot of OnSemi NCP6335D regulator
This is snapshot of the OnSemi NCP6335D driver as of msm-3.10
'commit
156ba1726643 ("regulator: onsemi-ncp6335d: Add i2c retry logic")'.
Change-Id: I4cf0acd272fcf498462d4397385cd62f144eadf8
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Linux Build Service Account [Wed, 3 May 2017 02:30:29 +0000 (19:30 -0700)]
Merge "tty: serial: msm: fix potential race b/w startup and irq handling"
Linux Build Service Account [Wed, 3 May 2017 02:30:28 +0000 (19:30 -0700)]
Merge "msm: ipa3: fix a race condition on clock vote from suspend"
Linux Build Service Account [Wed, 3 May 2017 02:30:27 +0000 (19:30 -0700)]
Merge "fs: ecryptfs: Cache to be cleared after file write"
Linux Build Service Account [Wed, 3 May 2017 02:30:26 +0000 (19:30 -0700)]
Merge "msm: ipa: Add mutext protection when updating notify req cache"
Linux Build Service Account [Wed, 3 May 2017 02:30:19 +0000 (19:30 -0700)]
Merge "msm: camera: Fix NULL pointer dereference in msm_vb2.c."
Sujeev Dias [Tue, 2 May 2017 23:12:20 +0000 (16:12 -0700)]
defconfig: msm8998: Enable MHI related drivers
MHI host and related drivers provide communication between
host and external modem. Enable it.
CRs-Fixed:
2041725
Change-Id: I1fbdfa7f17d158c1b6a33eb14497add495454bd1
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
Sudarshan Rajagopalan [Wed, 5 Apr 2017 02:10:06 +0000 (19:10 -0700)]
iommu/iommu-debug: Add validation support for per-buffer coherent mappings
Added new debugfs files/nodes to perform basic validation of the
per-buffer IO coherent dma-mapping that was recently implemented.
Also, added a node to print out the PTE for a given IOVA.
Nodes added:
dma_attach
dma_map
dma_unmap
dma_atos
virt_addr
pte
Change-Id: I041ab5f4e37e50dd3f58e2def3fdd3125a60629c
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
Linux Build Service Account [Tue, 2 May 2017 16:07:43 +0000 (09:07 -0700)]
Merge "ASoC: msm: qdsp6v2: Clear pass-through mode on routing close"
Linux Build Service Account [Tue, 2 May 2017 16:07:42 +0000 (09:07 -0700)]
Merge "ASoC: msm-lsm-client: use kzalloc instead of kmalloc"
Linux Build Service Account [Tue, 2 May 2017 16:07:41 +0000 (09:07 -0700)]
Merge "icnss: remove pre-alloc memory leak check in platform driver"
Linux Build Service Account [Tue, 2 May 2017 16:07:40 +0000 (09:07 -0700)]
Merge "Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4"
Linux Build Service Account [Tue, 2 May 2017 16:07:38 +0000 (09:07 -0700)]
Merge "input: synaptics: fix for buggy code poined by SIL tool"
Linux Build Service Account [Tue, 2 May 2017 16:07:37 +0000 (09:07 -0700)]
Merge "usb: gadget: MIDI: Add support for SuperSpeed enumeration"
Linux Build Service Account [Tue, 2 May 2017 16:07:36 +0000 (09:07 -0700)]
Merge "diag: Open glink channels in workqueue context"
Linux Build Service Account [Tue, 2 May 2017 16:07:35 +0000 (09:07 -0700)]
Merge "clk: Add support to dump state of all clocks into ftrace"
Linux Build Service Account [Tue, 2 May 2017 16:07:35 +0000 (09:07 -0700)]
Merge "SDM660: ADSPRPC: Align the size of IOVA to 128MB"
Linux Build Service Account [Tue, 2 May 2017 16:07:32 +0000 (09:07 -0700)]
Merge "esoc: mdm-4x: Separate out callback function for 9x45"
Linux Build Service Account [Tue, 2 May 2017 16:07:32 +0000 (09:07 -0700)]
Merge "ARM: dts: msm: Add support mdm9x45 external modem"
Linux Build Service Account [Tue, 2 May 2017 16:07:31 +0000 (09:07 -0700)]
Merge "esoc: Add provision to handle shutdown request in userspace"
Linux Build Service Account [Tue, 2 May 2017 16:07:30 +0000 (09:07 -0700)]
Merge "soc: qcom: ssr: Add option to relax on ssr failures"
Linux Build Service Account [Tue, 2 May 2017 16:07:18 +0000 (09:07 -0700)]
Merge "msm/drm: Move msm_drm_config configuration into the GPUs"
Blagovest Kolenichev [Tue, 2 May 2017 13:15:44 +0000 (06:15 -0700)]
Merge branch 'android-4.4@
e4528dd' into branch 'msm-4.4'
* refs/heads/tmp-
e4528dd:
Linux 4.4.65
perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race
ping: implement proper locking
staging/android/ion : fix a race condition in the ion driver
vfio/pci: Fix integer overflows, bitmask check
tipc: check minimum bearer MTU
netfilter: nfnetlink: correctly validate length of batch messages
xc2028: avoid use after free
mnt: Add a per mount namespace limit on the number of mounts
tipc: fix socket timer deadlock
tipc: fix random link resets while adding a second bearer
gfs2: avoid uninitialized variable warning
hostap: avoid uninitialized variable use in hfa384x_get_rid
tty: nozomi: avoid a harmless gcc warning
tipc: correct error in node fsm
tipc: re-enable compensation for socket receive buffer double counting
tipc: make dist queue pernet
tipc: make sure IPv6 header fits in skb headroom
ANDROID: uid_sys_stats: fix access of task_uid(task)
BACKPORT: f2fs: sanity check log_blocks_per_seg
Linux 4.4.64
tipc: fix crash during node removal
block: fix del_gendisk() vs blkdev_ioctl crash
x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions
hv: don't reset hv_context.tsc_page on crash
Drivers: hv: balloon: account for gaps in hot add regions
Drivers: hv: balloon: keep track of where ha_region starts
Tools: hv: kvp: ensure kvp device fd is closed on exec
kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd
x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs
powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
ubi/upd: Always flush after prepared for an update
mac80211: reject ToDS broadcast data frames
mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card
ACPI / power: Avoid maybe-uninitialized warning
Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled
VSOCK: Detach QP check should filter out non matching QPs.
Drivers: hv: vmbus: Reduce the delay between retries in vmbus_post_msg()
Drivers: hv: get rid of timeout in vmbus_open()
Drivers: hv: don't leak memory in vmbus_establish_gpadl()
s390/mm: fix CMMA vs KSM vs others
CIFS: remove bad_network_name flag
cifs: Do not send echoes before Negotiate is complete
ring-buffer: Have ring_buffer_iter_empty() return true when empty
tracing: Allocate the snapshot buffer before enabling probe
KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
KEYS: Change the name of the dead type to ".dead" to prevent user access
KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings
ANDROID: sdcardfs: Call lower fs's revalidate
ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges
ANDROID: sdcardfs: Copy meta-data from lower inode
Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs""
ANDROID: sdcardfs: Use filesystem specific hash
ANDROID: AVB error handler to invalidate vbmeta partition.
ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.
Revert "[RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"
Conflicts:
drivers/md/Makefile
Change-Id: I8f5ed53cb8b6cc66914f10c6ac820003b87b8759
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Neeraj Upadhyay [Wed, 26 Apr 2017 05:07:15 +0000 (10:37 +0530)]
tty: serial: msm: fix potential race b/w startup and irq handling
There is a potential race for tx/rx dma requests between
msm_startup() and irq handling, for cases where dmas are not
available. This results in irq path trying to do dma mapping,
resulting in data abort. For example, consider below scenario
where rx handler reads the intermediate value of dma->chan,
set in msm_request_rx_dma(), and tries to do dma mapping,
which results in data abort.
uart_port_startup()
msm_startup()
request_irq()
...
msm_request_rx_dma()
...
dma->chan = dma_request_slave_channel_reason(dev, "rx");
<UART RX IRQ>
msm_uart_irq()
msm_handle_rx_dm()
msm_start_rx_dma()
dma->desc = dma_map_single()
<data abort>
Change-Id: Icf5d48f2718c3c6a855ffd3d10988a93f8281d78
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Neeraj Soni [Tue, 2 May 2017 10:02:48 +0000 (15:32 +0530)]
fs: ecryptfs: Cache to be cleared after file write
This ensures that caches are maintained and no stale
data is present.
Change-Id: Ie8e92197a5a4179d422a523d3d6dad48bdf0b5d2
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
Andrew Chant [Fri, 31 Mar 2017 10:03:48 +0000 (15:33 +0530)]
input: synaptics: fix for buggy code poined by SIL tool
Place file offset validity checks under mutex for
synaptics_dsx_rmi_dev.c touch driver.
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit:
e1fb1600fc222337989e3084d68df929882deae5
Change-Id: I2c32babbccb483547204cb2843973abf97e988a5
Signed-off-by: Andrew Chant <achant@google.com>
[srkupp@codeaurora.org: This change is a fix for buggy
code pointed by sil after merging the above commit.}
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Linux Build Service Account [Tue, 2 May 2017 06:57:09 +0000 (23:57 -0700)]
Merge "drm/msm: Add PLL_DELTA property to HDMI connector"
Linux Build Service Account [Tue, 2 May 2017 06:57:08 +0000 (23:57 -0700)]
Merge "ARM: dts: msm: Set 1.848V as the minimum voltage for LDO24 on msm8998"
Linux Build Service Account [Tue, 2 May 2017 06:57:05 +0000 (23:57 -0700)]
Merge "power_supply: Add REAL_TYPE power_supply_property"
Linux Build Service Account [Tue, 2 May 2017 06:57:04 +0000 (23:57 -0700)]
Merge "qpnp-smb2: make qnovo vote for current and voltage"
Linux Build Service Account [Tue, 2 May 2017 06:57:04 +0000 (23:57 -0700)]
Merge "qcom: qpnp-smb2: fix cleanup path"
Linux Build Service Account [Tue, 2 May 2017 06:57:03 +0000 (23:57 -0700)]
Merge "qcom: battery: Fix using stale votable pointers"
Linux Build Service Account [Tue, 2 May 2017 06:57:02 +0000 (23:57 -0700)]
Merge "ARM: dts: msm: Add iommu coherent test device for msm8998"
Linux Build Service Account [Tue, 2 May 2017 06:57:02 +0000 (23:57 -0700)]
Merge "msm: ipa3: fix channel stop retry logic"
Linux Build Service Account [Tue, 2 May 2017 06:57:01 +0000 (23:57 -0700)]
Merge "ARM: boot: Silence 'zimage-dtb is ready' message"
Linux Build Service Account [Tue, 2 May 2017 06:56:58 +0000 (23:56 -0700)]
Merge "esoc: mdm-4x: Add support for mdm9x45 and apq8096"
Linux Build Service Account [Tue, 2 May 2017 06:56:57 +0000 (23:56 -0700)]
Merge "defconfig: disable slub debug on sdm660"
Linux Build Service Account [Tue, 2 May 2017 06:56:56 +0000 (23:56 -0700)]
Merge "mmc: cmdq_hci: Avoid releasing clock twice during DCMD error"