Commit graph

877,620 commits

Author SHA1 Message Date
qctecmdr
698604a121 Merge "slim-msm-ngd: Add qmi deferred response check in pm resume" 2020-02-21 15:22:55 -08:00
qctecmdr
0d7ca7e8c4 Merge "usb: gadget: f_fs: set req->num_sgs as 0 for non-sg transfer" 2020-02-21 15:22:54 -08:00
qctecmdr
71b310c375 Merge "memshare: Add snapshot of memshare driver" 2020-02-21 15:22:54 -08:00
qctecmdr
8e17e102ea Merge "HID: qvr: Optimized Viewer Requirements" 2020-02-21 15:22:53 -08:00
qctecmdr
df1e8abb32 Merge "defconfig: arm64: Enable QCOM_SCM driver" 2020-02-20 20:55:50 -08:00
qctecmdr
afffc9638f Merge "msm: adsprpc: Cache invalidate optimization" 2020-02-20 20:55:49 -08:00
qctecmdr
d50c12b3e6 Merge "soc: qcom: Remove incorrect error check from Guest VM PIL Loader" 2020-02-20 20:55:49 -08:00
qctecmdr
3abde01ff2 Merge "firmware: shmbridge: Enable shmbridge by default" 2020-02-20 20:55:49 -08:00
qctecmdr
19d4432def Merge "cnss2: Replace "%p" with "%pK"" 2020-02-20 20:55:48 -08:00
qctecmdr
b0a7db0692 Merge "msm: synx: redesign callback registration and dispatch" 2020-02-20 15:56:52 -08:00
Prudhvi Yarlagadda
e52cc1851b slim-msm-ngd: Add qmi deferred response check in pm resume
Add a check in slimbus runtime resume api to query for qmi
deferred response if deferred response flag is set in the
previous slimbus system suspend api.

Change-Id: Ie306261d512df3417a5f33398bcf2b7160e572d6
Signed-off-by: Prudhvi Yarlagadda <pyarlaga@codeaurora.org>
2020-02-20 18:53:16 +05:30
Prudhvi Yarlagadda
f138490407 slim-msm-ngd: Add wake lock to avoid race with suspend and SSR
Add wake lock in SSR up notification handling to avoid race
condition between system suspend and SSR up handling sequence
which can result in un-clocked access.

Change-Id: I246fa70df53b0cb7acdfcadf9cfe2ce01a3bff6b
Signed-off-by: Prudhvi Yarlagadda <pyarlaga@codeaurora.org>
2020-02-20 02:16:35 -08:00
Peter Chen
88259d89b8 usb: gadget: f_fs: set req->num_sgs as 0 for non-sg transfer
commit d2450c6937018d40d4111fe830fa48d4ddceb8d0 upstream.

