Commit Graph

646 Commits

Author SHA1 Message Date
lucaswei
56acc710a6 Merge LA.UM.9.12.R2.10.00.00.685.011 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	Documentation/ABI/testing/sysfs-fs-f2fs
	Documentation/filesystems/f2fs.txt
	Documentation/filesystems/fscrypt.rst
	Documentation/sysctl/vm.txt
	Makefile
	arch/arm64/boot/Makefile
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	arch/arm64/kernel/vdso.c
	arch/arm64/mm/init.c
	arch/arm64/mm/mmu.c
	arch/ia64/mm/init.c
	arch/powerpc/mm/mem.c
	arch/s390/mm/init.c
	arch/sh/mm/init.c
	arch/x86/mm/init_32.c
	arch/x86/mm/init_64.c
	block/bio.c
	block/blk-crypto-fallback.c
	block/blk-crypto-internal.h
	block/blk-crypto.c
	block/blk-merge.c
	block/keyslot-manager.c
	build.config.common
	drivers/base/core.c
	drivers/base/power/wakeup.c
	drivers/char/adsprpc.c
	drivers/char/diag/diagchar_core.c
	drivers/crypto/Makefile
	drivers/crypto/msm/qcedev.c
	drivers/crypto/msm/qcrypto.c
	drivers/dma-buf/dma-buf.c
	drivers/input/input.c
	drivers/input/keycombo.c
	drivers/input/misc/gpio_input.c
	drivers/input/misc/gpio_matrix.c
	drivers/input/touchscreen/st/fts.c
	drivers/md/Kconfig
	drivers/md/dm-default-key.c
	drivers/md/dm.c
	drivers/mmc/host/Makefile
	drivers/mmc/host/sdhci-msm-ice.h
	drivers/net/phy/phy_device.c
	drivers/of/property.c
	drivers/pci/controller/pci-msm.c
	drivers/platform/msm/gsi/Makefile
	drivers/platform/msm/ipa/ipa_rm_inactivity_timer.c
	drivers/platform/msm/ipa/ipa_v3/ipa.c
	drivers/platform/msm/ipa/ipa_v3/ipa_pm.c
	drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
	drivers/platform/msm/sps/spsi.h
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/power/supply/qcom/step-chg-jeita.c
	drivers/scsi/ufs/Kconfig
	drivers/scsi/ufs/Makefile
	drivers/scsi/ufs/ufs-qcom-ice.c
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufs-qcom.h
	drivers/scsi/ufs/ufshcd-crypto.c
	drivers/scsi/ufs/ufshcd-crypto.h
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	drivers/soc/qcom/Makefile
	drivers/soc/qcom/msm_bus/msm_bus_dbg.c
	drivers/soc/qcom/msm_bus/msm_bus_dbg_rpmh.c
	drivers/soc/qcom/msm_minidump.c
	drivers/soc/qcom/peripheral-loader.c
	drivers/soc/qcom/smp2p.c
	drivers/soc/qcom/smp2p_sleepstate.c
	drivers/soc/qcom/subsystem_restart.c
	drivers/spi/spi-geni-qcom.c
	drivers/thermal/tsens.h
	drivers/tty/serial/Kconfig
	drivers/tty/serial/msm_geni_serial.c
	drivers/usb/typec/tcpm/fusb302.c
	drivers/usb/typec/tcpm/tcpm.c
	fs/crypto/bio.c
	fs/crypto/crypto.c
	fs/crypto/fname.c
	fs/crypto/fscrypt_private.h
	fs/crypto/inline_crypt.c
	fs/crypto/keyring.c
	fs/crypto/keysetup.c
	fs/crypto/keysetup_v1.c
	fs/crypto/policy.c
	fs/eventpoll.c
	fs/ext4/inode.c
	fs/ext4/ioctl.c
	fs/ext4/page-io.c
	fs/ext4/super.c
	fs/f2fs/Kconfig
	fs/f2fs/compress.c
	fs/f2fs/data.c
	fs/f2fs/dir.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/gc.c
	fs/f2fs/hash.c
	fs/f2fs/inline.c
	fs/f2fs/inode.c
	fs/f2fs/namei.c
	fs/f2fs/super.c
	fs/f2fs/sysfs.c
	fs/ubifs/ioctl.c
	include/linux/bio-crypt-ctx.h
	include/linux/bio.h
	include/linux/blk-crypto.h
	include/linux/blk_types.h
	include/linux/fscrypt.h
	include/linux/gfp.h
	include/linux/keyslot-manager.h
	include/linux/memory_hotplug.h
	include/linux/usb/tcpm.h
	include/linux/usb/typec.h
	include/soc/qcom/socinfo.h
	include/trace/events/f2fs.h
	include/uapi/linux/fscrypt.h
	include/uapi/linux/sched/types.h
	kernel/memremap.c
	kernel/sched/core.c
	kernel/sched/cpufreq_schedutil.c
	kernel/sched/fair.c
	kernel/sched/psi.c
	kernel/sched/sched.h
	kernel/sysctl.c
	lib/Makefile
	lib/test_stackinit.c
	mm/filemap.c
	mm/hmm.c
	mm/memory_hotplug.c
	mm/page_alloc.c
	scripts/gen_autoksyms.sh

