OSDN Git Service
Harry Yang [Thu, 6 Apr 2017 07:02:30 +0000 (00:02 -0700)]
qcom: battery: Fix using stale votable pointers
The code flow between battery.c and smblib.c could end up with
stale references in smblib. This is when if pl_init fails for
some reason after creating the votables, while smblib obtains
references to them, those references become invalid.
Fix this by calling pl_init early in smb2 driver's probe such that if
it fails smb2 driver exits early.
Also change the name of pl_(de)init() functions to more appropriate
name - qcom_batt_(de)init().
Change-Id: I58f79d26e6cc8524e792a23185ff6fc8cfdffa75
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Tue, 25 Apr 2017 01:33:55 +0000 (18:33 -0700)]
smb138x: use chg src bit to disable parallel charger
smb1355 doesn't have any facility to suspend input. One has to
disable charging using the chg_en command bit.
So, when parallel charging needs to be disabled, configure
the charger to ignore the chg_en input pin and instead use the
command register. The command register is always programmed to
disable charging.
When parallel charging needs to be enabled, configure it to
follow the chg_en input pin.
This will work for both smb1355 and smb1381 parallel chargers.
Change-Id: I50294f40927641c2e0a7c7e4e7d263592086d3a9
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Mon, 24 Apr 2017 21:06:54 +0000 (14:06 -0700)]
qpnp-smb2: don't stomp over D+/D- during hard reset
Currently when we are in hard reset, the driver requests to remove
the float of D+/D- when VBUS drops and once VBUS is back, it requests
to float D+/D- again. This behaviour ends up stomping over D+/D- lines
leading to noncompliance with PD spec.
Fix it by ensuring we only run the CC2 workaround while VBUS dips
in hard reset.
Change-Id: I2bb9364b890b3a227dd3ea3e0a34a415b600e21a
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Abhijeet Dharmapurikar [Mon, 24 Apr 2017 20:33:07 +0000 (13:33 -0700)]
qpnp-smb2: report main charger's share in its current_max
Currently main power supply reports the value of the input current limit
set on the usb path. This is incorrect, it should report its own
share. When parallel is disabled, it will end up reporting a value
close to current limit, rounded by 25mA steps.
Note that it should report INT_MAX when there is no limit set on
the ICL - the case for hvdcp chargers.
CRs-Fixed:
2037898
Change-Id: I9859f3d759644a08c6f762e929c471a41b1cdf8f
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Linux Build Service Account [Mon, 1 May 2017 07:11:59 +0000 (00:11 -0700)]
Merge "msm: kgsl: Perform cache operation with kernel address"
Linux Build Service Account [Mon, 1 May 2017 07:11:58 +0000 (00:11 -0700)]
Merge "mmc: core: Update the logic of controlling clk scaling through sysfs"
Linux Build Service Account [Sat, 29 Apr 2017 14:00:57 +0000 (07:00 -0700)]
Merge "ARM: dts: msm: move panel bindings to different msm8998 platforms"
Linux Build Service Account [Sat, 29 Apr 2017 14:00:56 +0000 (07:00 -0700)]
Merge "ARM: dts: msm: Remove I/O coherence for the GPU"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:52 +0000 (22:10 -0700)]
Merge "ARM: dts: msm: Change panel settings for sdm660 QRD"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:50 +0000 (22:10 -0700)]
Merge "ARM: dts: msm: control VCI register switch for rm67195"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:49 +0000 (22:10 -0700)]
Merge "drm/msm: Add explicit sync operations"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:48 +0000 (22:10 -0700)]
Merge "ASoC: qdsp6v2: Remove Eagle code"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:46 +0000 (22:10 -0700)]
Merge "Merge branch 'android-4.4@
b834e92' into branch 'msm-4.4'"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:45 +0000 (22:10 -0700)]
Merge "power: smb-lib: Fix charger type reporting"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:44 +0000 (22:10 -0700)]
Merge "ath10k: Move logging prior to ath10k core destroy"
Linux Build Service Account [Sat, 29 Apr 2017 05:10:43 +0000 (22:10 -0700)]
Merge "ARM: dts: msm: configure supply property for DSI on msm8998."
Linux Build Service Account [Fri, 28 Apr 2017 18:12:25 +0000 (11:12 -0700)]
Merge "soc: qcom: Register for indication cb after obtaining state of remote pd"
Linux Build Service Account [Fri, 28 Apr 2017 18:12:24 +0000 (11:12 -0700)]
Merge "icnss: Add support to handle SSR within SSR"
Linux Build Service Account [Fri, 28 Apr 2017 18:12:23 +0000 (11:12 -0700)]
Merge "qcom: PMRESR register read returns zero for un supported group events"
Linux Build Service Account [Fri, 28 Apr 2017 18:12:20 +0000 (11:12 -0700)]
Merge "arm64: Change cpu_resume() to enable mmu early then access sleep_sp by va"
Linux Build Service Account [Fri, 28 Apr 2017 18:12:20 +0000 (11:12 -0700)]
Merge "arm64: kasan: clear stale stack poison"
Linux Build Service Account [Fri, 28 Apr 2017 18:12:19 +0000 (11:12 -0700)]
Merge "Revert "arm64: Change cpu_resume() to enable mmu early ...""
Linux Build Service Account [Fri, 28 Apr 2017 18:12:18 +0000 (11:12 -0700)]
Merge "msm: ADSPRPC: Initialize the list for global gfa maps"
Chandan Uddaraju [Fri, 14 Apr 2017 16:46:38 +0000 (09:46 -0700)]
ARM: dts: msm: move panel bindings to different msm8998 platforms
Include the panel dtsi files as part of all the different
msm8998 platform specific device tree files. This will
separate panel properties from SOC specific MDSS binding.
Change-Id: I423a53b4601447d0c7be2bdc041b36495f99da3b
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
Avaneesh Kumar Dwivedi [Fri, 21 Apr 2017 15:45:03 +0000 (21:15 +0530)]
soc: qcom: Register for indication cb after obtaining state of remote pd
This change moves the registration of indication call back after inquiring
the state of remote PD, this is logical flow since in any case just after
registration we are inquiring the state and doing client notification.
With existing arrangement of code, sometime there is occurring a race
condition between inquiring the remote pd state and indication call back.
Change-Id: I2d4d5e0dc7afde9dfb89747b878c26862532bec4
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
Avaneesh Kumar Dwivedi [Mon, 24 Apr 2017 16:21:42 +0000 (21:51 +0530)]
soc: qcom: Clear the memory before freeing it up
It is a case of write after free, this is causing page allocation
failure due to corruption. This is due to freeing up of segments
allocated for venus subsystem, when venus fw loading fail midway.
Change-Id: I0019a05b1d1336dcf361264607597430e5f1625a
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
Govind Singh [Fri, 28 Apr 2017 11:20:41 +0000 (16:50 +0530)]
ath10k: Move logging prior to ath10k core destroy
ath10k core destroy frees the debug references and
this is leading to crash when ATH10K_DBG_SNOC mask is
defined.
Fix this by moving logs to prior ath10k core destroy.
Change-Id: If4fd96fdfd9faaf19480b6d523c501747f56d40e
Signed-off-by: Govind Singh <govinds@codeaurora.org>
Rakesh Pillai [Wed, 26 Apr 2017 13:31:06 +0000 (19:01 +0530)]
ath10k: wait for FW ready during initialization
Since the qmi service in snoc driver gets registered late,
it misses the first time FW ready is sent. This causes the
wait on FW ready to fail and eventually the driver loading fails.
Proceed with the driver initialization only once the FW ready
indication arrives. Handle error in case the wait for these
events timeout.
Change-Id: Ib20ddb3a2f8b5b48936cc97b38f637f31e4e0100
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Linux Build Service Account [Fri, 28 Apr 2017 08:45:05 +0000 (01:45 -0700)]
Merge "input: misc: hbtp-input: Support for FB_BLANK_NORMAL event"
Linux Build Service Account [Fri, 28 Apr 2017 08:45:04 +0000 (01:45 -0700)]
Merge "msm: camera: isp: Rate limit tasklet overflow logs"
Linux Build Service Account [Fri, 28 Apr 2017 08:45:03 +0000 (01:45 -0700)]
Merge "ARM: dts: msm: configure PM8998 S5 and S7 for mode pin control on msm8998"
Linux Build Service Account [Fri, 28 Apr 2017 08:45:02 +0000 (01:45 -0700)]
Merge "soc: qcom: ipc_router_mhi_xprt: Handle xfer event in atomic context"
Linux Build Service Account [Fri, 28 Apr 2017 08:45:01 +0000 (01:45 -0700)]
Merge "msm: mdss: dsi: reset phy during idle screen"
Linux Build Service Account [Fri, 28 Apr 2017 08:44:59 +0000 (01:44 -0700)]
Merge "cfg80211: size various nl80211 messages correctly"
Linux Build Service Account [Fri, 28 Apr 2017 08:44:58 +0000 (01:44 -0700)]
Merge "cfg80211: Fix documentation for connect result"
Linux Build Service Account [Fri, 28 Apr 2017 08:44:57 +0000 (01:44 -0700)]
Merge "cfg80211: Add KEK/nonces for FILS association frames"
Veerabhadrarao Badiganti [Fri, 28 Apr 2017 07:37:37 +0000 (13:07 +0530)]
mmc: core: Update the logic of controlling clk scaling through sysfs
mmc clock scaling can be disabled/enabled through sysfs.
The present logic in this path deregisters/registers with devfreq
every time. Instead of this, we can simply suspend/resume the clock
scaling when requested for disabling/enabling clock scaling.
This patch updates the mentioned logic.
With original logic, observed deadlock between devfreq registration
and cmdqd thread in low memory conditions. The updated logic fixes
this deadlock condition aswell.
Change-Id: Ifee1ffbe24b13b8f5dc1c9f0579ce9ddf4b4faf3
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Anurag Chouhan [Mon, 10 Apr 2017 11:56:47 +0000 (17:26 +0530)]
icnss: Add support to handle SSR within SSR
Add state bit to defer recursive shutdown. This state
bit adds support for synchronization between reinit
and shutdown method during SSR within SSR.
Change-Id: Ifb857ecdb6545709706380631c423f0e24269e11
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
Prasad Sodagudi [Fri, 8 Jul 2016 16:24:09 +0000 (21:54 +0530)]
qcom: PMRESR register read returns zero for un supported group events
Kryo has 3 groups of events PMRESR0, 1, 2. If kryo_read_pmresr()
is asked to read other than these 3 event groups, return ZERO value.
Change-Id: Ifa348baa749182bb0dcb67562195472699301b1a
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
Venu Yeshala [Tue, 25 Apr 2017 03:21:40 +0000 (08:51 +0530)]
msm: camera: isp: Rate limit tasklet overflow logs
This will help reduce excessive logging in case of tasklet
overflow scenarios.
Change-Id: I93f8442c4dcf725cab2d722694d194921b764aff
Signed-off-by: Venu Yeshala <vyeshala@codeaurora.org>
Linux Build Service Account [Thu, 27 Apr 2017 23:52:24 +0000 (16:52 -0700)]
Merge "defconfig: enable LCDB support in SDM660-perf_defconfig"
Linux Build Service Account [Thu, 27 Apr 2017 23:52:23 +0000 (16:52 -0700)]
Merge "fs/dcache: Fix indefinite wait in d_invalidate()"
Linux Build Service Account [Thu, 27 Apr 2017 23:52:21 +0000 (16:52 -0700)]
Merge "ANDROID: AVB error handler to invalidate vbmeta partition."
Linux Build Service Account [Thu, 27 Apr 2017 23:52:20 +0000 (16:52 -0700)]
Merge "USB: dwc3: msm: Fix error handling with dwc3_msm_ep_queue()"
Chris Lew [Thu, 1 Dec 2016 23:19:06 +0000 (15:19 -0800)]
soc: qcom: ipc_router_mhi_xprt: Handle xfer event in atomic context
The MHI driver requires the MHI_CB_XFER event handling be atomic.
This change makes the addr map locks into spinlocks so sleep is
avoided while processing the XFER event.
CRs-Fixed:
1089824
Change-Id: I7bd8f606f92095bb47741aa54a846b687fe948b9
Signed-off-by: Chris Lew <clew@codeaurora.org>
Alex Sarraf [Tue, 11 Apr 2017 19:54:46 +0000 (12:54 -0700)]
input: misc: hbtp-input: Support for FB_BLANK_NORMAL event
Add support for handling FB_BLANK_NORMAL event.
Change-Id: Ifd3c1c1eb2e1101bfcd354252711eb67fc362c57
Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
Linux Build Service Account [Thu, 27 Apr 2017 14:07:12 +0000 (07:07 -0700)]
Merge "ARM: dts: msm: Enable KPDPWR software debounce for PM660"
Linux Build Service Account [Thu, 27 Apr 2017 14:07:01 +0000 (07:07 -0700)]
Merge "ARM: dts: msm: add support for truly amoled panel on sdm660 and sdm630"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:59 +0000 (07:06 -0700)]
Merge "msm: mdss: enable backlight gpio after commit is done"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:58 +0000 (07:06 -0700)]
Merge "msm: sde: fix to handle invalid format in sde rotator"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:57 +0000 (07:06 -0700)]
Merge "msm: mdss: align the size of smmu domain mapping to 128 MB"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:56 +0000 (07:06 -0700)]
Merge "ARM: dts: msm: Add QRD device nodes for HDK660/630 boards"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:55 +0000 (07:06 -0700)]
Merge "msm: dsi: Turn off supplies in low power state"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:53 +0000 (07:06 -0700)]
Merge "Merge branch 'android-4.4@
c71ad0f' into branch 'msm-4.4'"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:52 +0000 (07:06 -0700)]
Merge "msm: ipa: fix IPC low priority logging"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:51 +0000 (07:06 -0700)]
Merge "msm: gsi: fix IPC low priority logging"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:29 +0000 (07:06 -0700)]
Merge "diag: Fix to check for command length size"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:27 +0000 (07:06 -0700)]
Merge "mhi: core: add support for 64bit doorbell address"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:26 +0000 (07:06 -0700)]
Merge "msm: ipa: Fix race condition between shared memory"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:24 +0000 (07:06 -0700)]
Merge "ashmem: add mutex to set size ioctl"
Linux Build Service Account [Thu, 27 Apr 2017 14:06:22 +0000 (07:06 -0700)]
Merge "msm: mdss: Add check to avoid NULL pointer dereference"
Mayank Rana [Mon, 25 Apr 2016 23:50:56 +0000 (16:50 -0700)]
USB: dwc3: msm: Fix error handling with dwc3_msm_ep_queue()
If __dwc3_msm_ep_queue() fails, then req_complete is freed
but it is not being removed from mdwc->request_list. This
may result into list_add corruption issue on next USB cable
connect when USB endless request is queued. Fix this issue
by deleting req_complete from mdwc->req_complete_list.
CRs-Fixed:
1007571
Change-Id: I00300bc529db75593939a13fbea33acefa717da5
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Ashay Jaiswal [Thu, 27 Apr 2017 11:01:42 +0000 (16:31 +0530)]
defconfig: enable LCDB support in SDM660-perf_defconfig
LCDB driver exposes regulators to control the positive and
negative voltage bias for the LCD display panel. It also
allows ability to configure for the various bias-voltage
parameters.
Change-Id: I339345520a47c117e37e57a7b1f37ff2aead3dd8
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Linux Build Service Account [Thu, 27 Apr 2017 01:49:04 +0000 (18:49 -0700)]
Merge "input: misc: hbtp_input: filter out fb events"
Anirudh Ghayal [Wed, 19 Apr 2017 10:23:01 +0000 (15:53 +0530)]
ARM: dts: msm: Enable KPDPWR software debounce for PM660
Enable the SW debounce handling for KPDPWR_N rising edge.
CRs-Fixed:
2032520
Change-Id: Ic099d38abdd7693425d0e2510a0ef8fc52a69b95
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Anirudh Ghayal [Wed, 19 Apr 2017 09:53:06 +0000 (15:23 +0530)]
input: qpnp-power-on: Add debounce for KPDPWR_N rising edge
On certain PMICs, an unexpected assertion on KPDPWR_DBC may
be seen during falling edge of KPDPWR_N when it is closer
to the rising edge of SLEEP_CLK. This triggers spurious
KPDPWR interrupts. Handle this by adding a debounce in SW
when the first KPDPWR_N falling edge is seen.
The debounce logic is enabled by the DT property
'qcom,kpdpwr-sw-debounce'.
CRs-Fixed:
2032520
Change-Id: I7655c13bda47fa6e2983650d7bec21e52aa91c2f
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
David Zeuthen [Tue, 24 Jan 2017 18:17:01 +0000 (13:17 -0500)]
ANDROID: AVB error handler to invalidate vbmeta partition.
If androidboot.vbmeta.device is set and points to a device with vbmeta
magic, this header will be overwritten upon an irrecoverable dm-verity
error. The side-effect of this is that the slot will fail to verify on
next reboot, effectively triggering the boot loader to fallback to
another slot. This work both if the vbmeta struct is at the start of a
partition or if there's an AVB footer at the end.
This code is based on drivers/md/dm-verity-chromeos.c from ChromiumOS.
Example:
[ 0.000000] Kernel command line: rootfstype=ext4 init=/init console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=uefi_x86_64 enforcing=0 androidboot.selinux=permissive androidboot.debuggable=1 buildvariant=eng dm="1 vroot none ro 1,0
2080496 verity 1 PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b 4096 4096 260062 260062 sha1
4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks" root=0xfd00 androidboot.vbmeta.device=PARTUUID=
b865935d-38fb-4c4e-b8b4-
70dc67321552 androidboot.slot_suffix=_a androidboot.vbmeta.device_state=unlocked androidboot.vbmeta.hash_alg=sha256 androidboot.vbmeta.size=3200 androidboot.vbmeta.digest=14fe41c2b3696c31b7ad5eae7877d7d188995e1ab122c604aaaf4785850b91f7 skip_initramfs
[...]
[ 0.612802] device-mapper: verity-avb: AVB error handler initialized with vbmeta device: PARTUUID=
b865935d-38fb-4c4e-b8b4-
70dc67321552
[...]
[ 1.213804] device-mapper: init: attempting early device configuration.
[ 1.214752] device-mapper: init: adding target '0
2080496 verity 1 PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b PARTUUID=
6779df46-78f6-4c69-bf53-
59bb1fbf126b 4096 4096 260062 260062 sha1
4f76354c86e430e27426d584a726f2fbffecae32 7e4085342d634065269631ac9a199e1a43f4632c 1 ignore_zero_blocks'
[ 1.217643] device-mapper: init: dm-0 is ready
[ 1.226694] device-mapper: verity: 8:6: data block 0 is corrupted
[ 1.227666] device-mapper: verity-avb: AVB error handler called for PARTUUID=
b865935d-38fb-4c4e-b8b4-
70dc67321552
[ 1.234308] device-mapper: verity-avb: invalidate_vbmeta: found vbmeta partition
[ 1.235848] device-mapper: verity-avb: invalidate_vbmeta: completed.
[...]
Bug:
31622239
Test: Manually tested (other arch).
Change-Id: Idf6be32d6a3d28e15de9302aa26ad6a516d663aa
Signed-off-by: David Zeuthen <zeuthen@google.com>
Git-commit:
8d6f006d608c3b03652fb919e496945f2d4d4f1d
Git-repo: https://android.googlesource.com/kernel/common/
[runminw@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
David Zeuthen [Tue, 24 Jan 2017 18:02:35 +0000 (13:02 -0500)]
ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.
This is needed for AVB integration work.
Bug:
31796270
Test: Manually tested (other arch).
Change-Id: I32fd37c1578c6414e3e6ff277d16ad94df7886b8
Signed-off-by: David Zeuthen <zeuthen@google.com>
Git-commit:
6a6a7657c231e947233c43ae0522bbd4edf0139e
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Runmin Wang <runminw@codeaurora.org>
Jordan Crouse [Tue, 18 Apr 2017 17:56:09 +0000 (11:56 -0600)]
ARM: dts: msm: Remove I/O coherence for the GPU
I/O coherence has some limitations that make it less preferable than
the usermode cache operations. Given these limitations the user mode
driver teams have requested that I/O coherence be disabled.
Change-Id: Ic0dedbadbc10b3a6239e20df8b527a5738a1a3a4
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Jordan Crouse [Mon, 3 Apr 2017 14:29:34 +0000 (08:29 -0600)]
drm/msm: Add explicit sync operations
Add sync operations to give the user more control
over the behavior of cached buffers.
Change-Id: Ic0dedbad67e19a6b30b2cc5f6b2c7bbe52c2b708
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Linux Build Service Account [Wed, 26 Apr 2017 13:33:54 +0000 (06:33 -0700)]
Merge "msm: camera: isp: Enable recovery for stats in out of sync case"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:53 +0000 (06:33 -0700)]
Merge "btfm: set watermark level to 3 for wcn3990 slimbus FM slave ports"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:52 +0000 (06:33 -0700)]
Merge "esoc: remove reduntant return_esoc_udev() fn call"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:51 +0000 (06:33 -0700)]
Merge "defconfig: msm: Enable cache dump and common log in perf build"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:50 +0000 (06:33 -0700)]
Merge "power: qpnp-fg-gen3: configure ESR FCC based on Qnovo enable status"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:49 +0000 (06:33 -0700)]
Merge "msm: camera: Fix kernel overwrite GET_BUF_BY_IDX ioctl"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:48 +0000 (06:33 -0700)]
Merge "Revert "soc:qcom: Synchronize service notifier task's""
Linux Build Service Account [Wed, 26 Apr 2017 13:33:47 +0000 (06:33 -0700)]
Merge "ASoC: msm: qdsp6v2: Add support for speaker swap"
Linux Build Service Account [Wed, 26 Apr 2017 13:33:45 +0000 (06:33 -0700)]
Merge "Revert "spi: spi_qsd: Check device state during set_cs call""
Lokesh Kumar Aakulu [Tue, 18 Apr 2017 09:03:16 +0000 (14:33 +0530)]
msm: camera: isp: Enable recovery for stats in out of sync case
When the stats go out of sync across the 2 VFEs, don't treat it
as a fatal error but allow for recovery.
Change-Id: I5ef16b3e823cec9698d3ee0627335653f13fd60d
Signed-off-by: Lokesh Kumar Aakulu <lkumar@codeaurora.org>
Ashay Jaiswal [Wed, 26 Apr 2017 09:04:29 +0000 (14:34 +0530)]
power: smb-lib: Fix charger type reporting
Charger type gets updated in 'smblib_update_usb_type' function
and this should only be called after completion of APSD.
Update the calling sites of 'smblib_update_usb_type' to use
'smblib_get_apsd_result' instead of 'smblib_update_usb_type'.
This ensures charger type doesn't get updated inadvertently.
CRs-Fixed:
2038837
Change-Id: Iaa380c8f02bb71ad0f4367c16ec39d86d825dfa2
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Utkarsh Saxena [Wed, 26 Apr 2017 09:36:09 +0000 (15:06 +0530)]
msm: ipa: Fix race condition between shared memory
Protect the common shared wlan_comm_desc_list with
spin lock to avoid the race condition.
Change-Id: I02ef6c6b663340711e0e2f766424d642aaa8d7af
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
Jiangen Jiao [Mon, 24 Apr 2017 03:21:24 +0000 (11:21 +0800)]
ARM: dts: msm: Add QRD device nodes for HDK660/630 boards
Add device tree support for QRD HDK660, HDK630 boards.
Change-Id: I65e7537f2ae0e7d04ccab11342925e0457f4198b
Signed-off-by: Jiangen Jiao <jiangenj@codeaurora.org>
Rupesh Tatiya [Tue, 18 Apr 2017 13:55:11 +0000 (19:25 +0530)]
btfm: set watermark level to 3 for wcn3990 slimbus FM slave ports
Without this, we hear silence or delay in sound during FM playback in
following use cases -
1. Switching between FM and media applications like YouTube
2. Changing volume during FM FTM
Change-Id: I51072ab70e6bc34e1ed10222ee289d987ed9ffbf
Signed-off-by: Rupesh Tatiya <rtatiya@codeaurora.org>
Mohammed Khajapasha [Tue, 11 Apr 2017 12:22:54 +0000 (17:52 +0530)]
esoc: remove reduntant return_esoc_udev() fn call
Remove reduntant return_esoc_udev() function call
while deleting a esoc device from an esoc clink.
Change-Id: Id2e812addb1bd8af0e23c4182427adbee9731a58
Signed-off-by: Mohammed Khajapasha <mkhaja@codeaurora.org>
Trishansh Bhardwaj [Tue, 18 Apr 2017 09:14:43 +0000 (14:44 +0530)]
msm: camera: Fix kernel overwrite GET_BUF_BY_IDX ioctl
Assign address of buf_info into ioctl_ptr.
Previously we were copying first 8 bytes of buf_info (content)
into ioctl_ptr. Which is dereferenced and written later causing
kernel overwrite vulnerability.
Change-Id: Ie5deae249da8208523027f8ec5632f960757e9bd
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
Hareesh Gundu [Fri, 21 Apr 2017 10:08:13 +0000 (15:38 +0530)]
msm: kgsl: Perform cache operation with kernel address
Kernel should never access untrusted pointers directly.
If the address is not mapped to kernel, map to kernel
address space and perform cache related operation.
Change-Id: I433befcde620e51b8ec17954ddb710f6084e0592
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Linux Build Service Account [Wed, 26 Apr 2017 04:48:58 +0000 (21:48 -0700)]
Merge "msm: mdss: wait for pp done when switching from ON to LP1"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:57 +0000 (21:48 -0700)]
Merge "ath10k: enable wlan hardware checksum for wcn3990"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:56 +0000 (21:48 -0700)]
Merge "clk: qcom: Add support for throttle clocks for clients"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:55 +0000 (21:48 -0700)]
Merge "msm: kgsl: Allow draw context to perform only replay on recovery"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:54 +0000 (21:48 -0700)]
Merge "iommu: disable smmu stalls on faulty transactions"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:53 +0000 (21:48 -0700)]
Merge "drm/msm: Enable per cmdstream profiling for the user"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:52 +0000 (21:48 -0700)]
Merge "msm: mhi_rmnet: clean channel resources only if allocated"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:51 +0000 (21:48 -0700)]
Merge "input: laser: disable laser sensor when camera crash"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:50 +0000 (21:48 -0700)]
Merge "ASoC: wcd934x: force the wdsp clock to be ungated"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:48 +0000 (21:48 -0700)]
Merge "ASoC: msm: qdsp6v2: Add TrueHD HDMI compress pass-though"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:47 +0000 (21:48 -0700)]
Merge "ASoC: wcd-dsp-mgr: force crash upon collecting ramdumps"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:46 +0000 (21:48 -0700)]
Merge "ASoC: msm: qdsp6v2: allow zero size calibration for LSM"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:45 +0000 (21:48 -0700)]
Merge "msm: ipa: return error on channel setup failure"