Commit graph

599173 commits

Author SHA1 Message Date
Guchun Chen
06af1c706e drm: msm: hw ctl needs to care reserved pipe
When kernel operates hw ctls, early RVC in bootloader
can also co-exist to update hardware registers. So it's
needed to care the reserved pipe by early RVC before
kernel starts to handle ctl setup.

CRs-Fixed: 2225630
Change-Id: I2df06350a44bd128dfb89cc0668c41d2edfb26a6
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2018-05-05 18:54:34 +08:00
Linux Build Service Account
bf3bda0f81 Merge "drm/msm/hdmi: partial revert for hdmi->power_on changes" 2018-05-04 16:11:21 -07:00
Linux Build Service Account
6b0ad7611a Merge "ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform" 2018-05-03 19:58:45 -07:00
Linux Build Service Account
ea40a6c521 Merge "sched/walt: Fix use after free in trace_sched_update_task_ravg()" 2018-05-03 11:23:20 -07:00
Linux Build Service Account
cebf59e494 Merge "msm: ais: isp: Handling buffer use after getting it freed" 2018-05-03 02:07:35 -07:00
Linux Build Service Account
3fe5a8a331 Merge "gpio: No NULL owner" 2018-05-03 02:07:33 -07:00
Linux Build Service Account
58f82482c4 Merge "defconfig: Enable preemptirq tracing for msm8998 and sdm660" 2018-05-03 02:07:28 -07:00
Gerrit - the friendly Code Review server
6abf20ea97 Merge changes into msm-4.4 2018-05-03 00:33:44 -07:00
Zhaoyang Liu
d1271b24c9 ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform
Enable IEEE802.11AD WiFi device wil6210.
Change wil6210 PCIe parent for MSM8996 platform.

Change-Id: I58919c766c0e6f0090d309492de1ecf12718824d
Signed-off-by: Zhaoyang Liu <zhaoyang@codeaurora.org>
2018-05-03 12:52:36 +08:00
Pavankumar Kondeti
c6a5b958e6 sched/walt: Fix use after free in trace_sched_update_task_ravg()
commit 4d09122c1868 ("sched: Fix spinlock recursion in sched_exit()")
moved freeing of task's current and previous window arrays outside
the rq->lock. These arrays can be accessed from another CPU in parallel
and end up using freed memory. For example,

CPU#0                                 CPU#1
----------------------------------    -------------------------------
sched_exit()                          try_to_wake_up()--> The task wakes
                                                          up on CPU#0
 task_rq_lock()                        set_task_cpu()
                                        fixup_busy_time() --> waiting for
					                  CPU#0's rq->lock

 task_rq_unlock()                       fixup_busy_time()-->lock acquired
 free_task_load_ptrs()
  kfree(p->ravg.curr_window_cpu)         update_task_ravg()-->called on
                                                          current of CPU#0
					  trace_sched_update_task_ravg()
					          --> access freed memory
  p->ravg.curr_window_cpu = NULL;

To fix this issue, window array pointers must be set to NULL before
freeing the memory. Since this happens outside the lock, memory barriers
are needed on write and read paths. A much simpler alternative would be
skipping update_task_ravg() trace point for tasks that are marked as dead.
The window stats of dead tasks are not updated any ways. While at it, skip
this trace point for newly created tasks for which also window stats are
not updated.

Change-Id: I4d7cb8a3cf7cf84270b09721140d35205643b7ab
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
[spathi@codeaurora.org: moved changes to hmp.c since EAS is not supported]
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-05-02 21:46:48 -07:00
Linus Walleij
e29ce8dc74 gpio: No NULL owner
Sometimes a GPIO is fetched with NULL as parent device, and
that is just fine. So under these circumstances, avoid using
dev_name() to provide a name for the GPIO line.

Change-Id: Iacf2ef35d50118cd755e26ed4211c3c4b1289ff2
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Git-commit: 7d18f0a14aa6a0d6bad39111c1fb655f07f71d59
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2018-05-02 21:42:17 -07:00
Linux Build Service Account
9da06237e8 Merge "Merge android-4.4.129 (b1c4836) into msm-4.4" 2018-05-02 13:38:40 -07:00
Linux Build Service Account
6fa93fc89f Merge "ANDROID: sound: rawmidi: Hold lock around realloc" 2018-05-02 13:38:38 -07:00
Linux Build Service Account
c4afe0cea6 Merge "msm: ipa: using debug logging instead of error logging" 2018-05-02 13:38:37 -07:00
Linux Build Service Account
db7e413924 Merge "mmc: core: power cycle card when sd card switch voltage operation fails" 2018-05-02 13:38:37 -07:00
Linux Build Service Account
02a4346ae7 Merge "mmc: card: WARN_ON in cmdq completion context" 2018-05-02 13:38:35 -07:00
Linux Build Service Account
29bde1572e Merge "defconfig: Enable cellular hints in regulatory cfg80211" 2018-05-02 13:38:34 -07:00
Daniel Rosenberg
742017e8de ANDROID: sound: rawmidi: Hold lock around realloc
The SNDRV_RAWMIDI_STREAM_{OUTPUT,INPUT} ioctls may reallocate
runtime->buffer while other kernel threads are accessing it.  If the
underlying krealloc() call frees the original buffer, then this can turn
into a use-after-free.