Bug: 157994070
Bug: 157858241
Bug: 157879992
Signed-off-by: lucaswei <lucaswei@google.com>
Change-Id: Ib43efc6464e484b85107587c2f770246b48ddee6
2020-06-15 15:36:42 +08:00
Jason Chiu
0e67162d51 Revert "msm: kgsl: Set max size for dma segment"
This reverts commit 260b8bb97f.

Reason for revert: it cause b/158957349

Change-Id: I219cf4f41629c22df1f092324e9c4b44495ff683
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
2020-06-15 05:00:17 +00:00
kdevika
260b8bb97f msm: kgsl: Set max size for dma segment
Kernel Panics with error "mapping sg segment longer than device claims
to support". The device can actually accomodate larger sg segments than
its default segment size. This patch correctly sets max dma segment size
for the device.

Test: Checked KP logs and timing before and after patch change.

Bug: 154829554
Signed-off-by: kdevika <kdevika@google.com>
Change-Id: Ida3130c7d96b3f9a479e09e2558d692f155b8f9c
2020-06-11 13:09:17 +00:00
kdevika
d95a705b95 kgsl: Enhance error logs when memstore limit is reached
If kgsl memstore limit is reached, new kgsl context creation fails. This
leads to app crashes in userspace. This patch enhances debug information
in such cases and dumps the details of the process that captured each
active context.

Bug: 152403810
Test: Forced printing the logs.
[   46.665957] kgsl kgsl-3d0: |kgsl_dump_active_contexts| process droid.launcher3 pid 2397 created 3 contexts
[   46.665954] kgsl kgsl-3d0: |kgsl_dump_active_contexts| process ndroid.systemui pid 1962 created 3 contexts
[   46.665939] kgsl kgsl-3d0: |kgsl_dump_active_contexts| process android.hardwar pid 844 created 3 contexts

Signed-off-by: kdevika <kdevika@google.com>
Change-Id: I06b3751f339c041ab2f7a1aa290e6ab4878b8236
2020-06-09 14:17:44 +00:00
lucaswei
8ef73df591 Revert "supporting modularized CONFIG_DEVFREQ_GOV_QCOM_GPUBW_MON"
This reverts commit 4fb16fdecb3c7773c10e4f51d1c025f45c9fc070.

