OSDN Git Service
Linux Build Service Account [Thu, 11 May 2017 06:03:44 +0000 (23:03 -0700)]
Merge "input: misc: fix error path for hbtp touch screen driver"
Linux Build Service Account [Thu, 11 May 2017 06:03:43 +0000 (23:03 -0700)]
Merge "power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id"
Linux Build Service Account [Thu, 11 May 2017 06:03:42 +0000 (23:03 -0700)]
Merge "msm: ipa: apply reset wa to GPI channels"
Linux Build Service Account [Thu, 11 May 2017 06:03:41 +0000 (23:03 -0700)]
Merge "memshare: Add guard bytes to avoid access issues"
Linux Build Service Account [Thu, 11 May 2017 06:03:40 +0000 (23:03 -0700)]
Merge "diag: dci: Add protection while querying event status"
Linux Build Service Account [Thu, 11 May 2017 06:03:39 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdsp6v2: clear address on error"
Linux Build Service Account [Thu, 11 May 2017 06:03:37 +0000 (23:03 -0700)]
Merge "ASoC: msm: enhance ADSP Stream Callback"
Linux Build Service Account [Thu, 11 May 2017 06:03:35 +0000 (23:03 -0700)]
Merge "ASoC: msm: qdspv2: Add mixer controls for drift query"
Linux Build Service Account [Thu, 11 May 2017 06:03:34 +0000 (23:03 -0700)]
Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro"
Linux Build Service Account [Thu, 11 May 2017 06:03:33 +0000 (23:03 -0700)]
Merge "Merge branch 'android-4.4@
24ac44d' into branch 'msm-4.4'"
Shantanu Jain [Tue, 9 May 2017 05:53:14 +0000 (11:23 +0530)]
input: misc: fix error path for hbtp touch screen driver
Fix error path for hbtp touch screen driver where error
variable is not initialized to a error value before bailing
out from the driver function.
Change-Id: Ife3376891950216971cafaf33fd8308697b7f904
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Skylar Chang [Fri, 5 May 2017 23:31:32 +0000 (16:31 -0700)]
msm: ipa: apply reset wa to GPI channels
When resetting a GSI channel a special handling is needed
if there is an open aggregation frame. This handling is applied
to USB and MHI channels. This commit applies this handling to
GPI (system) channels as well.
Change-Id: Iebdf3d7375a4bd584c75503f01e64d7106f25e5a
CRs-Fixed:
2029089
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Mohit Aggarwal [Fri, 5 May 2017 15:31:41 +0000 (21:01 +0530)]
memshare: Add guard bytes to avoid access issues
Currently, TZ is performing merging of resource groups
due to which NOC error is happening during access of
memory allocated to diag. This patch fixes the issue
by adding guard bytes so that merging of resource
groups will not happen.
CRs-Fixed:
2026525
Change-Id: I9829e5a07aef723c4261aa16dd5274cfeb1a75a3
Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org>
Linux Build Service Account [Sat, 6 May 2017 21:24:21 +0000 (14:24 -0700)]
Merge "msm: mdss: Retrict use of DMA Multi-Rect for FB pan_display"
Linux Build Service Account [Sat, 6 May 2017 21:24:20 +0000 (14:24 -0700)]
Merge "msm: mdss: add additional debug code for timeout issues"
Linux Build Service Account [Sat, 6 May 2017 21:24:19 +0000 (14:24 -0700)]
Merge "msm: mdss: Relocate timing flush for avr vtotal setup"
Linux Build Service Account [Sat, 6 May 2017 21:24:18 +0000 (14:24 -0700)]
Merge "msm: mdss: Initialize buf array elements"
Linux Build Service Account [Sat, 6 May 2017 21:24:17 +0000 (14:24 -0700)]
Merge "msm: mdss: add support for mdss throttle clock handling"
Linux Build Service Account [Sat, 6 May 2017 21:24:17 +0000 (14:24 -0700)]
Merge "ARM: dts: msm: add mdss throttle clock for SDM660 and SDM630"
Linux Build Service Account [Sat, 6 May 2017 21:24:16 +0000 (14:24 -0700)]
Merge "msm: mdss: fix memcpy source and dest memory buffer size mismatch"
Linux Build Service Account [Sat, 6 May 2017 01:10:31 +0000 (18:10 -0700)]
Merge "defconfig: msmcortex: Enable PAN emulation"
Linux Build Service Account [Sat, 6 May 2017 01:10:30 +0000 (18:10 -0700)]
Merge "wil6210: Enable write ioctl"
Linux Build Service Account [Sat, 6 May 2017 01:10:29 +0000 (18:10 -0700)]
Merge "seemp: check array index range"
Linux Build Service Account [Sat, 6 May 2017 01:10:28 +0000 (18:10 -0700)]
Merge "msm: mdss: Add multi-rectangle validation support"
Subbaraman Narayanamurthy [Fri, 5 May 2017 21:07:53 +0000 (14:07 -0700)]
power: qpnp-fg-gen3: Disable ESR pulldown for debug battery id
Even with proper ESR pulse qualification threshold and ESR pulse
amplitude, ESR pulses are still seen occasionally on devices
that use battery with debug battery id. Disable ESR pulldown when
debug battery id is found. This helps saving power by stopping
ESR pulses.
Change-Id: I2b9588ec39a2268123d94c06517b0dbb43d66fc7
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Olav Haugan [Fri, 5 May 2017 18:21:21 +0000 (11:21 -0700)]
defconfig: msmcortex: Enable PAN emulation
Privilege Access Never (PAN) enforces the usage of
copy_to_user/copy_from_user and friends when kernel accesses data from
user space. If user space memory is accessed outside of these functions
a kernel panic occurs.
Change-Id: Ic32ad8ecb6d921293fca74664116098723afc436
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Hareesh Gundu [Mon, 24 Oct 2016 14:20:08 +0000 (19:50 +0530)]
ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro
Add GPU clock plan for speed bin 2 of MSM8996Pro target.
This is initial change for supporting GPU speed bin 2.
CRs-Fixed:
1082439
Change-Id: Ifb21ae3baa3df001d944aa2c9db36dffa2a29504
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Linux Build Service Account [Fri, 5 May 2017 16:10:06 +0000 (09:10 -0700)]
Merge "ARM: dts: msm: Add OnSemi regulator node for msm8996"
Linux Build Service Account [Fri, 5 May 2017 16:10:06 +0000 (09:10 -0700)]
Merge "msm: mdss: Set LM flush bit for DE/Scalar reg update"
Linux Build Service Account [Fri, 5 May 2017 16:10:04 +0000 (09:10 -0700)]
Merge "input: touchscreen: fix issues related to variable initialization"
Linux Build Service Account [Fri, 5 May 2017 16:10:04 +0000 (09:10 -0700)]
Merge "usb: gadget: mtp: Move mutex_init() to alloc_inst_mtp_ptp()"
Yida Wang [Wed, 3 May 2017 18:46:14 +0000 (14:46 -0400)]
seemp: check array index range
Check whether array index is within the bounds in
seemp_logk_get_bit_from_vector().
Change-Id: Idccf75736582b2390540f4d7b3351c018937186a
Signed-off-by: Yida Wang <yidaw@codeaurora.org>
Linux Build Service Account [Fri, 5 May 2017 08:02:39 +0000 (01:02 -0700)]
Merge "scsi: ufs: add command logging infrastructure"
Linux Build Service Account [Fri, 5 May 2017 08:02:37 +0000 (01:02 -0700)]
Merge "defconfig: msm: Sync up perf_defconfig with defconfig"
Kiran Gunda [Wed, 3 May 2017 09:57:41 +0000 (15:27 +0530)]
ARM: dts: msm: Add OnSemi regulator node for msm8996
OnSemi buck regulator is used to provide the supply for
graphics rail. The programmable output voltage range is
from 0.6 V to 1.4 V in 6.25 mV steps.
Change-Id: I5f4ec11075b7f658ffa0af13dde5694b03c1495c
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Shantanu Jain [Thu, 4 May 2017 12:01:04 +0000 (17:31 +0530)]
input: touchscreen: fix issues related to variable initialization
Fix issues related to variable initialization in FTS touchscreen
driver.
Change-Id: I2911787dd1e1979e027bacdd1bc1cec06845ffd3
Signed-off-by: Shantanu Jain <shjain@codeaurora.org>
Wei Li [Thu, 27 Apr 2017 07:20:04 +0000 (15:20 +0800)]
defconfig: msm: Sync up perf_defconfig with defconfig
Sync up msm-auto-perf_defconfig with msm-auto_defconfig
Change-Id: Ief53b4c287ca3efbe8f82779a8d4e9f524b06fd8
Signed-off-by: Wei Li <weili@codeaurora.org>
Linux Build Service Account [Fri, 5 May 2017 00:44:33 +0000 (17:44 -0700)]
Merge "msm: pcie: move PCIe enumerate sysfs init"
Linux Build Service Account [Fri, 5 May 2017 00:44:32 +0000 (17:44 -0700)]
Merge "diag: Validate memory device client's process descriptor"
Linux Build Service Account [Fri, 5 May 2017 00:44:31 +0000 (17:44 -0700)]
Merge "net: pppolac/pppopns: Add back the msg_flags"
Linux Build Service Account [Fri, 5 May 2017 00:44:30 +0000 (17:44 -0700)]
Merge "msm: ipa: Add a support to retry uC send command"
Blagovest Kolenichev [Thu, 4 May 2017 20:03:34 +0000 (13:03 -0700)]
Merge branch 'android-4.4@
24ac44d' into branch 'msm-4.4'
* refs/heads/tmp-
24ac44d
Linux 4.4.66
ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
ARCv2: save r30 on kernel entry as gcc uses it for code-gen
nfsd: check for oversized NFSv2/v3 arguments
Input: i8042 - add Clevo P650RS to the i8042 reset list
p9_client_readdir() fix
MIPS: Avoid BUG warning in arch_check_elf
MIPS: KGDB: Use kernel context for sleeping threads
ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
ipv6: check raw payload size correctly in ioctl
ipv6: check skb->protocol before lookup for nexthop
macvlan: Fix device ref leak when purging bc_queue
ip6mr: fix notification device destruction
netpoll: Check for skb->queue_mapping
net: ipv6: RTF_PCPU should not be settable from userspace
dp83640: don't recieve time stamps twice
tcp: clear saved_syn in tcp_disconnect()
sctp: listen on the sock only when it's state is listening or closed
net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given
l2tp: fix PPP pseudo-wire auto-loading
l2tp: take reference on sessions being dumped
net/packet: fix overflow in check for tp_reserve
net/packet: fix overflow in check for tp_frame_nr
l2tp: purge socket queues in the .destruct() callback
net: phy: handle state correctly in phy_stop_machine
net: neigh: guard against NULL solicit() method
sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
sparc64: kern_addr_valid regression
xen/x86: don't lose event interrupts
usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize
regulator: core: Clear the supply pointer if enabling fails
RDS: Fix the atomicity for congestion map update
net_sched: close another race condition in tcf_mirred_release()
net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata
MIPS: Fix crash registers on non-crashing CPUs
md:raid1: fix a dead loop when read from a WriteMostly disk
ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
drm/amdgpu: fix array out of bounds
crypto: testmgr - fix out of bound read in __test_aead()
clk: sunxi: Add apb0 gates for H3
ARM: OMAP2+: timer: add probe for clocksources
xc2028: unlock on error in xc2028_set_config()
f2fs: do more integrity verification for superblock
net: pppolac/pppopns: Add back the msg_flags
Conflicts:
drivers/regulator/core.c
Change-Id: I8e7b279efa442a0338ee735d27ff3ebe866a8dee
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Rajkumar Subbiah [Wed, 26 Apr 2017 19:58:07 +0000 (15:58 -0400)]
msm: mdss: Relocate timing flush for avr vtotal setup
The AVR vtotal setup is done during ctl start. Since the slave
ctl is not yet setup, currently the master and slave controls
get flushed independently even though it is a split display
setup. Instead, just set a flag and then do the actual flush
as part of commit when the controls are properly setup.
Change-Id: I8eb1693c9a3a6404d28a82cab9a9f0ce58d1bb03
Signed-off-by: Rajkumar Subbiah <rsubbia@codeaurora.org>
Tony Truong [Thu, 20 Apr 2017 18:04:03 +0000 (11:04 -0700)]
msm: pcie: move PCIe enumerate sysfs init
PCIe enumerate sysfs initialization should be
done after all other resources are setup.
Change-Id: I33b43e39453eeee9ac9e22bd1a5463af9eb1fd05
Signed-off-by: Tony Truong <truong@codeaurora.org>
Linux Build Service Account [Thu, 4 May 2017 15:45:28 +0000 (08:45 -0700)]
Merge "wil6210: add option to ignore OTA regulatory hints"
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"
Gopikrishna Mogasati [Mon, 1 May 2017 21:23:54 +0000 (02:53 +0530)]
diag: Validate memory device client's process descriptor
This fix checks for valid process descriptor of a
memory device client before exporting information
from diag driver to memory device client's read buffer
for reliable data transfer.
CRs-Fixed:
2016396
Change-Id: I45aeb8fc9e2f6a678d48bbfcbb77c501adbbfce0
Signed-off-by: Gopikrishna Mogasati <gmogas@codeaurora.org>
Utkarsh Saxena [Fri, 28 Apr 2017 13:42:30 +0000 (19:12 +0530)]
msm: ipa: Add a support to retry uC send command
For the status IPA_HW_2_CPU_WDI_RX_FSM_TRANSITION_ERROR,
receive from the uC, add a logic to retry sending the same
command for maximum of 10 retires.
Change-Id: I4b241311e0699aea0e24b3a279622a8a1aaa737d
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
Manish Dewangan [Fri, 21 Apr 2017 08:49:12 +0000 (14:19 +0530)]
ASoC: msm: qdspv2: Add mixer controls for drift query
Add mixer control to query drift avtimer vs device(speaker,
headset, BT) drift.
CRs-Fixed:
2036899
Change-Id: I1cd8d2faf278faabaa9861953027ceb38eda4d25
Signed-off-by: Manish Dewangan <manish@codeaurora.org>
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>
Sachin Bhayare [Thu, 13 Apr 2017 10:33:32 +0000 (16:03 +0530)]
msm: mdss: add support for mdss throttle clock handling
Update mdss throttle clock status based on status of display.
Change-Id: Ife21df0c570240c075f039b8d49514bb323021da
Signed-off-by: Sachin Bhayare <sachin.bhayare@codeaurora.org>
Sachin Bhayare [Thu, 13 Apr 2017 10:23:17 +0000 (15:53 +0530)]
ARM: dts: msm: add mdss throttle clock for SDM660 and SDM630
Add mmss_throttle_mdss_axi clock in MDSS clock list
for SDM660 and SDM630.
Change-Id: Iadc58ab163101bce81c255646742f27d3e848cda
Signed-off-by: Sachin Bhayare <sachin.bhayare@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>
Xiaojun Sang [Tue, 25 Apr 2017 01:10:00 +0000 (09:10 +0800)]
ASoC: msm: enhance ADSP Stream Callback
Implement FIFO queue for multiple callback events. Events are
cleaned at stream close.
Change-Id: Id738326a20613d2f939e45204b2d46448a5b4759
Signed-off-by: Xiaojun Sang <xsang@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>
Can Guo [Tue, 18 Apr 2017 08:22:56 +0000 (16:22 +0800)]
scsi: ufs: add command logging infrastructure
Add the necessary infrastructure to keep timestamp history
of commands, events and other useful info for debugging
complex issues. This helps in diagnosing events leading
upto failure.
Change-Id: I34f78b0c875262fa06c16d476be6255f7ae4d92f
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
Harsh Sahu [Fri, 21 Apr 2017 23:12:22 +0000 (16:12 -0700)]
msm: mdss: fix memcpy source and dest memory buffer size mismatch
Currently memcpy is copying from a bigger memory size to a smaller
memory size. This change corrects this issue by performing the
memcopy restricted to the smaller of the src or dest memory buffer.
CRs-fixed:
2028228
Change-Id: Ibbe5665083799a4262d3cfbb06f94f3e35e03748
Signed-off-by: Harsh Sahu <hsahu@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>
Greg Kroah-Hartman [Wed, 3 May 2017 15:50:11 +0000 (08:50 -0700)]
Merge 4.4.66 into android-4.4
Changes in 4.4.66:
f2fs: do more integrity verification for superblock
xc2028: unlock on error in xc2028_set_config()
ARM: OMAP2+: timer: add probe for clocksources
clk: sunxi: Add apb0 gates for H3
crypto: testmgr - fix out of bound read in __test_aead()
drm/amdgpu: fix array out of bounds
ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()
md:raid1: fix a dead loop when read from a WriteMostly disk
MIPS: Fix crash registers on non-crashing CPUs
net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata
net_sched: close another race condition in tcf_mirred_release()
RDS: Fix the atomicity for congestion map update
regulator: core: Clear the supply pointer if enabling fails
usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize
xen/x86: don't lose event interrupts
sparc64: kern_addr_valid regression
sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
net: neigh: guard against NULL solicit() method
net: phy: handle state correctly in phy_stop_machine
l2tp: purge socket queues in the .destruct() callback
net/packet: fix overflow in check for tp_frame_nr
net/packet: fix overflow in check for tp_reserve
l2tp: take reference on sessions being dumped
l2tp: fix PPP pseudo-wire auto-loading
net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given
sctp: listen on the sock only when it's state is listening or closed
tcp: clear saved_syn in tcp_disconnect()
dp83640: don't recieve time stamps twice
net: ipv6: RTF_PCPU should not be settable from userspace
netpoll: Check for skb->queue_mapping
ip6mr: fix notification device destruction
macvlan: Fix device ref leak when purging bc_queue
ipv6: check skb->protocol before lookup for nexthop
ipv6: check raw payload size correctly in ioctl
ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type
ALSA: seq: Don't break snd_use_lock_sync() loop by timeout
MIPS: KGDB: Use kernel context for sleeping threads
MIPS: Avoid BUG warning in arch_check_elf
p9_client_readdir() fix
Input: i8042 - add Clevo P650RS to the i8042 reset list
nfsd: check for oversized NFSv2/v3 arguments
ARCv2: save r30 on kernel entry as gcc uses it for code-gen
ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
Linux 4.4.66
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
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>