Most of these accesses happen while the thread is holding runtime->lock,
and can be fixed by just holding the same lock while replacing
runtime->buffer, however we can't hold this spinlock while
snd_rawmidi_kernel_{read1,write1} are copying to/from userspace.  We
need to add and acquire a new mutex to prevent this from happening
concurrently with reallocation.  We hold this mutex during the entire
reallocation process, to also prevent multiple concurrent reallocations
leading to a double-free.

Signed-off-by: Daniel Rosenberg <drosen@google.com>
bug: 64315347
Change-Id: I05764d4f1a38f373eb7c0ac1c98607ee5ff0eded
[dcagle@codeaurora.org: Resolve trivial merge conflict]
Git-repo: https://android.googlesource.com/kernel/msm
Git-commit: d7193540482d11ff0ad3a07fc18717811641c6eb
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>
2018-05-02 05:13:18 -07:00
Linux Build Service Account
cb0e8e7c96 Merge "leds: qpnp-flash-v2: Modify current code calculation" 2018-05-02 04:54:41 -07:00
Linux Build Service Account
bf8090cf06 Merge "hab: import/export between remote buffer and dmafd" 2018-05-02 04:54:40 -07:00
Linux Build Service Account
2542cb864f Merge "i2c-msm-v2: Add support for suspend to disk" 2018-05-02 04:54:39 -07:00
Linux Build Service Account
aab4834f1e Merge "diag: Validate query dci event and log mask size properly" 2018-05-02 04:54:38 -07:00
Linux Build Service Account
c38b834398 Merge "Merge android-4.4.128 (89904cc) into msm-4.4" 2018-05-02 04:54:37 -07:00
Linux Build Service Account
1c294945bc Merge "usb: gadget: ffs: Multi-instance fix for use after free case" 2018-05-02 04:54:36 -07:00
Linux Build Service Account
b0b4c8bfd4 Merge "tracing: always define trace_{irq,preempt}_{enable_disable}" 2018-05-02 04:54:35 -07:00
Linux Build Service Account
e16f4fa16b Merge "cpuidle: lpm-levels: Fix snprintf string format" 2018-05-02 04:54:33 -07:00
Linux Build Service Account
ff39bce7b8 Merge "soc: qcom: rpm_stats: Fix snprintf string format" 2018-05-02 04:54:32 -07:00
Mohammed Javid
f01d00d213 msm: ipa: using debug logging instead of error logging
Adding code changes to controlling logs printing
on the console changing error logging to debug logging

Change-Id: I35f4c0e3380ad700899808d9cd6c260befb8be8f
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-05-02 03:24:26 -07:00
Ram Prakash Gupta
7716fb9b8f mmc: core: power cycle card when sd card switch voltage operation fails
As per the sd card spec, mmc need to power cycle sd card in case sd
card voltage switch operation fails. Currently we are directly going
for low speed mode without power cycle, which is in violation of sd
card spec. Now we will retry for 10 times in case timeout happens
while switching voltage and at last, in case, it did not succeed in
switching sd card voltage, mmc would go for low speed mode.

Change-Id: Icece08732b8d52104e0890dce81ad16844265edd
Signed-off-by: Ram Prakash Gupta <rampraka@codeaurora.org>
2018-05-02 15:14:25 +05:30
Pradeep P V K
4c4c2ded21 mmc: card: WARN_ON in cmdq completion context
Due to command queuing, there is a possibility of servicing
completion of multiple requests from hw irq context. So in
this case, hw irq will launch softirq for all requests which
were completed (irrespective of whether it was success or failure).

If one of the requests failed, then the softirq corresponding
to error ed request will set current cmdq state to CMDQ_STATE_ERR.
Because of this, subsequent completion softirqs for successful
requests will BUG_ON.