Bug: 157703508
Reason for revert: cannot boot to home with KP
Change-Id: I2769aff6e977c50a82b93fce8f2f38b0380d818c
Signed-off-by: lucaswei <lucaswei@google.com>
2020-05-30 02:32:56 +08:00
Aaron Ding
9409e27225 supporting modularized CONFIG_QCOM_LLCC
Bug: 157100899
Signed-off-by: Aaron Ding <aaronding@google.com>
Change-Id: Ia9da1f6705d9625fbf5cb5adb1c770f15392ea33
2020-05-30 02:32:49 +08:00
Aaron Ding
6861fdbd74 supporting modularized CONFIG_DEVFREQ_GOV_QCOM_GPUBW_MON
Bug: 157100899
Signed-off-by: Aaron Ding <aaronding@google.com>
Change-Id: Id8efa435b0822540c51c0cd714f15e6768fd2504
2020-05-30 02:32:49 +08:00
Wilson Sung
25cdce6167 Merge LA.UM.9.12.R2.10.00.00.685.004 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
	drivers/scsi/ufs/ufshcd.c
	drivers/tty/serial/msm_geni_serial.c

Bug: 156322859
Change-Id: I0ea6a5a28ff3c1b4b8d4c4d16eb375d987b1d352
Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-05-30 02:32:35 +08:00
lucaswei
95ddbb8a09 Merge LA.UM.9.12.R1.10.00.00.597.042 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	Documentation/ABI/testing/sysfs-fs-f2fs
	Documentation/filesystems/f2fs.txt
	Documentation/filesystems/fscrypt.rst
	Documentation/filesystems/fsverity.rst
	Makefile
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	block/blk-core.c
	build.config.common
	drivers/base/core.c
	drivers/base/power/main.c
	drivers/clk/clk.c
	drivers/clk/qcom/clk-alpha-pll.c
	drivers/dma-buf/dma-buf.c
	drivers/gpu/msm/kgsl_pool.c
	drivers/input/misc/qpnp-power-on.c
	drivers/iommu/dma-mapping-fast.c
	drivers/iommu/io-pgtable-fast.c
	drivers/iommu/io-pgtable-msm-secure.c
	drivers/iommu/io-pgtable.c
	drivers/of/property.c
	drivers/platform/msm/ipa/ipa_clients/ipa_gsb.c
	drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
	drivers/platform/msm/ipa/ipa_v3/ipa_mpm.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/qg-core.h
	drivers/power/supply/qcom/qpnp-qg.c
	drivers/soc/qcom/scm.c
	drivers/staging/android/ion/ion_page_pool.c
	drivers/tty/serial/msm_geni_serial.c
	fs/crypto/Kconfig
	fs/crypto/bio.c
	fs/crypto/crypto.c
	fs/crypto/fname.c
	fs/crypto/fscrypt_private.h
	fs/crypto/hooks.c
	fs/crypto/keyinfo.c
	fs/crypto/policy.c
	fs/ext4/ext4.h
	fs/ext4/hash.c
	fs/ext4/inode.c
	fs/ext4/namei.c
	fs/ext4/page-io.c
	fs/ext4/readpage.c
	fs/ext4/super.c
	fs/ext4/verity.c
	fs/f2fs/Makefile
	fs/f2fs/data.c
	fs/f2fs/dir.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/gc.c
	fs/f2fs/hash.c
	fs/f2fs/inline.c
	fs/f2fs/namei.c
	fs/f2fs/segment.c
	fs/f2fs/super.c
	fs/f2fs/sysfs.c
	fs/f2fs/verity.c
	fs/inode.c
	fs/ubifs/dir.c
	fs/unicode/utf8-core.c
	fs/verity/enable.c
	fs/verity/fsverity_private.h
	fs/verity/hash_algs.c
	fs/verity/open.c
	fs/verity/verify.c
	include/linux/coresight.h
	include/linux/device.h
	include/linux/dma-buf.h
	include/linux/f2fs_fs.h
	include/linux/fscrypt.h
	include/linux/fsverity.h
	include/linux/fwnode.h
	include/linux/leds-qpnp-flash.h
	include/linux/perf_event.h
	include/linux/power_supply.h
	include/linux/unicode.h
	include/soc/qcom/scm.h
	include/uapi/linux/nl80211.h
	kernel/events/core.c
	kernel/sched/core.c
	kernel/sched/fair.c
	lib/Kconfig.debug
	lib/Makefile
	lib/test_meminit.c
	mm/slub.c
	mm/swapfile.c
	mm/vmalloc.c
	net/wireless/nl80211.c
	security/selinux/include/security.h

