Commit graph

876,284 commits

Author SHA1 Message Date
Jordan Crouse
3a2abcbc85 iommu: Fixup selftests
Commit fb3f251037 ("iommu/arm-smmu: Merge all IOMMU changes from msm-4.19
to msm-lahaina") added some enhanced selftest functions for io-pgtable-arm
and io-pgtable-fast but they still had older APIs for the IOMMU
operations.

Change-Id: Ic0dedbad3ce8339bc471afb83113b47cd169d5cc
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-01-08 13:25:40 -07:00
Jordan Crouse
2b6002f8df ion: Fix API changes in dma-buf-ref.c
Commit fe5698e796 ("ion: Merge all ION related changes from msm-4.19 to
msm-lahaina") added the file dma-buf-ref.c but it was using an older
kernel API for the stack trace management. Fix up the API to work
with 5.4.

Change-Id: Ic0dedbad6f0603ace4c8dc92e6789e043e7fdfa9
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2020-01-08 13:25:40 -07:00
qctecmdr
b60524e9c2 Merge "msm: ipa: Add SMMU driver as soft dependency for IPA" 2020-01-08 04:58:57 -08:00
qctecmdr
2483f85924 Merge "qseecom: Add qseecom driver snapshot for Lahaina" 2020-01-08 03:23:03 -08:00
qctecmdr
588d9a8be4 Merge "include: sound: add stub function for wcd dsp manager" 2020-01-08 02:40:25 -08:00
qctecmdr
c4754c3e48 Merge "dt-bindings: Add new port types for SWR 1.6 feature" 2020-01-08 02:00:58 -08:00
qctecmdr
160be75a7c Merge "defconfig: lahaina-gki: enable ufs 7nm phy for lahaina" 2020-01-08 01:22:29 -08:00
qctecmdr
605e1eb14c Merge "phy: qcom-ufs: add 7nm UFS QMP PHY support on Lahaina" 2020-01-08 00:37:28 -08:00
qctecmdr
d750b39007 Merge "interconnect: qcom: Fix MACRO fields for Lahaina" 2020-01-07 20:37:31 -08:00
qctecmdr
2c5445837e Merge "iinterconnect: qcom: Hold high bandwidth vote for keepalive BCMs" 2020-01-07 19:58:26 -08:00
qctecmdr
7da699bec8 Merge "scsi: ufshcd-qti: Port the new crypto framework to QTI ufs" 2020-01-07 18:47:16 -08:00
Aditya Bavanari
701f0e8aed dt-bindings: Add new port types for SWR 1.6 feature
Add new port types for SWR 1.6 feature to accommodate
unified SWR Tx port mapping.

Change-Id: Ib3ac905c12628ea90b24ca26d29fde24e8ba0309
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
2020-01-07 16:51:57 -08:00
qctecmdr
4495d8274f Merge "msm: kgsl: Refactor IOMMU contexts" 2020-01-07 16:32:22 -08:00
qctecmdr
db96989477 Merge "msm: kgsl: Support global secure memory objects" 2020-01-07 15:23:35 -08:00
qctecmdr
37db9fecc5 Merge "msm: kgsl: Add a function to map global buffers" 2020-01-07 14:47:32 -08:00
qctecmdr
9cab59b92c Merge "msm: kgsl: Calculate the offset of context bank 0" 2020-01-07 13:53:32 -08:00
qctecmdr
36a6b6c608 Merge "arm64: qcom: Enable QTI config" 2020-01-07 12:11:42 -08:00
David Dai
750497d529 interconnect: qcom: Fix MACRO fields for Lahaina
Fix the incorrect definitions for BCMs that have the wrong
ordering between keepalive and num_nodes.

Change-Id: I7ce368444c0a10eea223c391abbf1c1ea00d3d45
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2020-01-07 10:23:46 -08:00
David Dai
8279d7e0ae iinterconnect: qcom: Hold high bandwidth vote for keepalive BCMs
Add a high bandwidth vote for critical NoCs during boot up.

Change-Id: I739df67083e13f542c0021054b1ca4c1f2d9bd09
Signed-off-by: David Dai <daidavid1@codeaurora.org>
2020-01-07 10:23:00 -08:00
qctecmdr
113f80cdcf Merge "iommu/arm-smmu: Rename the ARM SMMU module" 2020-01-07 09:57:12 -08:00
Asutosh Das
e77dbbbc96 scsi: ufshcd-qti: Port the new crypto framework to QTI ufs
This is a snapshot of the crypto driver changes taken as of
msm-4.19 commit <Id3a3c379eb1>
("ANDROID: scsi: ufs: UFS crypto variant operations API").

Change-Id: I5a80c2ba9ccdbc5125e7e5507fbf49cd1dcfce66
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2020-01-07 09:51:02 -08:00
qctecmdr
71208b8ab7 Merge "scsi: ufs-qti: Check for valid vcc before accessing" 2020-01-07 09:12:14 -08:00
qctecmdr
f1ed9b23aa Merge "iommu/arm-smmu: Use dev_iommu_fwspec_get() to retrieve IOMMU fwspec" 2020-01-07 08:36:35 -08:00
qctecmdr
b0585180a5 Merge "iommu/arm-smmu: Unregister TBU driver when unloading the SMMU module" 2020-01-07 08:02:42 -08:00
qctecmdr
687b078378 Merge "iommu/arm-smmu: Add missing iommu_device_unregister()" 2020-01-07 07:20:30 -08:00
qctecmdr
2b9c58c7eb Merge "msm: tsens: Add Tsens driver snapshot" 2020-01-07 05:28:23 -08:00
qctecmdr
8456aba1cb Merge "regmap: Quit the read-loop based on position of file-offset" 2020-01-07 04:48:41 -08:00
qctecmdr
576b0d3156 Merge "Revert "drivers: qcom: cmd-db: modularize commandDB driver"" 2020-01-07 03:38:34 -08:00
Ghanim Fodi
2b4fd1474a msm: ipa: Add SMMU driver as soft dependency for IPA
IPA driver uses SMMU driver for IPA accesses.
SMMU driver need to be loaded before IPA driver for
GKI configuration.

Change-Id: I72b4bdc52c54837875f9628097b8ab1759d7524c
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2020-01-07 03:10:30 -08:00
qctecmdr
321ba0dbe8 Merge "msm: ipa: fix ipa_disable_apps_wan_cons_deaggr declaration" 2020-01-07 02:59:26 -08:00
qctecmdr
219108d0e3 Merge "msm: ipa3: IPA clock vote ioctl" 2020-01-07 02:11:20 -08:00
qctecmdr
c6ee0e7602 Merge "arm64: defconfig: Enable slimbus driver config for lahaina" 2020-01-07 01:33:51 -08:00
qctecmdr
1070f3fe7d Merge "defconfig: lahaina: Enable ADC drivers for lahaina" 2020-01-07 00:52:13 -08:00
qctecmdr
427a09ef8d Merge "arm64: defconfig: Enable all memory hotplug related configs on Lahaina" 2020-01-06 23:58:07 -08:00
qctecmdr
90c477596b Merge "msm: ipa3: IPA clock vote ioctl" 2020-01-06 23:22:09 -08:00
qctecmdr
00e3b2aa32 Merge "coresight: tmc: etr: Add sys interface for ETR" 2020-01-06 21:16:11 -08:00
qctecmdr
dbda2794b3 Merge "msm: cvp: remove additional checks in response_handler" 2020-01-06 20:39:03 -08:00
qctecmdr
33a38d88b2 Merge "thermal: adc-tm: Add support for PMIC7 ADC_TM" 2020-01-06 20:00:20 -08:00
qctecmdr
68af8c2603 Merge "thermal: adc-tm: Add ADC_TM driver snapshot" 2020-01-06 19:18:35 -08:00
Meng Wang
d0c27052c9 include: sound: add stub function for wcd dsp manager
wcd dsp manager is not needed on some devices. Add stub functions
for initialize and exit.

Change-Id: I8ed0977bddb820ccad04c6a8b9729fd3b2a7d507
Signed-off-by: Meng Wang <mengw@codeaurora.org>
2020-01-07 10:14:01 +08:00
qctecmdr
f305d3b58f Merge "arm64: defconfig: Enable WALT for Lahaina" 2020-01-06 17:44:01 -08:00
Isaac J. Manjarres
e317564e4c iommu/arm-smmu: Rename the ARM SMMU module
In the GKI configuration, the arm-smmu-mod module will already
be present as a GKI module (i.e. the module will be generated from
the GKI ARM SMMU source). As such, there is no way to distinguish
between Qualcomm's ARM SMMU module, and the GKI ARM SMMU module,
since they have the same name. Thus, rename Qualcomm's ARM SMMU
module to distinguish between the two.

Change-Id: I6a41d3d518a800da4d560c8b8d2b8c48f1866d9a
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-01-06 16:33:46 -08:00
Anirudh Ghayal
40e7dc2fd6 regmap: Quit the read-loop based on position of file-offset
Some implementation's of the 'cat' command pass the
absolute position of the file-offset. In the current
implementation of 'regmap_data_read_file' this leads
to dumping all the registers from offset 0.

Avoid this by quitting the read loop if the file-offset
requested is lower than actual read-offset.

Change-Id: I7c6c31958e92f16387bf4cb5de7fbf4572fcce21
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
2020-01-06 16:22:05 -08:00
Asutosh Das
f263ac46cf arm64: qcom: Enable QTI config
This enables the QTI specific ufs core driver.
The upstream core driver is skipped when enabled.

Change-Id: Ia2c3932aa627245495d1ff70027c2f9f9c3a5bc0
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2020-01-06 16:14:30 -08:00
Asutosh Das
4eb78fc2b5 scsi: ufs-qti: Check for valid vcc before accessing
This patch fixes a NULL pointer dereference by checking
if vccq & vccq2 are valid before dereferencing it.

Change-Id: Ieb5aefab77428adbbbbf892f2be1a9942d7c3851
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
2020-01-06 16:12:44 -08:00
Isaac J. Manjarres
cf2f94d573 iommu/arm-smmu: Use dev_iommu_fwspec_get() to retrieve IOMMU fwspec
Use the dev_iommu_fwspec_get() accessor, instead of directly
accessing the device structure for the IOMMU fwspec, as well
as remove an unnecessary forward declaration.

Change-Id: Id09202bd468bddbf8bdf194513fda34b59756fba
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-01-06 15:58:35 -08:00
Isaac J. Manjarres
e57dc23fb1 iommu/arm-smmu: Unregister TBU driver when unloading the SMMU module
When the ARM SMMU module is unloaded, the exit routine does not
fully clean-up after the initialization routine, as it leaves
the TBU driver registered. Thus, unregister the TBU driver
when unloading the SMMU module.

Change-Id: I536f756dab7eebeffe0dd907629feed6657a2532
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-01-06 15:58:34 -08:00
Isaac J. Manjarres
fa1dabd437 iommu/arm-smmu: Add missing iommu_device_unregister()
The remove() callback for the ARM SMMU driver should ensure
the SMMU devices that are being registered are no longer
visible to the IOMMU framework, so remove the devices
by invoking iommu_device_unregister().

Change-Id: I87dd7b4619e5b26b7eed64b04e3716f3b9c417c5
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
2020-01-06 13:54:50 -08:00
Jia Ding
35a816d085 msm: ipa: fix ipa_disable_apps_wan_cons_deaggr declaration
ipa_disable_apps_wan_cons_deaggr() has different declarations when
CONFIG_IPA or CONFIG_IPA3 are not set. Thus fix the declaration to
align with CONFIG_IPA or CONFIG_IPA3 enabled one.

Change-Id: Ic09cac2484c9cfbcd0833583c05c6fc19a3c2aed
Signed-off-by: Jia Ding <jiad@codeaurora.org>
2020-01-06 13:34:53 -08:00
Lina Iyer
9385860b4f Revert "drivers: qcom: cmd-db: modularize commandDB driver"
This reverts commit 75afa532e7.
Too many things rely on cmd-db to be built in to allow it to
be built as a module.

Change-Id: I317ba89a7d3c9f88832e73834b65bcccac79bbe1
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
2020-01-06 14:31:45 -07:00