We should let higher layers know of completion of successful
requests. Hence change the BUG_ON to WARN_ON and skip
blk_end_request() only if the corresponding request has
an error (instead of checking if the cmdq state is in error)

Change-Id: Ieb7f9d12ba04b6ab6499bf29f3716b0ddfb880fb
Signed-off-by: Pradeep P V K <ppvk@codeaurora.org>
2018-05-02 00:04:40 -07:00
Suprith Malligere Shankaregowda
3945168c9c msm: ais: isp: Handling buffer use after getting it freed
In the code, start_fetch can try to access the buffer
pointer variable after free, as the same pointer can
can be freed at RELEASE_BUF call too at the same time.
Hence fixing this race condition.

Change-Id: I05825fb3423f95bc251e79416de50dc32cf086dc
Signed-off-by: Suprith Malligere Shankaregowda <supgow@codeaurora.org>
2018-05-01 23:17:58 -07:00
Linux Build Service Account
d1507b1236 Merge "usb: dwc3-msm: Resume PHY before notify_connect on start_host" 2018-05-01 17:00:40 -07:00
Linux Build Service Account
6934044c51 Merge "ASoC: msm: move tdm grp mgt to afe for anc support" 2018-05-01 17:00:37 -07:00
Amar Singhal
2f15a9ac96 defconfig: Enable cellular hints in regulatory cfg80211
The user-space may send regulatory hint that has cellular sub-type
enabled. To process such events, enable
CONFIG_CFG80211_REG_CELLULAR_HINTS.

Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Change-Id: I79aceece8e7f17bbcf8186b03c74d82be82c5a4c
CRs-Fixed: 2201959
2018-05-01 16:38:48 -07:00
Linux Build Service Account
2223ffa69b Merge "drm/msm/sde: increase gpu input fence timeout to 10 seconds" 2018-05-01 06:26:41 -07:00
Linux Build Service Account
e6e01da7c4 Merge "drm: msm: add uevent handler to release pipes" 2018-05-01 06:26:39 -07:00
Linux Build Service Account
8517b96791 Merge "drm: msm: add early splash support on triple displays" 2018-05-01 06:26:38 -07:00
Linux Build Service Account
f43d6a5263 Merge "msm: ipa: rmnet: Make code changes with respect to CR#2046006" 2018-05-01 06:26:37 -07:00
Linux Build Service Account
f7b7bdea5a Merge "Revert "adv7481: return error when PLL lock fails"" 2018-05-01 06:26:36 -07:00
Linux Build Service Account
58d23d8d65 Merge "ath10k: update wowlan config and rekey data store method" 2018-05-01 06:26:35 -07:00
Linux Build Service Account
aa6d4b9770 Merge "net: ipc_router: Remove wakeup-source for Sensor ports" 2018-05-01 06:26:34 -07:00
Linux Build Service Account
0af3c13aa0 Merge "ASoC: msm: Update channel mixer weight mixer control" 2018-05-01 06:26:32 -07:00
Linux Build Service Account
036d89dd56 Merge "soc: msm: add apr sensor domain support" 2018-05-01 06:26:31 -07:00
Linux Build Service Account
7df7eae8eb Merge "audio: qdsp6v2: add retry when EAGAIN for habmm_socket_recv" 2018-05-01 06:26:28 -07:00
Linux Build Service Account
b98369d69b Merge "msm: camera: sensor: Adjust csiphy skew filter setting" 2018-04-30 21:09:08 -07:00
Linux Build Service Account
b09928fabb Merge "msm: camera: Change data type of data rate" 2018-04-30 21:09:06 -07:00
Linux Build Service Account
1a61dab660 Merge "esoc: Use standard reset time for mdm9x55 atomic reset" 2018-04-30 21:09:02 -07:00
Mohammed Javid
4987fb136c msm: ipa: rmnet: Make code changes with respect to CR#2046006
Check for CAP_NET_ADMIN capability of the user
space application who tries to access rmnet driver IOCTL.

Change-Id: If6bb4b54659306c5103b5e34bf02c7234c851e0a
CRs-Fixed: 2226355
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-04-30 00:07:34 -07:00
Vijay kumar Tumati
f35c51fe09 msm: camera: sensor: Adjust csiphy skew filter setting
Change camera csiphy skew filter setting to match HPG.

Change-Id: I21d63daa95bd1901b6343e7ff47f05e259a1a8a1
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
2018-04-30 10:41:26 +05:30
Linux Build Service Account
866d379212 Merge "msm: Allocate fd with O_CLOEXEC flag" 2018-04-29 21:09:50 -07:00