Commit graph

855765 commits

Author SHA1 Message Date
qctecmdr
046d1cdd64 Merge "f2fs: don't sleep while grabing nat_tree_lock" 2021-09-10 22:17:59 -07:00
qctecmdr
f72ff0bfca Merge "fbdev: msm: Avoid runtime sus/res for DP/HDMI" 2021-09-10 22:17:59 -07:00
Nirmal Abraham
05742e7009 fbdev: msm: Avoid runtime sus/res for DP/HDMI
A race condition is seen between DP pan_display commit
path and pm runtime suspend when DP cable is inserted
when device is in suspend. This causes commit failure
and subseqently display won't wake up from suspend.
Avoid runtime suspend/resume of DP lower interface to
resolve this.

Change-Id: Ia1aea19799df718e0713d0cf0ccc3237bb7a31f3
Signed-off-by: Nirmal Abraham <nabrah@codeaurora.org>
2021-09-09 09:12:08 +05:30
qctecmdr
c2ba15277a Merge "Revert "qseecom: Add shmbrdige to allocate memory"" 2021-09-08 04:44:57 -07:00
qctecmdr
6f964eddd3 Merge "soc: qcom: smsm: Add wakeup capable flags to SMSM IRQ" 2021-09-08 04:44:57 -07:00
Kiran Gunda
252d6c84be uapi: Add UAPI headers for slatecom_interface driver
Add slatecom_interface header file in gen_headers to make it
accessible from userspace modules who uses Android.bp files
for compilation.

Change-Id: Ie298ec28983c16999d941ee8667e2dd7b5c3db22
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
2021-09-08 04:43:44 -07:00
qctecmdr
dd304ccc10 Merge "ANDROID: xt_qtaguid: fix UAF race" 2021-09-08 00:31:01 -07:00
Vivek Golani
94b97191fd soc: qcom: smsm: Add wakeup capable flags to SMSM IRQ
SMSM interrupts are expected even during APPS suspend path.
Added IRQF_NO_SUSPEND flag to handle interrupts during
suspend path.

Change-Id: I1c16a2be7fd0b3e85eebbee54aa472fb4a04bc6e
Signed-off-by: Vivek Golani <vgolani@codeaurora.org>
2021-09-08 12:13:57 +05:30
Jaegeuk Kim
815cc3957a f2fs: don't sleep while grabing nat_tree_lock
This tries to fix priority inversion in the below condition resulting in
long checkpoint delay.

f2fs_get_node_info()
 - nat_tree_lock
  -> sleep to grab journal_rwsem by contention

                                     checkpoint
                                     - waiting for nat_tree_lock

In order to let checkpoint go, let's release nat_tree_lock, if there's a
journal_rwsem contention.

Change-Id: I72ca6cf52908a08976c200be32a09fb3105e726e
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Git-commit: 2eeb0dce728a7eac3e4dfe355d98af40d61f7a26
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
2021-09-06 20:38:19 -07:00
Satish Kodishala
9a96de3c3e Ignore -106 error while opening channel
Ignore -106 error when channel opened
again without closing.

CRs-Fixed: 2836671
Change-Id: Ib27179031e6bbdc20511132efd6c4578d1d0a911
Signed-off-by: Satish Kodishala <skodisha@codeaurora.org>
2021-09-06 11:16:08 -07:00
qctecmdr
8c79c6778a Merge "arm64: defconfig: Set qrtr wakeup for lito" 2021-09-06 02:04:02 -07:00
Linux Build Service Account
ebaaa70d07 Merge 5e1dd0fa05 on remote branch
Change-Id: Ia1da71a6c9c191e43bfcffa5d2015b2dfef752b1
2021-09-05 23:19:58 -07:00
qctecmdr
93d96157e9 Merge "byte-cntr: Don't write csr register when byte-cntr is disabled" 2021-09-04 17:09:40 -07:00
Mao Jinlong
81d63049e6 byte-cntr: Don't write csr register when byte-cntr is disabled
It is possible that byte-cntr release happens after byte-cntr is disabled.
Don't write csr register when byte-cntr is disabled to avoid the register
access issue.