The UDC core uses req->num_sgs to judge if scatter buffer list is used.
Eg: usb_gadget_map_request_by_dev. For f_fs sync io mode, the request
is re-used for each request, so if the 1st request->length > PAGE_SIZE,
and the 2nd request->length is <= PAGE_SIZE, the f_fs uses the 1st
req->num_sgs for the 2nd request, it causes the UDC core get the wrong
req->num_sgs value (The 2nd request doesn't use sg). For f_fs async
io mode, it is not harm to initialize req->num_sgs as 0 either, in case,
the UDC driver doesn't zeroed request structure.

Cc: Jun Li <jun.li@nxp.com>
Cc: stable <stable@vger.kernel.org>
Fixes: 772a7a724f ("usb: gadget: f_fs: Allow scatter-gather buffers")
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I5df62ff47afb05d0ed02a396d4c67de23160e6c4
Git-commit: d2450c6937018d40d4111fe830fa48d4ddceb8d0
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2020-02-19 12:26:20 -08:00
qctecmdr
5e3eb7b668 Merge "kernel_headers: Add missing mem-buf.h UAPI header file" 2020-02-19 12:11:32 -08:00
Isaac J. Manjarres
52cc3ab46b kernel_headers: Add missing mem-buf.h UAPI header file
Add the missing mem-buf.h UAPI header file to the list
of headers.

Change-Id: Ie073ff95179be642d5d7a4acb2009ea568dae0d1
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-02-19 10:31:59 -08:00
qctecmdr
87279d8c5f Merge "clk: qcom: clk-alpha-pll: Remove already enabled warning in PLL configs" 2020-02-19 08:01:00 -08:00
qctecmdr
320e1b8e4d Merge "net: wireless: Add snapshot of db.txt" 2020-02-19 08:01:00 -08:00
qctecmdr
8b6392d0d8 Merge "ion: Fix pool refill error" 2020-02-19 08:00:59 -08:00
qctecmdr
221036dcf1 Merge "dt-bindings: interconnect: Add disp specific nodes for Lahaina" 2020-02-19 08:00:59 -08:00
Manoj Prabhu B
8650e54e96 memshare: Add snapshot of memshare driver
The patch is a snapshot of memshare driver taken from msm-4.19 commit
<cfab229348515> (Merge "defconfig: Remove unnecessary config for
bengal 32bit").

Change-Id: I90d59259e887e2cd0c7e16e81407668c807d0530
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
2020-02-19 21:09:49 +05:30
qctecmdr
8bbd1df388 Merge "defconfig: lahaina: Enable the Type-C alternate mode driver" 2020-02-19 03:17:51 -08:00
qctecmdr
e75b390bd6 Merge "iommu: qti: Track iommu domains" 2020-02-19 03:17:51 -08:00
qctecmdr
31fe3b6464 Merge "msm: kgsl: Do not mark all buffers as iocoherent" 2020-02-19 03:17:51 -08:00
Chris Goldsworthy
0fc8b8b245 ion: Fix pool refill error
When performing secure pool allocations, it's possible to
spuriously trigger pool refill attempts for the cached and
uncached pools. Fix this by adding a check to see if we're
performing a secure allocation or not, before refilling a pool.

Change-Id: I9a415a302ca92790e6a793784020b09dea6a86e1
[cgoldswo@codeaurora.org: Fix merge conflicts]
Signed-off-by: Chris Goldsworthy <cgoldswo@codeaurora.org>
2020-02-19 01:50:40 -08:00
David Dai
4bb1211873 dt-bindings: interconnect: Add disp specific nodes for Lahaina
Add node IDs for interconnect nodes that target display BCMs
and display specific voter.

Change-Id: If3c30c517417b2621b7ea768a7a61254cd0982d2
Signed-off-by: David Dai <daidavid1@codeaurora.org>
Signed-off-by: Georgi Djakov <gdjako@codeaurora.org>
2020-02-19 00:35:44 -08:00
qctecmdr
98e83a9de0 Merge "serial: msm_geni_serial: Cover console under GENI_CONSOLE config" 2020-02-18 18:45:19 -08:00
qctecmdr
7895836686 Merge "mm: make faultaround produce old ptes" 2020-02-18 18:45:18 -08:00
qctecmdr
7c15235756 Merge "defconfig: msm: Enable QUPv3 drivers on Lahaina QGKI perf image" 2020-02-18 18:45:18 -08:00
qctecmdr
c231872b48 Merge "iommu: iommu-debug: Fix race with respect to test buffer allocation" 2020-02-18 18:45:17 -08:00
qctecmdr
ffd6caeb9c Merge "msm: cvp: Disable CVP power collapse" 2020-02-18 18:45:17 -08:00
Vivek Aknurwar
f31f05bffa clk: qcom: clk-alpha-pll: Remove already enabled warning in PLL configs
It is expected that PLLs are already enabled since
boot usually enable PLLs. clk_hw_get_name can't be
used in clock pre-registration stage since hw->core
will be NULL.

PLL already enabled warning is valid in enable path.

Change-Id: I9040426f2803e5a413d919b143de6fa59098b09b
Signed-off-by: Vivek Aknurwar <viveka@codeaurora.org>
2020-02-18 17:36:18 -08:00
qctecmdr
deb357dcf4 Merge "clk: qcom: gcc-lahaina: Enable gpu_memnoc_gfx and gpu_snoc_dvm_gfx always" 2020-02-18 14:35:53 -08:00
qctecmdr
e95684caeb Merge "haven: Pass doorbell irq number to client callback" 2020-02-18 14:35:53 -08:00
qctecmdr
2ad77720d7 Merge "power: supply: qti_battery_charger: Handle generic notification" 2020-02-18 14:35:52 -08:00
qctecmdr
7a3a08b2a4 Merge "msm: cvp: buffer managerment optimization for Lahaina" 2020-02-18 14:35:52 -08:00
Mahesh Kumar Kalikot Veetil
71a3560bd0 cnss2: Replace "%p" with "%pK"
The format specifier %p can leak kernel addresses. Use "%pK" instead.
The behaviour of "%pK" depends on the 'kptr_restrict sysctl'.

Change-Id: I65882067783100e7b9ecdc1e697b93948945b4ea
CRs-Fixed: 2616581
Signed-off-by: Mahesh Kumar Kalikot Veetil <mkalikot@codeaurora.org>
2020-02-18 10:19:05 -08:00
Elliot Berman
10aa2cf5ac defconfig: arm64: Enable QCOM_SCM driver
Enable QCOM_SCM driver on genericarmv8-64_defconfig.

Change-Id: I238739b4d421644ee3ce96d17c1f8adb4047579d
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-02-18 08:38:52 -08:00
Elliot Berman
710a5ef7f1 arm64: Kconfig: Add ARCH_QCOM dependency for ARCH_QTI_VM
ARCH_QTI_VM is an ARCH_QCOM platform.

Change-Id: Ic5dd9aae9eb2457261d985eb075b2562755fb0d3
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-02-18 08:38:52 -08:00
Elliot Berman
f5e7418644 defconfig: arm64: Add ARCH_QCOM config
Add ARCH_QCOM to genericarmv8-64_defconfig. ARCH_QCOM selects GPIOLIB
and PINCTRL, so those options get removed from defconfig.

Change-Id: I25d7e5e36ecd115679f623ec5cb91a2134da0705
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-02-18 08:38:29 -08:00
Elliot Berman
ce32b9ac95 haven: Pass doorbell irq number to client callback
Clients may need irq number to handle doorbell, e.g. to use a common irq
handler framework.

Change-Id: Iab64a0ce3330eab2b8fa052e9d8b9b9856510e6a
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
2020-02-18 08:31:59 -08:00
Isaac J. Manjarres
bced4952ab iommu: iommu-debug: Fix race with respect to test buffer allocation
When the buffer pointed to by test_virt_addr is allocated, there
is no synchronization with respect to checking if it is necessary
to allocate the buffer. This can lead to various adversarial
scenarios, where multiple concurrent allocations of the same
buffer can occur, resulting in memory leaks.

To avoid these scenarios, make the check and allocation of the
buffer atomic with respect to other accesses to test_virt_addr.

Change-Id: Ie7e05930042b0bbf4bec0a4f1f5b325970023a5a
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-02-18 06:36:42 -08:00
Patrick Daly
39cc9a4594 iommu: qti: Track iommu domains
Add a new module to track iommu domains, including those which
may not currently be active. Supports multiple types of smmu
drivers.

Change-Id: Iacb98d823db8a87a2cf0868c467914847351950b
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
[isaacm@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-02-18 06:34:11 -08:00
Patrick Daly
209228f315 iommu: iommu-debug: Remove CONFIG_IOMMU_DEBUG_TRACKING
Remove this interface in preparation for a more modern replacement.

Change-Id: I84e6827167be54366bb78c6389131119ca6ccd33
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
[isaacm@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-02-18 06:33:55 -08:00
Isaac J. Manjarres
1526eb0939 arm64: defconfig: Disable CONFIG_IOMMU_DEBUG_TRACKING
Disable this Kconfig in preparation for its removal.

Change-Id: Ifff0c6d2f92b56b67b31a9c4caa8dc4d42e1ee5c
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-02-18 06:33:39 -08:00
Dedy Lansky
f3faf2e8cf net: wireless: Add snapshot of db.txt
This change adds snapshot of the db.txt.
This snapshot is taken as of commit <d8a1c5fd0d2d8>
(net: wireless: update db.txt for 60GHz band).

Change-Id: Ibadad5ccdb006fda79b4d494a1995fb77995b953
Signed-off-by: Dedy Lansky <dlansky@codeaurora.org>
Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
2020-02-18 16:17:23 +02:00
Alexei Avshalom Lazar
7478b98826 Revert "cfg80211: reg: remove support for built-in regdb"
This reverts commit c8c240e284.

Restore support for internal regulatory database. It is
needed since Android does not have CRDA.

Change-Id: Ie60e0f4dd450c6efbbc8643e01c946bc11b557ee
Signed-off-by: Lior David <liord@codeaurora.org>
Signed-off-by: Alexei Avshalom Lazar <ailizaro@codeaurora.org>
2020-02-18 16:17:16 +02:00
qctecmdr
1e97619791 Merge "arm64: defconfig: Enable CONFIG_PANIC_ON_OOPS" 2020-02-18 00:46:01 -08:00
qctecmdr
d5b3b6eb7a Merge "arm64: defconfig: Enable QCOM watchdog for Lahaina" 2020-02-18 00:46:01 -08:00
qctecmdr
15af7d21bc Merge "iommu-debug: allocate test_virt_addr when reading it" 2020-02-18 00:46:01 -08:00
qctecmdr
72bd5c7146 Merge "lib/list_sort: fix function type mismatches" 2020-02-18 00:46:00 -08:00