Commit graph

878,439 commits

Author SHA1 Message Date
qctecmdr
a4ba75b838 Merge "defconfig: enable msm_performance driver on Lahaina" 2020-02-25 17:08:00 -08:00
Mayank Rana
76543a194c ucsi: start usb host mode when partner type is power cable/ufp
Currently UCSI framework doesn't perform anything in terms of USB role
when partner type is reported as power cable or power cable with ufp
connected. This results into no USB host mode functionality. This is
valid usecase where user wants to use legacy type c power cable with
type a female connector to attach different USB devices like mouse,
thumb drive etc. Hence start USB host mode when partner type is
reported as power cable or power cable with ufp connected.

Change-Id: Id9e7fe74f6a50a0fd92d1d13cb54e918d42c7711
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2020-02-25 16:02:09 -08:00
Harshdeep Dhatt
6f44033fb9 msm: kgsl: Remove the extra recovery hop
Currently, when we try to boot the gmu and it fails,
we force off the gmu gdsc followed by an inline
attempt to boot the gmu again. To do this, we go an
extra mile to do complex snapshot and power state
magic.

The same goal can be achieved by a simpler and
easier to maintain code path:

Set the state to KGSL_STATE_RESET upon gmu boot failure
so that the error path performs a RESET -> SLUMBER
transition. Here, we can reset the GMU so that next
SLUMBER exit can start afresh.

Change-Id: I4d3e75f40062e9fe5d71fe1e6010dfff75e09321
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-02-25 16:14:11 -07:00
Harshdeep Dhatt
be60d9a000 msm: kgsl: Set bus scaling function during gmu probe
When setting the bus scaling function, we are checking for gmu
based targets before gmu has probed. Simplify this by setting the
bus scaling function to interconnect by default. Then, replace
it with gmu based routine during gmu probe. This works because
only gmu based targets set bus votes via gmu.

Change-Id: Ib332e736b39e0f38b1028049422ba95bd0370839
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-02-25 16:14:10 -07:00
Harshdeep Dhatt
75a9117cad msm: kgsl: Keep a copy of CP INIT cmdstream
This way, we don't have to do checks when composing the CP INIT
cmdstream. This will also be used by eCP.

Change-Id: I91dc54b18aee0443d5a2724daeaadc5224de1a92
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-02-25 16:14:09 -07:00
Harshdeep Dhatt
e9fad773e6 msm: kgsl: Clear halt before gmu boot
During hard reset if we are not able to toggle the CX gdsc,
the halt will remain asserted at the time of next GMU boot.
This causes GMU boot to fail and lead to NoC errors. So clear
the halt bit before attempting GMU boot. Also, move the wptr
retention out among the rest of the register writes instead of
piling them inside a6xx_gmu_start().

Change-Id: Id214e0a9261c1f14de13864c715cf1a9d415e1e7
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-02-25 16:10:59 -07:00
Zhen Kong
d2ea1d0733 qseecom: change qseecom_process_listener_from_smcinvoke
change qseecom_process_listener_from_smcinvoke parameters to work
with smcinvoke and upstream scm driver.

Change-Id: Ib5c12f731a4b8f3fba44b3bf8818da023080d708
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2020-02-25 14:52:51 -08:00
Dinesh K Garg
a57d36c9df firmware: qcom_scm: fix for missing listener id
__qcom_scm_invoke_smc() receives buffer to pass data received
in ret[2] but fails to copy data. Fixing the issue by copying
data into buffer.

Change-Id: Ia448f6c9ef680e8c1e98c6bf62f6f125d0dabddc
Signed-off-by: Dinesh K Garg <dineshg@codeaurora.org>
2020-02-25 14:46:13 -08:00
Satya Tangirala
c83b552741 Merge fbe changes from upstream 5.4
b7b3af9 BACKPORT: FROMLIST: Update Inline Encryption from v5 to v6 of patch series
4f6a1f4 ANDROID: ufshcd-crypto: export cap find API
e25d82c ANDROID: block: provide key size as input to inline crypto APIs
3e8cceb ANDROID: block: add KSM op to derive software secret from wrapped key
8173487 ANDROID: fscrypt: add support for hardware-wrapped keys
8aaaa67 ANDROID: block: fix some inline crypto bugs
9f8ee7b ANDROID: block: export symbols needed for modules to use inline crypto
0faba9a FROMLIST: scsi: ufs: add program_key() variant op
403731b ANDROID: ext4, f2fs: enable direct I/O with inline encryption
1fc06ba ANDROID: block: Introduce passthrough keyslot manager
695cfeb ANDROID: dm: add support for passing through inline crypto support
85942bc ANDROID: dm: enable may_passthrough_inline_crypto on some targets
5515324 ANDROID: dm: add dm-default-key target for metadata encryption
792b182 ANDROID: gki_defconfig: enable dm-default-key
3ab1972 ANDROID: block: Prevent crypto fallback for wrapped keys
a142356 ANDROID: dm: add support for passing through derive_raw_secret
0dccdc0 ANDROID: dm: Add wrapped key support in dm-default-key