Bug: 153823050
Bug: 153825378
Signed-off-by: lucaswei <lucaswei@google.com>
Change-Id: Ia2bfb56f0d48504ba600b52bdde958a76d5bff72
2020-05-30 02:28:19 +08:00
Robin Peng
58a95695aa Merge LA.UM.9.12.R1.10.00.00.597.032 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/configs/vendor/kona_defconfig
	arch/arm64/configs/vendor/lito_defconfig
	arch/arm64/include/asm/traps.h
	drivers/power/supply/qcom/qpnp-smb5.c
	kernel/sched/sched.h

Bug: 151568484
Change-Id: I6ed9ae8bc29d93e42b8527ae25074db334c640da
Signed-off-by: Robin Peng <robinpeng@google.com>
2020-05-30 02:18:38 +08:00
Suren Baghdasaryan
26ca615b1a ANDROID: replace NR_INDIRECTLY_RECLAIMABLE_BYTES with NR_KERNEL_MISC_RECLAIMABLE
Use NR_KERNEL_MISC_RECLAIMABLE instead of
NR_INDIRECTLY_RECLAIMABLE_BYTES for kgsl allocations and in sysstats.

Bug: 150808082
Test: build
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ice5167bd9b380bb4c4b4d810aa685d211bcf2f80
2020-05-30 02:16:20 +08:00
Robin Peng
252284b7f7 Merge LA.UM.9.12.R1.10.00.00.597.022 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/configs/vendor/lito_defconfig
	block/blk-merge.c
	drivers/acpi/scan.c
	drivers/soc/qcom/minidump_log.c
	drivers/mmc/core/queue.c
	drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/qpnp-smb5.c
	drivers/power/supply/qcom/smb5-lib.c
	drivers/power/supply/qcom/smb5-lib.h
	drivers/scsi/ufs/ufs.h
	drivers/scsi/ufs/ufshcd.c
	drivers/staging/android/ion/ion_secure_util.c
	drivers/thermal/qcom/Makefile
	drivers/thermal/qcom/adc-tm5.c
	fs/f2fs/data.c
	fs/f2fs/super.c
	include/linux/power_supply.h
	include/linux/qcom-geni-se.h

Bug: 150587879
Bug: 150587495
Bug: 149799837
Bug: 150109764
Change-Id: Ib20ed28d481cee37153148328427e40c32252a5b
Signed-off-by: Robin Peng <robinpeng@google.com>
2020-05-30 02:15:03 +08:00
Robin Peng
18aebe37da Merge LA.UM.9.12.R1.10.00.00.597.021 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	drivers/gpu/msm/kgsl.c
	drivers/scsi/ufs/ufs-sysfs.c
	drivers/soc/qcom/msm_bus/Makefile

Bug: 149175890
Change-Id: If201d9b60bfe4236c51481a9ef0ae8e16a4bcac1
Signed-off-by: Robin Peng <robinpeng@google.com>
2020-05-30 02:07:17 +08:00
Hridya Valsaraju
a2b9e46bc0 GKI: ion: Enable modularization of qcom,msm-ion
This is to enable modularization of CONFIG_ION

Bug: 147914088
Test: build, boot, all devices still probe.
Change-Id: Ic3ca076802ff3071c5a87addcd6552b38d3f9d8a
Signed-off-by: Hridya Valsaraju <hridya@google.com>
2020-05-30 02:04:00 +08:00
Hridya Valsaraju
e81450e2a1 GKI: Revert "GKI: msm: kgsl: Load msm_adreno after msm_drm"
This reverts commit 0277cfc229
as it causes display issues on some lito devices.