Change-Id: Ic818107e1bcbe31e1a55cdc8c0f6ff89ff70564f
Signed-off-by: Mao Jinlong <jinlmao@codeaurora.org>
Signed-off-by: Yuanfang Zhang <zhangyuanfang@codeaurora.org>
2021-09-03 23:35:11 +08:00
Sarannya S
3acc60ff8f arm64: defconfig: Set qrtr wakeup for lito
Set the wakeup timeout for qrtr to 500 ms for lito. This change
will help ensure the TUI client thread gets a chance to run before
the system is suspended again.

Change-Id: I8c8831995bf58fc39a3e8c107d0fd761745bbfed
Signed-off-by: Sarannya S <sarannya@codeaurora.org>
2021-09-03 13:56:42 +05:30
Chris Lew
898151cd02 net: qrtr: Make wakeup timeout configurable
The qrtr driver can guarantee that the packet gets queued to the socket
but cannot guarantee the client process will get time to run if auto
sleep is enabled. This config will help mitigate missed packets on
systems where auto sleep is too aggressive.

Use the pm_wakeup_ws_event() api so a hard wakeup can be specified.
This will ensure a resume occurs if the data coming in happens while
the device is going into suspend.

Change-Id: Ic596e06e585b3479a6faa1d0210c016fc9138c6e
Signed-off-by: Chris Lew <clew@codeaurora.org>
Signed-off-by: Arun Prakash <app@codeaurora.org>
2021-09-03 13:02:44 +05:30
qctecmdr
459d6fa3a5 Merge "mhi: core: Avoid race condition mhi channel prepare and M0 event" 2021-09-02 08:54:09 -07:00
Vivek Pernamitta
020b270ba1 mhi: core: Avoid race condition mhi channel prepare and M0 event
There is one race condition where mhi_prepare_channel is called
in which read pointer and write pointer is set to base address
and in parallel there could be an MHI M0 transaction which
checks any pending event rings on all channels (tre_ring)
with RP != WP and rings channel DB which causes Null pointer
access. Check for MHI channel is enabled before ringing channel
doorbell. Reset mhi channel chan_ctxt, tre_ring and buf_ring
wp and rp to NULL in mhi_deinit_chan_ctxt.

Change-Id: If30908fc7fcc26f6987bd0da886bb75468a29b9e
Signed-off-by: Vivek Pernamitta <vpernami@codeaurora.org>
2021-09-02 18:07:28 +05:30
qctecmdr
0008d16bc4 Merge "msm: ipa3: Fix to handle zero length frag skb packet" 2021-09-02 04:52:45 -07:00
Sumukh Hallymysore Ravindra
cfe53c62b3 msm: synx: acquire ref of synx handle in each function
The change ensures appropriate reference is held in
each function before accessing valid synx handle.

This avoids release function destroying the synx
handle while any other process is working with the
same handle, leading to use-after-free issues.

Change-Id: I5b828c5ab6f7fcdd5b5a66e04d9c7c827de5d15f
Signed-off-by: Sumukh Hallymysore Ravindra <shallymy@codeaurora.org>
2021-09-02 16:55:38 +05:30
Ashok Vuyyuru
1f9481a658 msm: ipa3: Fix to handle zero length frag skb packet
Due to zero length skb packet IPA HW going to stall state.
Adding changes to avoid sending these zero length SKB frag
packets to HW.

Change-Id: I4dae51bf767588095bc1fcd9e10196e913299227
Signed-off-by: Ashok Vuyyuru <avuyyuru@codeaurora.org>
2021-09-02 10:47:41 +05:30
qctecmdr
8bfcb5a6d4 Merge "cnss_utils: Update the copyright years of file to 2017, 2019-2021" 2021-09-01 02:00:11 -07:00
Mohammed Siddiq
94e62e6085 cnss_utils: Update the copyright years of file to 2017, 2019-2021
Update the copyright years of file to 2017, 2019-2021.