Git-repo: https://android.googlesource.com/kernel/common/+/refs/heads/android-5.4
Change-Id: Ida31c27ac24457efc1aa0343806e2f32a056167b
Signed-off-by: Gaurav Kashyap <gaurkash@codeaurora.org>
2020-02-25 13:27:21 -08:00
Raghu Ananya Arabolu
dfdd7d2890 msm: kgsl: Override UBWC configuration for A660 based on DDR type
The highest bank bit defined in the A660 gpucore structure defaults
to DDR type 8. If underlying DDR is type 7, then modify the highest
bank bit accordingly.

Change-Id: Idd36f69227dca63eef19c1ac1843b88982346edd
Signed-off-by: Raghu Ananya Arabolu <rarabolu@codeaurora.org>
2020-02-25 11:41:45 -08:00
Raghu Ananya Arabolu
27b9110ce7 msm: kgsl: Add A660 hardware clock gating register values
Set the hardware clock gating register values for A660.

Change-Id: I9121e285d05cf9ad8d29762f4c3e8954d0760aa7
Signed-off-by: Raghu Ananya Arabolu <rarabolu@codeaurora.org>
2020-02-25 11:23:19 -08:00
Chaitanya Pratapa
c16db4912f msm: ipa: Fix ipa3_wwan_xmit return type
This change will fix the error thrown by CFI for the return type of
ipa3_wwan_xmit.

Change-Id: Ib201debb338295f3a83bf07f51e0434cd3519db4
Acked-by: Priyadarshini Rajagopal <prajagop@qti.qualcomm.com>
Signed-off-by: Chaitanya Pratapa <cpratapa@codeaurora.org>
2020-02-25 09:58:07 -08:00
qctecmdr
e2298d13da Merge "thermal: adc-tm: Correct a macro expression for PMIC7 ADC_TM" 2020-02-25 09:08:40 -08:00
qctecmdr
963f98e807 Merge "thermal: adc-tm: Fix compilation recipe in makefile" 2020-02-25 09:08:40 -08:00
Pavankumar Kondeti
79af30b00c sched: walt: Improve the scheduler
This change is for general scheduler improvements.