Bug: 141888346
Test: build, boot, all devices still probe.

Change-Id: I907fb706f58f77042bbd93ecca2f1f145a44b9d1
Signed-off-by: Hridya Valsaraju <hridya@google.com>
2020-05-30 02:03:01 +08:00
lucaswei
063d3bbb3a Merge 'branch LA.UM.8.13.R1.08.00.00.571.042' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	fs/f2fs/file.c
	kernel/sched/psi.c
	mm/oom_kill.c
	arch/arm64/configs/vendor/lito_defconfig
	include/soc/qcom/socinfo.h

Bug: 147076486
Bug: 147080335
Change-Id: Ic57306e8ac94f89144d350587a358947f37937c2
Signed-off-by: lucaswei <lucaswei@google.com>
2020-05-30 02:02:48 +08:00
lucaswei
5a6769f45c Merge 'branch LA.UM.8.13.R1.08.00.00.571.037' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	arch/arm64/configs/vendor/kona_defconfig
	build.config.common
	drivers/input/touchscreen/Makefile
	drivers/hwtracing/coresight/coresight.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/power/supply/qcom/qg-core.h
	drivers/power/supply/qcom/qpnp-qg.c
	drivers/regulator/qpnp-amoled-regulator.c
	drivers/scsi/ufs/ufs-debugfs.c
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h
	drivers/soc/qcom/Kconfig
	drivers/soc/qcom/Makefile
	drivers/thermal/thermal_core.c
	drivers/usb/phy/phy-msm-ssusb-qmp.c
	fs/f2fs/super.c

Bug: 146397409
Bug: 146529583
Change-Id: I0e973573b350b77222f18ca2a9cb06f18975d943
Signed-off-by: lucaswei <lucaswei@google.com>
2020-05-30 02:00:13 +08:00
Will McVicker
c669b7dabf GKI: msm: kgsl: don't let gmu or kgsl-smmu block suspend or resume
Our GKI hack to probe gmu and kgsl-smmu has lead to an issue with
blocking suspend and resume. To fix this, let's quietly return from the
suspend/resume routines for these devices since the actual
suspend/resume is handled by the main kgsl device.

Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 145884479
Test: verify suspend/resume isn't blocked by gmu and/or kgsl-smmu
Change-Id: I8c68845e98aac7dc1a6559aa703fb51ee672c797
2020-05-30 01:52:49 +08:00
Mark Salyzyn
9aa46ff071 resolve merge conflicts of c61884b4963ba913df06e9ff5a1f98338ae4db67 to android-msm-pixel-4.19-gki-dev
SideEffect: must export kern_addr_valid to build, followup patch fixes.

Bug: None
Test: compile tested on bramble and kona, runtime test on kona
Change-Id: I629358f2d61ac04787b1c82b1167ae7935e24acb
2020-05-30 01:51:41 +08:00
qctecmdr
b7216c012b Merge "msm: kgsl: Do not allow uncached buffers to be marked iocoherent" 2020-05-17 07:09:05 -07:00
qctecmdr
4fa2f91b70 Merge "msm: kgsl: capture more debugbus registers in a702 snapshot" 2020-05-14 00:09:15 -07:00
Urvashi Agrawal
5d77b7e074 msm: kgsl: Do not allow uncached buffers to be marked iocoherent
Add a check to allow only cached buffers to be marked iocoherent.
We can't enable io-coherency for uncached buffers because of
situations where hardware might snoop the cpu caches which can
have stale data. This happens primarily due to the limitations
of dma caching APIs available on arm64.

Change-Id: Iafad086d38559139cb45f6a290071ec6d58ad3a3
Signed-off-by: Urvashi Agrawal <urvaagra@codeaurora.org>
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
2020-05-14 00:02:53 -07:00
qctecmdr
1fc265591f Merge "msm: kgsl: add api to limit gpu fmax" 2020-05-12 23:07:05 -07:00
Puranam V G Tejaswi
337b07afe0 msm: kgsl: capture more debugbus registers in a702 snapshot
Capture the debugbus registers of the block A6XX_DBGBUS_SPTP_0,
which are required to get more information on SP. Also capture
the registers of A6XX_DBGBUS_COM_1 to get MHUB related
information.