Change-Id: Ic5c6ad17f546b981c131fc6bd0eb573859a104b5
Signed-off-by: Mohammed Siddiq <msiddiq@codeaurora.org>
2021-09-01 12:21:59 +05:30
qctecmdr
5000f94593 Merge "clk: qcom: debugcc: Remove the gcc_camss_camnoc clocks" 2021-08-31 22:41:00 -07:00
qctecmdr
5e1dd0fa05 Merge "FM: mutex changes modified" 2021-08-31 15:48:22 -07:00
Prateek Raj Singh
a86fcb8a51 FM: mutex changes modified
Removed unrequired mutexes, and conditions.

Change-Id: I1d8b9f16f066aea39ffbeee994c8f573972787f5
Signed-off-by: Prateek Raj Singh <pratsing@codeaurora.org>
2021-08-31 08:23:21 -07:00
qctecmdr
1ea01c7be2 Merge "Revert "ANDROID: net: ipv4: sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size"" 2021-08-31 07:30:25 -07:00
qctecmdr
9e50c517ba Merge "coresight: byte-cnter: limit error log output" 2021-08-31 04:02:21 -07:00
qctecmdr
13a10de50e Merge "coresight: byte-cnter: Add ETR status check in bypass notifier" 2021-08-30 23:46:48 -07:00
Zhenlin Lian
7e2a87eb1c Revert "qseecom: Add shmbrdige to allocate memory"
This reverts commit b6b130b0cf.

Change-Id: I1ab38440b496657974a20ed7d98fb3e1a99842a1
Signed-off-by: Zhenlin Lian <lianzhenlin@codeaurora.org>
2021-08-31 09:22:25 +05:30
qctecmdr
d38ae1ea7c Merge "serial: msm_geni_serial: Enable SW flow on in runtime suspend" 2021-08-30 04:30:30 -07:00
qctecmdr
83bfad0dd6 Merge "coresight: byte-cntr: Add ETR status check in bypass notifier" 2021-08-30 04:30:29 -07:00
Maciej Żenczykowski
994c186fe0 Revert "ANDROID: net: ipv4: sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size"
This reverts commit 8f414ea43f.

Test: builds, ran kernel net tests
Bug: 180068784
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Icd52ba17c8c26ab33df6f32b198df70415320d2d
Git-Commit: 46a6031c7e7583f9ffd71543cfc726cd6df29a01
Git-repo: http://source.codeaurora.org/quic/la/kernel/common
Signed-off-by: Kaustubh Pandey <kapandey@codeaurora.org>
2021-08-30 02:23:36 -07:00
Maciej Żenczykowski
bc7325313e Revert "RFC: ANDROID: net: ipv4: sysfs_net_ipv4: Fix TCP window size controlling knobs"
This reverts commit c6bc8ac9c5.

But there are revert conflicts in:
  net/ipv4/tcp_input.c
  net/ipv4/tcp_output.c

which effectively mean those files are not reverted (the relevant portions
of code area already missing).

Test: see follow up commit
Bug: 180068784
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I70bc587e7bae4090dfd101f2427d7cc4fb4435af
Git-Commit: b72347bdd09c65269646ce5eaefd0bb579552a44
Git-repo: http://source.codeaurora.org/quic/la/kernel/common
Signed-off-by: Kaustubh Pandey <kapandey@codeaurora.org>
2021-08-30 02:22:44 -07:00
Jebaitedneko
6b414e784e dts: don't add qcom subdir
we're using vendor/qcom

Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:06 +05:30
Jebaitedneko
d06c973953 build.sh: ship compiled dtb.img and dtbo.img
Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:06 +05:30
Jebaitedneko
379d474a43 arm64: generate dtb.img from dtbs
Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:06 +05:30
Jebaitedneko
f6d5913eb1 dts: enable new tianma and xinli v2 panels
also fixup pwm configuration

Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:06 +05:30
Jebaitedneko
af453d1720 dts: build only bengal-idp-overlay.dtbo and bengal.dtb
Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:05 +05:30
Jebaitedneko
c19c6fa0d3 dts: align bengal.dtb sources to oem
Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:05 +05:30
Jebaitedneko
80bc395a13 dts: align bengal-idp-overlay.dtbo sources to oem
Signed-off-by: Jebaitedneko <Jebaitedneko@gmail.com>
2021-08-30 14:13:01 +05:30
Will McVicker
5efc888dcb ANDROID: xt_qtaguid: fix UAF race
Make sure to hold the sock_tag_list_lock while accessing the tag to
avoid a race between getting the tag and free'ing the tag.

