OSDN Git Service
Ashish Garg [Mon, 20 Feb 2017 05:51:09 +0000 (11:21 +0530)]
ARM: dts: msm: Correct vote on LDO11 for VDDIO on sdm630
On sdm630, VDDIO needs 1.8V and LDO11 votes for 1.88V
which is causing higher power numbers. Update the vote
correctly for LDO11.
Change-Id: I333dbf3077aa528376825f8fb2ff130feba9c477
Signed-off-by: Ashish Garg <ashigarg@codeaurora.org>
Linux Build Service Account [Sun, 19 Feb 2017 17:46:36 +0000 (09:46 -0800)]
Merge "msm: ipa: Do not assert if IPA FW loading fails"
Linux Build Service Account [Sun, 19 Feb 2017 17:46:35 +0000 (09:46 -0800)]
Merge "ath10k: Add support for shadow register for WNC3990"
Ghanim Fodi [Sun, 12 Feb 2017 13:25:53 +0000 (15:25 +0200)]
msm: ipa: Do not assert if IPA FW loading fails
Currently, IPA driver asserts if IPA FW loading
fails. Some environments do not have IPA FW
integrated and we should not crash at these cases.
CRs-fixed:
2005599
Change-Id: I78b9f2cadb8c35ab455f4514c7efc9cee4cf4542
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Linux Build Service Account [Sun, 19 Feb 2017 09:04:40 +0000 (01:04 -0800)]
Merge "power: qcom-charger: fix minor bugs in parallel path"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:39 +0000 (01:04 -0800)]
Merge "power: qcom-charger: add a workaround flag for QC AUTH interrupt"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:39 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: fix the compatible string used for GFX LDO CPR for sdm630"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:38 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: increase the system pm levels in sdm660"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:37 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: Enable wil6210 device for 8998 qrd-vr"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:37 +0000 (01:04 -0800)]
Merge "ARM: dts: msm: Correct the number of bus frequency levels for SDM630"
Linux Build Service Account [Sun, 19 Feb 2017 09:04:36 +0000 (01:04 -0800)]
Merge "defconfig: msm: Enable BALANCE_ANON_FILE_RECLAIM for sdm660"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:19 +0000 (16:15 -0800)]
Merge "ARM: dts: msm: Fix DCVS load for SDM660"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:14 +0000 (16:15 -0800)]
Merge "drm/msm: add put_iova() helper"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:13 +0000 (16:15 -0800)]
Merge "drm/msm: set dma_mask properly"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:10 +0000 (16:15 -0800)]
Merge "wil6210: convert symbolic permissions to octal permissions"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:10 +0000 (16:15 -0800)]
Merge "wil6210: option to override A-BFT length in start AP/PCP"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:09 +0000 (16:15 -0800)]
Merge "wil6210: report association ID (AID) per station in debugfs"
Linux Build Service Account [Sun, 19 Feb 2017 00:15:08 +0000 (16:15 -0800)]
Merge "wil6210: remove __func__ from debug printouts"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:28 +0000 (06:38 -0800)]
Merge "ARM: dts: msm: Update cpufreq table for sdm630"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:27 +0000 (06:38 -0800)]
Merge "ARM: dts: msm: add ESD and ULPS support for SDM660 panels"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:27 +0000 (06:38 -0800)]
Merge "msm: mdss: Rate limit hist bin error logs"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:26 +0000 (06:38 -0800)]
Merge "msm: mdss: Use DMA pipe in pan display path for SDM 3.x.x"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:25 +0000 (06:38 -0800)]
Merge "msm: sde: Fix SW timestamp initialization when missing power event"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:24 +0000 (06:38 -0800)]
Merge "msm: mdss: fix autorefresh during kickoff"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:23 +0000 (06:38 -0800)]
Merge "msm: mdss: correct bpp for TP10 in bandwidth calculations"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:22 +0000 (06:38 -0800)]
Merge "usb: gsi: Capture USB GSI endpoint operations"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:22 +0000 (06:38 -0800)]
Merge "scsi: ufs: full reinit upon resume if link was off"
Linux Build Service Account [Sat, 18 Feb 2017 14:38:21 +0000 (06:38 -0800)]
Merge "regulator: cpr4-mmss-ldo: Correct the GFX LDO CPR sensor count for sdm630"
Tirupathi Reddy [Sat, 18 Feb 2017 09:49:20 +0000 (15:19 +0530)]
ARM: dts: msm: Update cpufreq table for sdm630
Update cpufreq table for sdm630 as per new cpu clock plan.
CRs-Fixed:
2008773
Change-Id: Ibaa5d3c2d1dbafd14b5e9bee382cd3980f89aa51
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Ashay Jaiswal [Thu, 16 Feb 2017 11:14:08 +0000 (16:44 +0530)]
power: qcom-charger: fix minor bugs in parallel path
"icl_reduction_ua" is not updated to new slave ICL value after
ICL split, update the variable.
Change-Id: I944fddfda1aa2c359785d1a3155ac22ebe91fa65
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Ashay Jaiswal [Thu, 16 Feb 2017 08:44:58 +0000 (14:14 +0530)]
power: qcom-charger: add a workaround flag for QC AUTH interrupt
In PM660 "QC authentication done" IRQ is a pulse and thus it
does not require workaround to disable this IRQ after authentication
completes. Add a workaround flag to enable this only for PMI8998.
Change-Id: I766219df38fc4954f5208d6db323b680e8e5fafd
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Mayank Rana [Thu, 8 Dec 2016 23:39:19 +0000 (15:39 -0800)]
usb: gsi: Capture USB GSI endpoint operations
In some cases it has been observed that after sending STARTXFER
command with USB GSI IN endpoint, USB controller is accessing zero
address resulting into bus error. This change captures USB GSI
operation sequence in debug buffer which may help to understand
race condition in terms of USB gadget events and USB GSI endpoint
operations.
Change-Id: Ia46877bb92ea0cc1d5f3712e5c70bb44232d5cfe
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Linux Build Service Account [Fri, 17 Feb 2017 15:33:08 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: move ref-clk from phy to ufs node in sdm660"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:07 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: Add qcom,gpu-limit property for sdm660"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:06 +0000 (07:33 -0800)]
Merge "mm:camera: Do not detach isp node during smmu detach."
Linux Build Service Account [Fri, 17 Feb 2017 15:33:05 +0000 (07:33 -0800)]
Merge "msm: cpp: Call iommu detach in the error scenarios for secure case"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:04 +0000 (07:33 -0800)]
Merge "block: protect iterate_bdevs() against concurrent close"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:04 +0000 (07:33 -0800)]
Merge "drm/msm/sde:: fix optional property parsing for qseed and csc properties"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:03 +0000 (07:33 -0800)]
Merge "tracing: Modify saved_tgids size for change in saved_cmdline_size"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:02 +0000 (07:33 -0800)]
Merge "soc: qcom: ramdump: Remove page alignment during ramdump collection"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:01 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: update correct default OT settings for mdss"
Linux Build Service Account [Fri, 17 Feb 2017 15:33:01 +0000 (07:33 -0800)]
Merge "ARM: dts: msm: Add pmic bring up changes for SDM630 QRD"
Linux Build Service Account [Fri, 17 Feb 2017 15:32:59 +0000 (07:32 -0800)]
Merge "soc: qcom: pil: Allow the MBA memory to be dynamic or a carveout"
Rakesh Pillai [Fri, 3 Feb 2017 07:36:22 +0000 (13:06 +0530)]
ath10k: Add support for shadow register for WNC3990
WCN3990 needs shadow register write operation support
for copy engine for regular operation in powersave mode.
Add support for copy engine shadow register write in
datapath tx for WCN3990
CRs-Fixed:
2008518
Change-Id: Ie90ff74984021fa47070e08b2fc53ad5da46cf35
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Tirupathi Reddy [Fri, 17 Feb 2017 07:52:58 +0000 (13:22 +0530)]
ARM: dts: msm: fix the compatible string used for GFX LDO CPR for sdm630
Modify the compatible string used for GFX LDO CPR for sdm630 to apply
sdm630 specific configuration.
CRs-Fixed:
2007621
Change-Id: I883a004c8731654f5752194d66c971a22ea723ef
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Vikash Garodia [Fri, 17 Feb 2017 07:37:39 +0000 (13:07 +0530)]
ARM: dts: msm: Fix DCVS load for SDM660
DCVS table specifies the low and high load interms
of mbs per sec. Clock frequency is derived from
this load alongwith cycles required per mb. For
starlord, the DCVS low load was incorrect which
made the decoder session to run in SVS instead
of SVS+. The change now fix it to proper load.
Change-Id: I46dd772aa349b94a75472477e24cabe80c088165
CRs-Fixed:
2007776
Signed-off-by: Vikash Garodia <vgarodia@codeaurora.org>
Rajesh Kemisetti [Fri, 17 Feb 2017 06:03:05 +0000 (11:33 +0530)]
ARM: dts: msm: Correct the number of bus frequency levels for SDM630
Update the proper number of bus frequency levels for SDM630 GPU.
Change-Id: Id00a47440dd766493a1de6da9cb0c218b1fa8eac
Signed-off-by: Rajesh Kemisetti <rajeshk@codeaurora.org>
Maya Erez [Wed, 8 Feb 2017 11:18:42 +0000 (13:18 +0200)]
wil6210: convert symbolic permissions to octal permissions
Symbolic permissions are no longer recommended.
This patch changes the symbolic permissions in wil6210 driver
to octal permissions.
Change-Id: I4d762724938a6c615698ea92bd668f0b4ee6963c
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
78484c44e4b305b23cbfcfb9257ed96c8753e86d
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lior David [Wed, 8 Feb 2017 11:17:35 +0000 (13:17 +0200)]
wil6210: option to override A-BFT length in start AP/PCP
Add an option to specify and override the A-BFT length when
starting an AP/PCP. See IEEE P802.11-2016, 10.38.5.
The abft_len must be set before starting AP/PCP. It is only
needed for diagnostics and certification.
Change-Id: Idb7a72b1a3c87c0ca085ca55a9e2507d14eecbdb
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
c3bfea05a6fdecee03c7cf08f5bfee6aa0645cee
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lior David [Wed, 8 Feb 2017 11:16:37 +0000 (13:16 +0200)]
wil6210: report association ID (AID) per station in debugfs
Add reporting of the association ID (AID) for each station
as part of the stations file in the debugfs.
Valid AID values are 1-254. 0 is reported if the AID
is unknown or not reported by firmware.
Change-Id: Ifa79ccfa91d60eb0aeada0c849f8694d27c3b333
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
9d865ee232eccf51950b16f223f4130f7dc06e0f
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lior David [Wed, 8 Feb 2017 11:15:32 +0000 (13:15 +0200)]
wil6210: align to latest auto generated wmi.h
Align to latest version of the auto generated wmi file
describing the interface with FW.
Change-Id: I54bacf35257380fd12b3d6e47bcc3e66d46f66dc
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
a52fb913aee97149f5986fd001a424e68c096d19
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lior David [Wed, 8 Feb 2017 11:14:13 +0000 (13:14 +0200)]
wil6210: fix for broadcast workaround in PBSS
Currently we do not have full support for broadcast from
a station inside a PBSS network.
We have a workaround where instead of broadcast we do a
unicast to every known station in the PBSS.
This workaround was performed only for P2P clients.
This fix will perform the broadcast workaround also for a
regular station inside a PBSS.
Change-Id: I3153727b3c928b4ea4cfae59f1df1d36adb9d1bb
Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
a895cb8b990c12945b70f70d9e0798d587d507c0
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Dedy Lansky [Wed, 8 Feb 2017 11:08:39 +0000 (13:08 +0200)]
wil6210: support new WMI-only FW capability
WMI_ONLY FW is used for testing in production. It cannot be used for
scan/connect, etc.
In case FW reports this capability, driver will not allow interface up.
Change-Id: Ifad411ba3fff136107ee73691008de3d013853b5
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
0d2370e939acca97b5e1abc1aedd47c5c9a5f500
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Lazar Alexei [Wed, 8 Feb 2017 10:29:48 +0000 (12:29 +0200)]
wil6210: remove __func__ from debug printouts
__func__ is automatically added to printouts by dynamic debug
mechanism and by wil_info/wil_err macros.
Remove __func__ from debug printouts to avoid duplication.
Change-Id: I3c8f8088bbff17954eb774b6dcd64b6dfd2de932
Signed-off-by: Lazar Alexei <qca_ailizaro@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Git-commit:
af3db60a30331d3a37b534570bc52dd64a7c0e5d
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
Signed-off-by: Maya Erez <merez@codeaurora.org>
Shiraz Hashim [Wed, 15 Feb 2017 05:23:36 +0000 (10:53 +0530)]
defconfig: msm: Enable BALANCE_ANON_FILE_RECLAIM for sdm660
BALANCE_ANON_FILE_RECLAIM treats anonymous and file backed
pages equally while performing memory reclaim.
It is already enabled for sdm660 arm64 perf defconfig.
Enable it for rest of sdm660 related defconfigs.
Change-Id: I3914bbdbc162cce020d6265f8297ac728621c84d
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
Asutosh Das [Fri, 17 Feb 2017 01:53:12 +0000 (07:23 +0530)]
ARM: dts: msm: increase the system pm levels in sdm660
Increasing the system pm-level would ensure that Vccq2 &
ref-clk supply are turned off during system suspend.
Change-Id: I22b42d971266c6cb67f1f15e2b48c3f111c22ac8
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Asutosh Das [Thu, 9 Feb 2017 11:32:27 +0000 (17:02 +0530)]
ARM: dts: msm: move ref-clk from phy to ufs node in sdm660
This patch moves the ref-clk node from the phy node
to the ufs node.
This is done so as to turn-off the ref-clk supply when
the link is off.
Change-Id: I17139340f2208b67b9a2d99419ac6ce92c06dbe5
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Rabin Vincent [Thu, 1 Dec 2016 08:18:28 +0000 (09:18 +0100)]
block: protect iterate_bdevs() against concurrent close
commit
af309226db916e2c6e08d3eba3fa5c34225200c4 upstream.
If a block device is closed while iterate_bdevs() is handling it, the
following NULL pointer dereference occurs because bdev->b_disk is NULL
in bdev_get_queue(), which is called from blk_get_backing_dev_info() (in
turn called by the mapping_cap_writeback_dirty() call in
__filemap_fdatawrite_range()):
BUG: unable to handle kernel NULL pointer dereference at
0000000000000508
IP: [<
ffffffff81314790>] blk_get_backing_dev_info+0x10/0x20
PGD
9e62067 PUD
9ee8067 PMD 0
Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
Modules linked in:
CPU: 1 PID: 2422 Comm: sync Not tainted 4.5.0-rc7+ #400
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996)
task:
ffff880009f4d700 ti:
ffff880009f5c000 task.ti:
ffff880009f5c000
RIP: 0010:[<
ffffffff81314790>] [<
ffffffff81314790>] blk_get_backing_dev_info+0x10/0x20
RSP: 0018:
ffff880009f5fe68 EFLAGS:
00010246
RAX:
0000000000000000 RBX:
ffff88000ec17a38 RCX:
ffffffff81a4e940
RDX:
7fffffffffffffff RSI:
0000000000000000 RDI:
ffff88000ec176c0
RBP:
ffff880009f5fe68 R08:
0000000000000000 R09:
0000000000000000
R10:
0000000000000001 R11:
0000000000000000 R12:
ffff88000ec17860
R13:
ffffffff811b25c0 R14:
ffff88000ec178e0 R15:
ffff88000ec17a38
FS:
00007faee505d700(0000) GS:
ffff88000fb00000(0000) knlGS:
0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0:
000000008005003b
CR2:
0000000000000508 CR3:
0000000009e8a000 CR4:
00000000000006e0
Stack:
ffff880009f5feb8 ffffffff8112e7f5 0000000000000000 7fffffffffffffff
0000000000000000 0000000000000000 7fffffffffffffff 0000000000000001
ffff88000ec178e0 ffff88000ec17860 ffff880009f5fec8 ffffffff8112e81f
Call Trace:
[<
ffffffff8112e7f5>] __filemap_fdatawrite_range+0x85/0x90
[<
ffffffff8112e81f>] filemap_fdatawrite+0x1f/0x30
[<
ffffffff811b25d6>] fdatawrite_one_bdev+0x16/0x20
[<
ffffffff811bc402>] iterate_bdevs+0xf2/0x130
[<
ffffffff811b2763>] sys_sync+0x63/0x90
[<
ffffffff815d4272>] entry_SYSCALL_64_fastpath+0x12/0x76
Code: 0f 1f 44 00 00 48 8b 87 f0 00 00 00 55 48 89 e5 <48> 8b 80 08 05 00 00 5d
RIP [<
ffffffff81314790>] blk_get_backing_dev_info+0x10/0x20
RSP <
ffff880009f5fe68>
CR2:
0000000000000508
---[ end trace
2487336ceb3de62d ]---
The crash is easily reproducible by running the following command, if an
msleep(100) is inserted before the call to func() in iterate_devs():
while :; do head -c1 /dev/nullb0; done > /dev/null & while :; do sync; done
Fix it by holding the bd_mutex across the func() call and only calling
func() if the bdev is opened.
Change-Id: I3385298e24d9a6121b7b0e35d4f8be15091f3fb4
Fixes:
5c0d6b60a0ba ("vfs: Create function for iterating over block devices")
Reported-and-tested-by: Wei Fang <fangwei1@huawei.com>
Signed-off-by: Rabin Vincent <rabinv@axis.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit:
af309226db916e2c6e08d3eba3fa5c34225200c4
Git-repo: git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Abhinav Kumar [Tue, 7 Feb 2017 03:56:59 +0000 (19:56 -0800)]
drm/msm/sde:: fix optional property parsing for qseed and csc properties
With commit <
5aad7456b5a5aeea93a437ae46680a97d089fe51> (<drm/msm/sde:
parse csc type dtsi entry to select valid csc>), support for
CSC is added to 8998 target. However this is an optional property for
some targets. Fix the parsing logic to not fail in case of missing
optional properties.
CRs-Fixed:
2002381
Change-Id: Idfe750d3afbd0d88d89ffa873deae130a24b2827
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Manoj Kumar AVM <manojavm@codeaurora.org>
Linux Build Service Account [Thu, 16 Feb 2017 21:09:28 +0000 (13:09 -0800)]
Merge "drm/msm/sde: signal pending PAGE_FLIP events"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:23 +0000 (03:05 -0800)]
Merge "ARM: dts: msm: update CPU efficiency values for sdm660"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:22 +0000 (03:05 -0800)]
Merge "proc: fix conversion of oom_score_adj to oom_adj"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:21 +0000 (03:05 -0800)]
Merge "USB: gadget: Replace %pK with %pM"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:20 +0000 (03:05 -0800)]
Merge "ARM: dts: msm: Enable support for LPM Errata feature on msm8998"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:19 +0000 (03:05 -0800)]
Merge "uio: fix potential use after free issue when accessing debug_buffer"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:18 +0000 (03:05 -0800)]
Merge "BACKPORT: aio: mark AIO pseudo-fs noexec"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:17 +0000 (03:05 -0800)]
Merge "diag: dci: Initialize the stat variable before using it"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:15 +0000 (03:05 -0800)]
Merge "diag: dci: Send masks information to only supported peripherals"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:14 +0000 (03:05 -0800)]
Merge "drivers: lmh_lite: Invalidate cache after the scm call"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:13 +0000 (03:05 -0800)]
Merge "msm: thermal: Ignore thermal bite for secure device"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:13 +0000 (03:05 -0800)]
Merge "drivers: thermal: Exit sysfs notify kthread when sensor unregisters"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:11 +0000 (03:05 -0800)]
Merge "defconfig: msmcortex: Enable regmap debugfs write"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:10 +0000 (03:05 -0800)]
Merge "regmap: Kconfig: make ALLOW_WRITE_DEBUGFS default unset"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:09 +0000 (03:05 -0800)]
Merge "pinctrl: qcom: Add syscore system suspend/resume"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:08 +0000 (03:05 -0800)]
Merge "power: qpnp-fg: Fix possible race condition in FG debugfs"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:07 +0000 (03:05 -0800)]
Merge "soc: qcom: spcom: fix error handling"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:06 +0000 (03:05 -0800)]
Merge "soc: qcom: spss_utils: fix error handling"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:01 +0000 (03:05 -0800)]
Merge "defconfig: msmcortex: Disable CONFIG_ICNSS_DEBUG"
Linux Build Service Account [Thu, 16 Feb 2017 11:05:00 +0000 (03:05 -0800)]
Merge "soc: qcom: glink_spi_xprt: Add check for SSR during RX polling"
Asutosh Das [Tue, 31 Jan 2017 10:25:17 +0000 (15:55 +0530)]
scsi: ufs: full reinit upon resume if link was off
During suspend, if the link is put to off, it would require
a full initialization during resume.
This patch resets and restores both the hba and the card
during initialization.
Change-Id: I37b36c51ca1b475d8f8dfd2d9b1f098c917c86e4
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Raviteja Tamatam [Thu, 16 Feb 2017 08:57:07 +0000 (14:27 +0530)]
ARM: dts: msm: update correct default OT settings for mdss
Fix default read and write vbif OT settings for mdss driver
in sdm630 and sdm660.
Change-Id: Ib4ae31359db5770d37210d850fde8bb25c9f965b
Signed-off-by: Raviteja Tamatam <travitej@codeaurora.org>
Tirupathi Reddy [Thu, 16 Feb 2017 05:32:52 +0000 (11:02 +0530)]
regulator: cpr4-mmss-ldo: Correct the GFX LDO CPR sensor count for sdm630
The GFX LDO CPR sensor count in sdm630 is different from that of sdm660.
Assign the correct sensor count under a soc-id comparison check.
CRs-Fixed:
2007621
Change-Id: I82231a30143dc3df0bee3421101316c1d9693d08
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Yingwei Zhao [Tue, 14 Feb 2017 05:45:33 +0000 (13:45 +0800)]
ARM: dts: msm: Add pmic bring up changes for SDM630 QRD
Add battery configuration, enable volume up key, and add PM660A
configuration for SDM630 QRD device.
CRs-Fixed:
2006325
Change-Id: Ifa87e30ebaced84b18c26041c0f659332266d5ee
Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
Liam Mark [Tue, 22 Apr 2014 00:16:11 +0000 (17:16 -0700)]
proc: fix conversion of oom_score_adj to oom_adj
Ensure that oom_score_adj values are properly converted to
oom_adj values by rounding appropriately.
When there is an attempt to calculate an oom_adj value from its
oom_score_adj value the lack of precision results in an oom_adj
value that is one less than it should be.
For example the oom_adj calculated from oom_score_adj 117 is
calculated as 1.989 (117*17 / 1000), and this is rounded to
1 (and not 2 as it should be).
By properly generating oom_adj values backward compatibility is
better supported.
Change-Id: I7f102cf445e572b8e855a9d6b0cf91e3c438eabf
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
Sahitya Tummala [Fri, 3 Feb 2017 07:54:19 +0000 (13:24 +0530)]
uio: fix potential use after free issue when accessing debug_buffer
The variable debug_buffer is a global variable which is allocated
and free'd when open/close is called on debugfs file -
"/sys/kernel/debug/rmt_storage/info". The current code doesn't
have locks to handle concurrent accesses to the above file.
This results into use after free issue when debug_buffer is
accessed by two threads at the same time. Fix this by adding
a mutex lock to protect this global variable.
Change-Id: I6bc3f0ae2d7fca3ca9fe8561612f5863b6c3268a
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Hemant Kumar [Thu, 9 Feb 2017 02:32:30 +0000 (18:32 -0800)]
ARM: dts: msm: Enable support for LPM Errata feature on msm8998
LPM Errata feature is enabled on dwc3 controller which has
DWC3_REVISION_300A.
Change-Id: Icec177f2bcb4ebc335e5c71550d6ce2f933c1619
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Satya Durga Srinivasu Prabhala [Tue, 14 Feb 2017 23:28:51 +0000 (15:28 -0800)]
soc: qcom: ramdump: Remove page alignment during ramdump collection
Due to page alignment, memory size is exceeding and SMMU fault is
observed while collecting ramdumps for ADSP subsystem.
Change-Id: Ibadedcbac4eb83382d913e893722967e86775ea0
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Linux Build Service Account [Thu, 16 Feb 2017 01:01:39 +0000 (17:01 -0800)]
Merge "msm: mdss: fix Display Port boot-up with default resolution"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:38 +0000 (17:01 -0800)]
Merge "msm: mdss: dp: add support to parse maximum PCLK from dtsi for display port"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:37 +0000 (17:01 -0800)]
Merge "msm: mdss: Add HDR Metadata Interface"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:36 +0000 (17:01 -0800)]
Merge "msm: mdss: mask DSI FIFO overflow errors during BTA operation"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:35 +0000 (17:01 -0800)]
Merge "msm: sde: Disable client driven prefetch for rotator"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:34 +0000 (17:01 -0800)]
Merge "qos: Add NULL checking for irq descriptor"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:33 +0000 (17:01 -0800)]
Merge "soc: qcom: fingerprint: keep QSEE handle in kernel space"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:32 +0000 (17:01 -0800)]
Merge "defconfig: msm: new flag for mediabox specific demux changes"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:31 +0000 (17:01 -0800)]
Merge "media: platform: msm: Add demux support for mediabox"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:30 +0000 (17:01 -0800)]
Merge "leds: qpnp-flash: Fix possible race condition in debugfs"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:29 +0000 (17:01 -0800)]
Merge "fuse: fix use after free issue in fuse_dev_do_read()"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:28 +0000 (17:01 -0800)]
Merge "USB: phy-msm-qusb: Fix race conditions during fast PI/PO"
Linux Build Service Account [Thu, 16 Feb 2017 01:01:28 +0000 (17:01 -0800)]
Merge "core_ctl: redo offline_delay_ms tunable implementation"