Change-Id: Ic68e7bbdd878e88cf4b9aa079544b09ea81038ec
Signed-off-by: Puranam V G Tejaswi <pvgtejas@codeaurora.org>
2020-05-11 23:18:00 -07:00
qctecmdr
554be4fc92 Merge "msm: kgsl: Update GMU FW version for A619 GPU" 2020-05-10 23:56:56 -07:00
Pranav Patel
07e044960d msm: kgsl: add api to limit gpu fmax
Existing api returns failure when requested frequency
is larger than fmax supported. This creates problem to
clients as they consider this as error case. This
can be improved if api returns success when requested
frequency is larger than fmax supported because requested
limit frequency is larger than fmax device will never
go beyond that at all and clients can execute normally.

Change-Id: Id1077ca03019a61d7fd6fef8eccd605131b9c150
Signed-off-by: Pranav Patel <pranavp@codeaurora.org>
2020-05-08 11:15:28 +05:30
Pankaj Gupta
b7881b3817 msm: kgsl: Fix snapshot collection after preempt trigger failure
Do not set FAULT_SKIP_SNAPSHOT in case of not collecting inline
snapshot.

Change-Id: I5f3de5881768ab07de989010096a58bea749c680
Signed-off-by: Pankaj Gupta <gpankaj@codeaurora.org>
2020-04-30 22:20:25 -07:00
qctecmdr
8afd153aa8 Merge "msm: kgsl: Print always on counters in gmu core snapshot" 2020-04-30 10:40:29 -07:00
Hareesh Gundu
437eaecb4a msm: kgsl: Update GMU FW version for A619 GPU
GMU FW version v1.10 is released for A619 GPU. Update
expected GMU firmware version to make sure correct
GMU firmware is used for this GPU.

Change-Id: I3d93f8e022515b8ad853efe37f7812785fac9962
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
2020-04-29 17:20:33 +05:30
Pankaj Gupta
fcb9084089 msm: kgsl: Print always on counters in gmu core snapshot
Print always on counters before collecting gmu core snapshot. This will
help to sync and analyze gmu traces with dmesg.

Change-Id: Icd2223662cce503f8d464592eb4f2307b519f015
Signed-off-by: Pankaj Gupta <gpankaj@codeaurora.org>
2020-04-29 12:39:23 +05:30
qctecmdr
9d7d59072c Merge "msm: kgsl: enable preemption for A702" 2020-04-28 22:34:30 -07:00
qctecmdr
4edf36124a Merge "msm: kgsl: Correctly handle oob and fenced write failures" 2020-04-28 22:34:28 -07:00
qctecmdr
a7c165d3b7 Merge "msm: kgsl: Fix compilation issue for 32bit" 2020-04-26 04:01:42 -07:00
Archana Sriram
5483493a93 msm: kgsl: Fix compilation issue for 32bit
Include cacheflush.h header to fix 32bit
compilation failure.

Change-Id: I1121485491551373eefa9714ac0f25df4b004d9c
Signed-off-by: Archana Sriram <apsrir@codeaurora.org>
2020-04-24 10:58:04 +05:30
qctecmdr
4d4f6ede10 Merge "msm: kgsl: Set gmu fault inside gmu_snapshot" 2020-04-23 10:28:17 -07:00
qctecmdr
d51be33c4e Merge "msm: kgsl: Fix preemption fault handling for A6xx GPU" 2020-04-22 22:25:49 -07:00
qctecmdr
eeaec1bf74 Merge "msm: kgsl: Restart a6xx gpu only once" 2020-04-22 12:01:42 -07:00
qctecmdr
9ba8f0954a Merge "msm: kgsl: Take GMU snapshot on GMU failures" 2020-04-22 12:01:42 -07:00
qctecmdr
b5fd959765 Merge "msm: kgsl: Correctly handle CP_INIT failure" 2020-04-22 12:01:42 -07:00
qctecmdr
28e4776395 Merge "msm: kgsl: Correctly handle gmu fault interrupts" 2020-04-22 12:01:41 -07:00
Puranam V G Tejaswi
e67609ec99 msm: kgsl: enable preemption for A702
Set the bit ADRENO_PREEMPTION in adreno core features
to enable preemption for A702.