Bug: 184018316
Fixes: c7ca0ac69702 ("ANDROID: netfilter: xt_qtaguid: add qtaguid matching module")
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: Ia44dfcc1693bc3de1d767e024d09c11f4a8b02f9
Git-commit: 2398e650c58a6f4877dafce649188290f6e3b4f5
Git-repo: https://android.googlesource.com/kernel/msm
Signed-off-by: PavanKumar S.R. <pavasr@codeaurora.org>
2021-08-30 13:04:56 +05:30
Tao Zhang
7cdbbb1ff8 coresight: byte-cntr: Add ETR status check in bypass notifier
Add ETR status check while receiving USB_QDSS_CONNECT event.
Otherwise, there will cause crash due to NULL pointer issue.
Since ETR buffer will be released if ETR is disabled.

Change-Id: I358d25477c938844df5bff5c29ddbee307b770e3
Signed-off-by: Tao Zhang <taozha@codeaurora.org>
2021-08-30 13:33:06 +08:00
Madhuri Medasani
563df73427 clk: qcom: debugcc: Remove the gcc_camss_camnoc clocks
Remove the gcc_camss_camnoc clocks from debugcc
which are not registered in GCC to avoid the crash
because of parent index in KHAJE.

Change-Id: Ia8db40e55c3f7d96abb47bb810eb4f13c20e65f2
Signed-off-by: Madhuri Medasani <mmedasan@codeaurora.org>
2021-08-30 10:04:37 +05:30
Pratham Pratap
73f4406f74 usb: f_fs: Avoid invalid pointer access in ffs_fs_get_tree
Consider a case where ffs_data_new is getting called from
ffs_fs_get_tree and ffs_data_new returns error pointer since
the function (e.g. adb) is already mounted. The driver is only
checking for the NULL return value for ffs but in this case it
will not be NULL, which will fail the check and driver will go
ahead accessing invalid pointer which can lead to inconsistencies.

Fix this by having NULL as well as error pointer check for ffs.

Change-Id: Idad5a0b91148325258ea3f545d4da71644c7fc53
Signed-off-by: Pratham Pratap <prathampratap@codeaurora.org>
2021-08-28 10:58:13 -07:00
Gagan Malvi
4611b50c3a
drone: Try GH releases.
Signed-off-by: Gagan Malvi <malvigagan@gmail.com>
2021-08-28 07:11:42 +02:00
Yatish Kumar Singh
5f5b4d05fe serial: msm_geni_serial: Enable SW flow on in runtime suspend
Stop_rx is bailing out in the runtime suspend path because of
parallel data from SOC and there is no SW  FLOW ON from UART,
causing SOC unable to send RX data to host.

Enabled SW flow on if the stop_rx is bailing out during
runtime suspend.

Change-Id: I0dd52fafe99466e6177a60a108132f25a5be570b
Signed-off-by: Yatish Kumar Singh <yatishku@codeaurora.org>
2021-08-27 21:39:12 +05:30
qctecmdr
71add66750 Merge "defconfig: msm: Enable RPM SMD cooling device driver for KHAJE" 2021-08-26 23:39:22 -07:00
qctecmdr
561d9e90c7 Merge "irqchip: mpm: Add mpm mapping for Khaje" 2021-08-26 15:09:52 -07:00
Gopala Krishna Nuthaki
7ace159680 defconfig: msm: Enable RPM SMD cooling device driver for KHAJE
Enable RPM SMD cooling device driver for KHAJE. It monitors
device temperature and request different temperature band levels
to RPM hardware.

Change-Id: Ia0c4deed12ee94f8fa0a6e98950e0654576740e1
Signed-off-by: Gopala Krishna Nuthaki <gnuthaki@codeaurora.org>
2021-08-26 09:47:10 -07:00