Change-Id: I4623a59eca688209110c347d388df2a2839a6287
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
[satyap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2020-02-25 07:42:34 -08:00
Pavankumar Kondeti
b8176d1852 sched: walt: Improve the scheduler
This change is for general scheduler improvements.

Change-Id: I49218b594f77ab416c317e952865d889fd9a2058
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
[satyap@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2020-02-25 07:42:31 -08:00
Pavankumar Kondeti
538d90229e sched: walt: move walt_stats member in cfs_rq under CFS_BANDWIDTH
The walt_stats member (walt_sched_stats structure) defined in cfs_rq
is only needed when CFS_BANDWIDTH feature is enabled. So add this
member under CFS_BANDWIDTH feature in cfs_rq structure.

Change-Id: I9ddfb00da3377a66a18522eaecdb8b0f76517e8e
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2020-02-25 07:42:26 -08:00
Santosh Mardi
0a016eaf4f sched: use rq_clock if WALT is not enabled
Use rq_clock to send timestamp to util update handler
if WALT is not enabled in the system.

Change-Id: I1e367c506a2fc286a4dfbac9d1f6cdd897d31f2d
Signed-off-by: Santosh Mardi <gsantosh@codeaurora.org>
2020-02-25 07:42:15 -08:00
Lingutla Chandrasekhar
09de85d415 trace: Add trace points for tasklet entry/exit
Tasklets are supposed to finish their work quickly and
should not block the current running process, but it is not
guaranteed that. Currently softirq_entry/exit can be used to
know total tasklets execution time, but not helpful to track
individual tasklet's execution time. With that we can't find
any culprit tasklet function, which is taking more time.

Add tasklet_entry/exit trace point support to track
individual tasklet execution.

Change-Id: I3496d15f64d020916774e673ccb4a8116ea2f2c9
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
[satyap@codeaurora.org: remove hi trace points and update commit text]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
2020-02-25 07:37:13 -08:00
Jishnu Prakash
fb4cbd1530 defconfig: lahaina-qgki: Remove CONFIG_IIO config from QGKI
Remove CONFIG_IIO from lahaina-QGKI fragment as it is now present
in gki_defconfig and not needed here any longer.

Change-Id: I2d231c77c836489840e73326ce60455d58a2c93a
Signed-off-by: Jishnu Prakash <jprakash@codeaurora.org>
2020-02-25 03:14:08 -08:00
qctecmdr
0b0f7507d8 Merge "scripts: gki: Add proper MAKE PATH" 2020-02-24 23:48:26 -08:00
qctecmdr
86fc732fcf Merge "defconfig: arm64: Remove QTEE_SHM_BRIDGE" 2020-02-24 23:48:26 -08:00
Kishore Sri venkata Ganesh Bolisetty
5bdc103fcd defconfig: enable msm_performance driver on Lahaina
Enable msm_performance driver as a part of Lahaina porting.

Change-Id: Ib73af3655061a823f64ea0c9f863aa405c67e85e
Signed-off-by: Kishore Sri venkata Ganesh Bolisetty <bsrivenk@codeaurora.org>
2020-02-24 16:28:18 -08:00
qctecmdr
fb60b1ec0f Merge "eud: Handle multiple events with eud interrupt" 2020-02-24 10:05:45 -08:00
Georgi Djakov
8569b9083a interconnect: Move internal structs into a separate file
Move the interconnect framework internal structs into a separate file,
so that it can be included and used by ftrace code. This will allow us
to expose some more useful information in the traces.

Change-Id: I97720025fcff087e19ddf6eb1f092fd42b5b78b2
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Git-commit: dd018a9cf9108f9c7d924f6fe09aed745e78a67e
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Georgi Djakov <gdjako@codeaurora.org>
2020-02-24 06:36:41 -08:00
David Dai
fdcc9fb12c interconnect: qcom: Add multiple voter support
Add support for targeting alternate bcm-voters which
live under different RSC devices.

Change-Id: Ia1ad8a4c6c6b8531f0dae67cc7b22e2faa55c418
Signed-off-by: David Dai <daidavid1@codeaurora.org>
Signed-off-by: Georgi Djakov <gdjako@codeaurora.org>
2020-02-24 00:32:15 -08:00
Can Guo
44deea45b2 defconfig: Enable UFS BSG driver
Enable UFS BSG driver to allow using IOCTL access
to UFS device through block BSG framework.

Change-Id: If4fc792e4341648c6875c770ddb524dc6dbc8692
Signed-off-by: Can Guo <cang@codeaurora.org>
2020-02-23 18:29:15 -08:00
qctecmdr
41085c0732 Merge "defconfig: lahaina: Enable DYNAMIC_DEBUG" 2020-02-22 21:57:43 -08:00
qctecmdr
1d4c3f6e17 Merge "defconfig: lahaina-gki: enable the glink debug spmi controller driver" 2020-02-22 06:56:47 -08:00
qctecmdr
ccc6432793 Merge "msm: ipa: Update WLAN pipes to use WLAN2 clients" 2020-02-22 03:05:00 -08:00
qctecmdr
400cd3cb0d Merge "msm: ipa: Update debugfs to print rules correctly" 2020-02-22 03:04:59 -08:00
qctecmdr
c4c0342260 Merge "msm: kgsl: Enable I/O coherency on A660" 2020-02-22 03:04:59 -08:00
qctecmdr
d04a88f455 Merge "scsi: ufshcd-qti: Fix hibern8 timeout during scaling" 2020-02-22 03:04:58 -08:00
qctecmdr
080896109c Merge "crypto: msm: add compat_qcedev to support 32bit process" 2020-02-21 23:21:34 -08:00
qctecmdr
567aba740c Merge "msm: adsprpc: protect access of context table" 2020-02-21 23:21:34 -08:00
qctecmdr
e447076b15 Merge "soc: qcom: msm_perf: Add msm_performance module" 2020-02-21 23:21:33 -08:00
qctecmdr
18ac4e51b9 Merge "memory_dump: add new feature for cpuss dump" 2020-02-21 23:21:33 -08:00
qctecmdr
66e62fa3be Merge "clk: qcom: gpucc-lahaina: Remove CLK_IS_CRITICAL" 2020-02-21 23:21:33 -08:00
qctecmdr
e90faea39f Merge "drivers: llcc: Remove programming of cache override registers" 2020-02-21 23:21:32 -08:00
qctecmdr
18cd038375 Merge "dt-bindings: clock: update DisplayPort clock names for Lahaina" 2020-02-21 23:21:32 -08:00
qctecmdr
9159031f61 Merge "clk: qcom: remove flags for byte div clk src" 2020-02-21 23:21:31 -08:00
qctecmdr
3ffb183dd9 Merge "Merge android-5.4.7 (861433ef) into msm-5.4" 2020-02-21 19:28:05 -08:00
qctecmdr
f8abd34ab6 Merge "HID: qvr: Correct axes orientation" 2020-02-21 19:28:04 -08:00
qctecmdr
2d9c616106 Merge "msm-geni-serial: Use dma_alloc_coherent to avoid dma map/unmap" 2020-02-21 15:22:55 -08:00
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
David Collins
a8916a4c5f defconfig: lahaina-gki: enable the glink debug spmi controller driver
Enable the spmi-glink-debug driver so that PMIC charger and fuel
gauge registers can be accessed for debug purposes.

Change-Id: I650241b513a4c8c0424f102b164b42984d66b644
Signed-off-by: David Collins <collinsd@codeaurora.org>
2020-02-21 15:19:15 -08:00
David Collins
ab1c140c93 spmi: add glink debug spmi controller driver
Add an SPMI controller driver for the Glink PMIC register
dumping debug interface.  This can be used to read and write
PMIC registers controlled by the charging firmware running
on a remote processor (e.g. DSP).

Change-Id: I10d0c345e35613c708eea0d2fbb9fd0e03ecf2b5
Signed-off-by: David Collins <collinsd@codeaurora.org>
2020-02-21 15:19:08 -08:00