Change-Id: If750b2bf607576615a93e85c23d8173891b8018f
Signed-off-by: Puranam V G Tejaswi <pvgtejas@codeaurora.org>
2020-04-22 22:52:50 +05:30
Akhil P Oommen
296e0bb727 msm: kgsl: Fix preemption fault handling for A6xx GPU
In preemption fault handler, check only the STOP bit of
ADRENO_REG_CP_PREEMPT register to see if the preemption is complete.

Change-Id: Id1f2d0947412e996d6028558124c3e528527cec6
Signed-off-by: Akhil P Oommen <akhilpo@codeaurora.org>
Signed-off-by: Sebanti Das <sebadas@codeaurora.org>
2020-04-21 23:01:07 +05:30
Harshdeep Dhatt
44a47803f9 msm: kgsl: Set gmu fault inside gmu_snapshot
The two always happen together. So set the gmu_fault
inside the gmu_snapshot function. Also, if we have
already recorded a gmu fault, then do not send nmi
or try to snapshot a gmu which is already in nmi.

Change-Id: I403a9c2c3cb7a1330a7931c41a23b4b4a2b66998
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-04-21 11:27:46 +05:30
Harshdeep Dhatt
78c56cdb8c msm: kgsl: Correctly handle CP_INIT failure
A stuck CP means that we will not be able to enter
slumber because gmu to cp interaction is impacted.
Therefore, take a gmu snapshot which also sets gmu
fault. The gmu fault will indicate the clean up
code to force a gmu_suspend() so as to set the
stage for the next submission to start afresh.

Change-Id: Ia90e6c447e9c1c87e04cf9ca3ed87eed5c17b07c
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-04-20 22:34:07 -07:00
qctecmdr
555b4c218d Merge "msm: kgsl: Poll GDSCR to ensure CX collapse" 2020-04-20 12:40:03 -07:00
Harshdeep Dhatt
5a51da2e39 msm: kgsl: Take GMU snapshot on GMU failures
GMU can fail to turn on GX or it can fail the
START HFI. So take snapshot and put GMU in NMI.
When this happens, kgsl will call gmu_stop()
and as GMU is already in fault aka NMI, reset
the GMU and GPU.

Change-Id: Iafc9b34063a7ff2415d3462dd289b52e425fbf3b
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-04-20 21:21:56 +05:30
Harshdeep Dhatt
759928339a msm: kgsl: Correctly handle gmu fault interrupts
Send NMI to gmu so that we don't lose critical gmu state.
We do not want to trigger dispatcher because we don't know
whether the gpu was active or not. The best course of action
is to wait for the next kgsl -> GMU interaction to timeout
thus triggering GMU snapshot and appropriate recovery steps
based on whether gpu was active or not.

Change-Id: I17b4245f4e0113bfc902d7dae46bb24d0bc2b65d
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
2020-04-20 14:56:18 +05:30
qctecmdr
7a66ba8bb3 Merge "msm: kgsl: Use milliseconds in Snapshot OS data" 2020-04-19 07:58:04 -07:00
qctecmdr
91b985940f Merge "msm: kgsl: Disable stall on fault for GMU context bank" 2020-04-17 20:34:46 -07:00
qctecmdr
995ea2ed0e Merge "msm: kgsl: Add CP_APRIV_CNTL and CP_SMMU_STREAM_ID regs to snapshot" 2020-04-17 20:34:46 -07:00