OSDN Git Service
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()"
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>
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>
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>
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"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:44 +0000 (21:48 -0700)]
Merge "msm: rmnet_ipa: fix security issue"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:43 +0000 (21:48 -0700)]
Merge "defconfig: Enable support for QBT1000 feature"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:42 +0000 (21:48 -0700)]
Merge "spcom: always wait for glink LOCAL_DISCONNECT event after glink_close()"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:41 +0000 (21:48 -0700)]
Merge "wcnss: fix the race condition issue during cal data extraction"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:40 +0000 (21:48 -0700)]
Merge "cfg80211: increse bss expire time"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:39 +0000 (21:48 -0700)]
Merge "mhi: core: allow communication during shutdown"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:37 +0000 (21:48 -0700)]
Merge "msm: sde: Fix kernel crash after stop streaming timeout"
Linux Build Service Account [Wed, 26 Apr 2017 04:48:36 +0000 (21:48 -0700)]
Merge "msm: camera: Fix for NOC error in CCI"
Sujeev Dias [Fri, 7 Apr 2017 15:53:10 +0000 (08:53 -0700)]
mhi: core: add support for 64bit doorbell address
Doorbell pointers are 64bit addresses. Use correct
data type when passing the address.
CRs-Fixed:
2038601
Change-Id: Ie8e42d38944c0529386b90f5a6d37dcd77c19184
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
Utkarsh Saxena [Tue, 25 Apr 2017 12:09:41 +0000 (17:39 +0530)]
msm: ipa: Fix for missing int overflow check in the refcount library
Overflow of reference counter can lead to memory leak.
Before incrementing the reference count, check with
U32_MAX and return for error check.
Change-Id: Ib96d36574ee086ec73c9836110cb2c98e8ae3d66
Acked-by: Mohammed Javid <mjavid@qti.qualcomm.com>
Signed-off-by: Utkarsh Saxena <usaxena@codeaurora.org>
Avaneesh Kumar Dwivedi [Fri, 21 Apr 2017 14:48:00 +0000 (20:18 +0530)]
Revert "soc:qcom: Synchronize service notifier task's"
This reverts 'commit
79618505009d ("soc:qcom: Synchronize
service notifier task's")'
This commit was made for synchronizing two notifier tasks that
were in race in back to back ADSP SSR testing. The change was to
synchronize two threads by queuing both threads in dedicated work
queue. However this caused certain corner case timing issues
in notification to clients of ADSP PD. So, revert it.
Change-Id: I69b27e2e4529b5f45ce0cc1f4a036412cbf5fab1
Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@codeaurora.org>
Vishnuvardhan Prodduturi [Tue, 11 Apr 2017 12:03:12 +0000 (17:33 +0530)]
ARM: dts: msm: add support for truly amoled panel on sdm660 and sdm630
Add support for truly FHD amoled panel on sdm660 and sdm630 which
helps in validating pm660a functionality.
Change-Id: I017a9d96ec927b984ad1f26a573a74efd753d8eb
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
Taniya Das [Tue, 11 Apr 2017 12:22:38 +0000 (17:52 +0530)]
clk: qcom: Add support for throttle clocks for clients
Throttle axi clocks for camera, display and video needs to be enabled
before the use cases and disable these once their use case is completed.
Change-Id: I2e2e91f4ce7d6f57bf5ced052af2f283bc301070
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Lingutla Chandrasekhar [Mon, 24 Apr 2017 07:17:50 +0000 (12:47 +0530)]
defconfig: msm: Enable cache dump and common log in perf build
With Minidump support, SDI can run in production devices, which would
dump pmic, rpm code and vsense data of the device at system crash as
minidump. Additionally, cache dumps would help to find out cache
corruptions in production devices.
Hence enable cache dump and common log in perf builds.
Change-Id: Ice2ed94bda2903a3fd3ca6dc16c008b7a8fae101
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
Charan Teja Reddy [Thu, 20 Apr 2017 13:41:20 +0000 (19:11 +0530)]
iommu: disable smmu stalls on faulty transactions
Disable the SMMU stalls on faulty transactions by terminating it using
the CB.SCTLR register. Faulty transaction on a CB causes the back
pressure on the QSMMU transaction pipe which inturn affect the other
masters using the same SMMU. Pass the DOMAIN_ATTR_CB_STALL_DISABLE flag
to iommu_domain_set_attr api in order to use this feature.
Change-Id: Ib8fa35854ff24e0295d330c5fb79375f58c3e841
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
Rakesh Pillai [Mon, 6 Mar 2017 13:47:02 +0000 (19:17 +0530)]
ath10k: enable wlan hardware checksum for wcn3990
Add checksum offload flag for the TCP/UDP packet in
Tx path for the wcn3990 wlan module hardware.
CRs-Fixed:
2015363
Change-Id: Icd47de8633bb2375c43c5acdf730a0082bfc1b88
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Sahitya Tummala [Fri, 21 Apr 2017 16:26:19 +0000 (21:56 +0530)]
fs/dcache: Fix indefinite wait in d_invalidate()
In the path of task exit, the proc dentries corresponding to this
task will be killed by moving it to a shrink list. If those dentries
are already claimed by another task for shrinking, the exiting
task waits in a tight loop until those dentries are killed. This can
potentially result in a deadlock if those dentries are corresponding
to an RT task but the task which is shrinking those dentries is a
lower priority task. Fix this by not doing tight loop, if our dentries
are claimed by other task.
Change-Id: If6848521469db7dea2bbba0dbaf8597094716267
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Sujeev Dias [Fri, 21 Apr 2017 04:47:50 +0000 (21:47 -0700)]
msm: mhi_rmnet: clean channel resources only if allocated
It's possible for MHI host to send sys error notification
signal before sending channel enable notification. Attempt
to cleanup resources only if netdev is allocated.
CRs-Fixed:
2037971
Change-Id: I2bd1f10966a042c6f3372adff89572a5795e7daf
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
Skylar Chang [Mon, 24 Apr 2017 22:41:41 +0000 (15:41 -0700)]
msm: ipa: return error on channel setup failure
Return the correct error code when channel setup fails due
to memory allocation.
Change-Id: If345299532f8d04a543e3c7e535d4a7987661d0e
CRs-Fixed:
2028360
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Sujeev Dias [Fri, 21 Apr 2017 21:47:02 +0000 (14:47 -0700)]
mhi: core: allow communication during shutdown
MHI clients allowed to communicate with external
soc via MHI during shutdown. Only disable MHI
communication after receiving shutdown notification.
CRs-Fixed:
2037184
Change-Id: If69f61a244a6175256753dea361085fa5f9afeac
Signed-off-by: Sujeev Dias <sdias@codeaurora.org>
Linux Build Service Account [Mon, 24 Apr 2017 13:48:04 +0000 (06:48 -0700)]
Merge "sched: Add a check for cpu unbound deferrable timers"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:54 +0000 (06:47 -0700)]
Merge "soc: qcom: Request GFP_NOIO for effective memory reclaim"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:52 +0000 (06:47 -0700)]
Merge "clk: qcom: clk-cpu-osm: handle corner cases for APM/MEM-ACC switching"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:52 +0000 (06:47 -0700)]
Merge "msm_11ad: reorder registration with memory dump table"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:51 +0000 (06:47 -0700)]
Merge "ANDROID: fix acl leaks"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:50 +0000 (06:47 -0700)]
Merge "spcom: use mutex on spcom_unlock_ion_buf()"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:49 +0000 (06:47 -0700)]
Merge "soc: qcom: glink: Change GFP_ATOMIC flag for intentless rx"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:48 +0000 (06:47 -0700)]
Merge "msm: mdss: fix a warning for unused value"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:47 +0000 (06:47 -0700)]
Merge "msm: mdss: Populate alpha for compat"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:46 +0000 (06:47 -0700)]
Merge "ARM: dts: msm: Fix RX sensitivity issue for SSPHY for SDM660"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:45 +0000 (06:47 -0700)]
Merge "wcnss: fix the potential memory leak and heap overflow"
Linux Build Service Account [Mon, 24 Apr 2017 13:47:44 +0000 (06:47 -0700)]
Merge "msm: mdss: Separate PP programming to advanced and deferred modes"
Sarada Prasanna Garnayak [Mon, 17 Apr 2017 09:18:16 +0000 (14:48 +0530)]
wcnss: fix the race condition issue during cal data extraction
The wcnss platform driver update the wlan calibration data
by the user space wlan daemon. The wlan user space daemon store
the updated wlan calibration data reported by wlan firmware in
user space and write it back to the wcnss platform calibration
data buffer for the calibration data download and update.
During the wlan calibration data extraction there are some potential
race condition which leads to memory leak and buffer overflow during
the context switch. Fix the above issue by adding protection code.
CRs-Fixed:
2015791
Change-Id: I231807f6b2d8094d7138b95c659ed6272897ba2d
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Tirupathi Reddy [Mon, 24 Apr 2017 06:52:07 +0000 (12:22 +0530)]
clk: qcom: clk-cpu-osm: handle corner cases for APM/MEM-ACC switching
If the open-loop voltage of the highest virtual corner is
below the APM threshold voltage, then OSM should keep
the APM powered by VDD_MX. Also, if the open-loop voltage
of the lowest virtual corner is greater than or equal to
the MEM-ACC threshold voltage, then OSM should program
MEM-ACC settings for Turbo for all corners. Program SEQ_REGn
registers correctly for these two cases.
CRs-Fixed:
2008715
Change-Id: Id9bc91374245d65adda4db337c4fa34afc8f0af9
Signed-off-by: Tirupathi Reddy <tirupath@codeaurora.org>
Hareesh Gundu [Fri, 14 Apr 2017 13:06:20 +0000 (18:36 +0530)]
msm: kgsl: Allow draw context to perform only replay on recovery
Robust context attempts to perform a rendering that takes too long
whether due to an infinite loop in a shader or even just a rendering
operation that takes too long on the given hardware. This type of
attempts can result into GPU faults. Robust context expect driver
to replay IB instead skip IB and if it fails on replay context has
to be invalidated.
KGSL_CONTEXT_INVALIDATE_ON_FAULT flag allows draw context to execute
only replay policy on GPU fault recovery instead of going to default
recovery policy. User space has to set this flag during the context
creation.
Change-Id: If42dc5afc7d5ed1226b73ae5abfa2648d7acf2c3
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Linux Build Service Account [Mon, 24 Apr 2017 06:13:02 +0000 (23:13 -0700)]
Merge "defconfig: msm8998: Use RCU_NOCB for RCU subsystem"
Sharat Masetty [Mon, 17 Apr 2017 06:58:38 +0000 (12:28 +0530)]
drm/msm: Enable per cmdstream profiling for the user
If the user provides a profile buffer identified with a buffer type
MSM_SUBMIT_CMD_PROFILE_BUF, then the driver records the kernel clock
time and gpu ticks at the time of cmdstream submission, and the GPU
records the ticks just before the start of the cmdstream execution and
right after the end of the cmdstream execution.
Change-Id: Ic6298ec5919b18e976ae089ffb0860b8165ce4f3
Signed-off-by: Sharat Masetty <smasetty@codeaurora.org>
Amir Samuelov [Sun, 23 Apr 2017 10:53:27 +0000 (13:53 +0300)]
spcom: use mutex on spcom_unlock_ion_buf()
Only the channel owner app can lock/unlock a channel ion buf.
However, if the app share the ION buf FD with its child tasks,
they might wrongly free the same ion buf twice.
The ion driver panic if a non-valid ION buff handle is provided.
Change-Id: Ia8166df5ea314949090f7e94e90eff3a3ed78b19
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
Amir Samuelov [Thu, 6 Apr 2017 14:28:22 +0000 (17:28 +0300)]
spcom: always wait for glink LOCAL_DISCONNECT event after glink_close()
Wait for glink LOCAL_DISCONNECT event, even if the channel is not
connected.
Change-Id: I03f20b6dbb2f46d7abd6996e8d298e991cf3f82b
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
Linux Build Service Account [Sat, 22 Apr 2017 00:57:38 +0000 (17:57 -0700)]
Merge "msm: mdss: check for audio support before notifying frameworks"
Linux Build Service Account [Sat, 22 Apr 2017 00:57:37 +0000 (17:57 -0700)]
Merge "msm: mdss: add debug bus support for dsi block"
Linux Build Service Account [Sat, 22 Apr 2017 00:57:36 +0000 (17:57 -0700)]
Merge "FROMLIST: 9p: fix a potential acl leak"
Linux Build Service Account [Sat, 22 Apr 2017 00:57:35 +0000 (17:57 -0700)]
Merge "soc: qcom: pil: Avoid possible buffer overflow during Modem boot"
Prasad Sodagudi [Wed, 5 Apr 2017 17:17:19 +0000 (10:17 -0700)]
sched: Add a check for cpu unbound deferrable timers
Add a check for cpu unbound deferrable timer expiry and raise
softirq for handling the expired timers so that the CPU can
process the cpu unbound deferrable times as early as possible
when a cpu tries to enter/exit idle loop.
Change-Id: Ieffa74fa22a4d25493f5590b5ac1e0d784fcbbad
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
Mark Salyzyn [Mon, 23 Jan 2017 20:56:41 +0000 (12:56 -0800)]
ANDROID: fix acl leaks
Fixes regressions associated with commit
073931017b49
("posix_acl: Clear SGID bit when setting file permissions")
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug:
32458736
Change-Id: I6ee127dfdf3594d24ccd8560541ac554c5b05eb6
[d-cagle@codeaurora.org: Resolve merge conflicts]
Git-repo: https://android.googlesource.com/kernel/msm/
Git-commit:
74d0e4d3d96d0ca82d39635318a69d55e966b767
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Cong Wang [Tue, 13 Dec 2016 18:33:34 +0000 (10:33 -0800)]
FROMLIST: 9p: fix a potential acl leak
(https://lkml.org/lkml/2016/12/13/579)
posix_acl_update_mode() could possibly clear 'acl', if so
we leak the memory pointed by 'acl'. Save this pointer
before calling posix_acl_update_mode() and release the memory
if 'acl' really gets cleared.
Reported-by: Mark Salyzyn <salyzyn@android.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Greg Kurz <groug@kaod.org>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Bug:
32458736
Change-Id: Ia78da401e6fd1bfd569653bd2cd0ebd3f9c737a0
Git-repo: https://android.googlesource.com/kernel/msm/
Git-commit:
7c780387c931f63fe67830c817f65c1272512bb1
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>