drm/msm/a8xx: GPU state capture support
Subsystems (4)
Rob Clark
maintainerv5 cover drm/msm/a8xx: GPU state capture support
This series introduces gen8 devcoredump support. Compared to previous gens, it:
1. Switches to generated tables. Compared to hand modifying headers from kgsl (which were originally generated, then adjusted a bit by hand before adding to kgsl tree. And then copied to drm/msm and lightly modified some more in the process).
In the process, we also switch to generated cp_protect tables.
2. Aligns to the "snapshot" format that kgsl/etc use for hw state capture. The non-generation specific bits (SMMU fault info, capturing relevant BOs, etc) still works as before. Everything gen8 specific gets encoded as "snapshot" sections, ascii85 encoded in the resulting devcoredump file (similar to captured BOs).
3. Try to make it easier to at least compare kgsl snapshot code with upstream, for porting fixes/etc. State capture is tedious and mind- numbing, and the last thing you want to do when debugging a GPU hang is going down the rabbit hole of having to first debug gpu state capture.
However, I don't love kgsl_snapshot_add_section(). It does avoid duplicating snapshot header stuff everywhere. But the ergonomics are not great. So instead I went with "align with what I wish kgsl looked like..
The mesa/crashdec side of this is at:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/45304
I'd appreciate tested-by's on Hawi, Maili, Milos, and Pakala, since I don't have these devices at-hand to test myself. To test devcoredump, you can use the msm_recovery test in igt.. or just:
cat /sys/kernel/debug/dri/*/gpu > /dev/null
NOTE: I'm still tracking down some descrepancies compared to kgsl. I
think at least we should be matching on the excluded access- protected regs, so hopefully collecting a devcoredump doesn't make things go boom. Tested on glymur (windows fw) and on kaanapali MTP (android fw).
NOTE: Uses $codename for generated file/table names, rather than continue
to perpetuate the equally meaningless gen8_x_y naming from kgsl into upstream. At least the codenames are familiar upstream and this removes an extra level of name translation.
v5:
- Fix inverted IS_ERR_OR_NULL() check
- Drop IFPC fixes (moved to their own series)
- Link to v4: https://lore.kernel.org/all/[email protected]/
v4:
- Drop RB_GC_GMEM_PROTECT from nonctx list, now that we are computing
the value directly
- Add missing 'break' in switch
- Move RBBM_MISC_STATUS read to after we check GX is on
- Rename sysprof_setup
- Add cleanup.h support for disabling IFPC, and use it in debugfs
snapshot path
- Collect tags
- Link to v3: https://lore.kernel.org/all/[email protected]/
v3:
- Drop generated nonctx list for now
- Exclude access protected registers
- Shuffle around some debugbus blocks to match kgsl
- Use CP_PROTECT_PIPE regs to pickup the extra spans if we exceed the
64 CP_PROTECT_GLOBAL regs
- Inhibit IFPC for gpu debugfs dump
- Fix cx_dbgc capture
- Misc other small fixes
- Link to v2: https://lore.kernel.org/all/[email protected]/
v2:
- Fix incorrect protect list for Kaanapali
- Use __free() for snapshot_sect finalization
- Fix missing early return error path in gen8_snapshot_mempool()
- Fix aperture setting in gen8_legacy_snapshot_mvc()
- Fix first_slice in gen8_snapshot_mempool()
- Remove GBIF regs in generated nonctx list
- Link to v1: https://lore.kernel.org/all/[email protected]/
Rob Clark (15):
drm/msm: Import adreno_snapshot.h
drm/msm/a8xx: Export aperture helpers drm/msm/a8xx: Add a8xx_aperture_acquire_raw() drm/msm/a8xx: Export slice helper
drm/msm/a8xx: Add missing a850 ifpc reglist entries drm/msm/a8xx: Allow nonctx reglist to include GMU regs drm/msm/a8xx: Stop getting GMEM_PROTECT from nonctx list drm/msm/adreno: Fix PROTECT span length drm/msm/adreno: add temporary __maybe_unused drm/msm/a8xx: Import generated headers drm/msm/a8xx: devcoredump state capture support drm/msm/a8xx: Add all CP_PROTECT_PIPE to pwrup reglist drm/msm/a8xx: Use CP_PROTECT_PIPE regs drm/msm/a8xx: Switch to generated protect regs drm/msm/adreno: Remove temporary __maybe_unused
drivers/gpu/drm/msm/Makefile | 4 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 7 + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 14 +- drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 404 +-- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 65 +- drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c | 1401 ++++++++++ .../gpu/drm/msm/adreno/adreno_gen8_snapshot.h | 576 ++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 + drivers/gpu/drm/msm/adreno/adreno_snapshot.h | 530 ++++ .../drm/msm/adreno/catalog/adreno_glymur.h | 2307 ++++++++++++++++ .../gpu/drm/msm/adreno/catalog/adreno_hawi.h | 2387 +++++++++++++++++ .../drm/msm/adreno/catalog/adreno_kaanapali.h | 2317 ++++++++++++++++ .../gpu/drm/msm/adreno/catalog/adreno_maili.h | 1882 +++++++++++++ .../gpu/drm/msm/adreno/catalog/adreno_milos.h | 1977 ++++++++++++++ .../drm/msm/adreno/catalog/adreno_pakala.h | 2161 +++++++++++++++ drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 4 + 16 files changed, 15716 insertions(+), 322 deletions(-) create mode 100644 drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen8_snapshot.h create mode 100644 drivers/gpu/drm/msm/adreno/adreno_snapshot.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_glymur.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_hawi.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_kaanapali.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_maili.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_milos.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_pakala.h
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 1/15 drm/msm: Import adreno_snapshot.h
Based on kgsl_snapshot.h from downstream KMD. We'll be re-using some of this for gen8 devcoredump.
--- drivers/gpu/drm/msm/adreno/adreno_snapshot.h | 321 +++++++++++++++++++ 1 file changed, 321 insertions(+) create mode 100644 drivers/gpu/drm/msm/adreno/adreno_snapshot.h
drivers/gpu/drm/msm/adreno/adreno_snapshot.h new file +321 -0
@@ -0,0 +1,321 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +*/ + +#pragma once + +#include <linux/types.h> + +/* Snapshot header */ + +/* High word is static, low word is snapshot version ID */ +#define SNAPSHOT_MAGIC 0x504D0002 + +#define DEBUG_SECTION_SZ (_dwords) (((_dwords) * sizeof(unsigned int)) \ + + sizeof(struct adreno_snapshot_debug)) + +/* GPU ID scheme: +* [16:31] - core identifer (0x0002 for 2D or 0x0003 for 3D) +* [00:16] - GPU specific identifier +*/ + +struct adreno_snapshot_header { +__u32 magic;/* Magic identifier */ +__u32 gpuid;/* GPU ID - see above */ +/* Added in snapshot version 2 */ +__u32 chipid;/* Chip ID from the GPU */ +} __packed; + +/* Section header */ +#define SNAPSHOT_SECTION_MAGIC 0xABCD + +struct adreno_snapshot_section_header { +__u16 magic;/* Magic identifier */ +__u16 id;/* Type of section */ +__u32 size;/* Size of the section including this header */ +} __packed; + +/* Section identifiers */ +#define ADRENO_SNAPSHOT_SECTION_OS 0x0101 +#define ADRENO_SNAPSHOT_SECTION_REGS 0x0201 +#define ADRENO_SNAPSHOT_SECTION_REGS_V2 0x0202 +#define ADRENO_SNAPSHOT_SECTION_RB_V2 0x0302 +#define ADRENO_SNAPSHOT_SECTION_IB_V2 0x0402 +#define ADRENO_SNAPSHOT_SECTION_INDEXED_REGS 0x0501 +#define ADRENO_SNAPSHOT_SECTION_INDEXED_REGS_V2 0x0502 +#define ADRENO_SNAPSHOT_SECTION_DEBUG 0x0901 +#define ADRENO_SNAPSHOT_SECTION_DEBUGBUS 0x0A01 +#define ADRENO_SNAPSHOT_SECTION_GPU_OBJECT_V2 0x0B02 +#define ADRENO_SNAPSHOT_SECTION_MEMLIST_V2 0x0E02 +#define ADRENO_SNAPSHOT_SECTION_SHADER 0x1201 +#define ADRENO_SNAPSHOT_SECTION_SHADER_V2 0x1202 +#define ADRENO_SNAPSHOT_SECTION_SHADER_V3 0x1203 +#define ADRENO_SNAPSHOT_SECTION_MVC 0x1501 +#define ADRENO_SNAPSHOT_SECTION_MVC_V2 0x1502 +#define ADRENO_SNAPSHOT_SECTION_MVC_V3 0x1503 +#define ADRENO_SNAPSHOT_SECTION_GMU_MEMORY 0x1701 +#define ADRENO_SNAPSHOT_SECTION_SIDE_DEBUGBUS 0x1801 +#define ADRENO_SNAPSHOT_SECTION_TRACE_BUFFER 0x1901 +#define ADRENO_SNAPSHOT_SECTION_EVENTLOG 0x1A01 + +#define ADRENO_SNAPSHOT_SECTION_END 0xFFFF + +/* OS sub-section header */ +#define ADRENO_SNAPSHOT_OS_LINUX_V4 0x00000203 + +/* Linux OS specific information */ +struct adreno_snapshot_linux_v4 { +int osid;/* subsection OS identifier */ +__u32 seconds;/* Unix timestamp for the snapshot */ +__u32 power_flags;/* Current power flags */ +__u32 power_level;/* Current power level */ +__u32 power_interval_timeout;/* Power interval timeout */ +__u32 grpclk;/* Current GP clock value */ +__u32 busclk;/* Current busclk value */ +__u64 ptbase;/* Current ptbase */ +__u64 ptbase_lpac;/* Current LPAC ptbase */ +__u32 pid;/* PID of the process that owns the PT */ +__u32 pid_lpac;/* PID of the LPAC process that owns the PT */ +__u32 current_context;/* ID of the current context */ +__u32 current_context_lpac;/* ID of the current LPAC context */ +__u32 ctxtcount;/* Number of contexts appended to section */ +unsigned char release[32 ];/* kernel release */ +unsigned char version[32 ];/* kernel version */ +unsigned char comm[16 ];/* Name of the process that owns the PT */ +unsigned char comm_lpac[16 ];/* Name of the LPAC process that owns the PT */ +} __packed; + +/* +* This structure contains a record of an active context. +* These are appended one after another in the OS section below +* the header above +*/ +struct adreno_snapshot_linux_context_v2 { +__u32 id;/* The context ID */ +__u32 timestamp_queued;/* The last queued timestamp */ +__u32 timestamp_consumed;/* The last timestamp consumed by HW */ +__u32 timestamp_retired;/* The last timestamp retired by HW */ +}; + +/* Ringbuffer sub-section header */ +struct adreno_snapshot_rb_v2 { +int start;/* dword at the start of the dump */ +int end;/* dword at the end of the dump */ +int rbsize;/* Size (in dwords) of the ringbuffer */ +int wptr;/* Current index of the CPU write pointer */ +int rptr;/* Current index of the GPU read pointer */ +int count;/* Number of dwords in the dump */ +__u32 timestamp_queued;/* The last queued timestamp */ +__u32 timestamp_retired;/* The last timestamp retired by HW */ +__u64 gpuaddr;/* The GPU address of the ringbuffer */ +__u32 id;/* Ringbuffer identifier */ +} __packed; + +/* Replay or Memory list section, both sections have same header */ +struct adreno_snapshot_mem_list_v2 { +/* +* Number of IBs to replay for replay section or +* number of memory list entries for mem list section +*/ +int num_entries; +/* Pagetable base to which the replay IBs or memory entries belong */ +__u64 ptbase; +} __packed; + +/* Indirect buffer sub-section header (v2) */ +struct adreno_snapshot_ib_v2 { +__u64 gpuaddr;/* GPU address of the IB */ +__u64 ptbase;/* Base for the pagetable the GPU address is valid in */ +__u64 size;/* Size of the IB */ +} __packed; + +/* GMU memory ID's */ +#define SNAPSHOT_GMU_MEM_UNKNOWN 0x00 +#define SNAPSHOT_GMU_MEM_HFI 0x01 +#define SNAPSHOT_GMU_MEM_LOG 0x02 +#define SNAPSHOT_GMU_MEM_BWTABLE 0x03 +#define SNAPSHOT_GMU_MEM_DEBUG 0x04 +#define SNAPSHOT_GMU_MEM_BIN_BLOCK 0x05 +#define SNAPSHOT_GMU_MEM_CONTEXT_QUEUE 0x06 +#define SNAPSHOT_GMU_MEM_HW_FENCE 0x07 +#define SNAPSHOT_GMU_MEM_WARMBOOT 0x08 +#define SNAPSHOT_GMU_MEM_VRB 0x09 +#define SNAPSHOT_GMU_MEM_TRACE 0x0a + +/* GMU memory section data */ +struct adreno_snapshot_gmu_mem { +int type; +uint64_t hostaddr; +uint64_t gmuaddr; +uint64_t gpuaddr; +} __packed; + +/* Register sub-section header */ +struct adreno_snapshot_regs { +__u32 count;/* Number of register pairs in the section */ +} __packed; + +/* Indexed register sub-section header */ +struct adreno_snapshot_indexed_regs { +__u32 index_reg;/* Offset of the index register for this section */ +__u32 data_reg;/* Offset of the data register for this section */ +int start;/* Starting index */ +int count;/* Number of dwords in the data */ +} __packed; + +struct adreno_snapshot_indexed_regs_v2 { +u32 index_reg;/* Offset of the index register for this section */ +u32 data_reg;/* Offset of the data register for this section */ +u32 start;/* Starting index */ +u32 count;/* Number of dwords in the data */ +u32 pipe_id;/* Id of pipe, BV, Br etc */ +u32 slice_id;/* Slice ID to be dumped */ +} __packed; + +/* MVC register sub-section header */ +struct adreno_snapshot_mvc_regs { +int ctxt_id; +int cluster_id; +} __packed; + +struct adreno_snapshot_mvc_regs_v2 { +int ctxt_id; +int cluster_id; +int pipe_id; +int location_id; +} __packed; + +struct adreno_snapshot_mvc_regs_v3 { +u32 ctxt_id; +u32 cluster_id; +u32 pipe_id; +u32 location_id; +u32 slice_id; +u32 sp_id; +u32 usptp_id; +} __packed; + +/* Debug data sub-section header */ + +/* A5XX debug sections */ +#define SNAPSHOT_DEBUG_CP_MEQ 7 +#define SNAPSHOT_DEBUG_CP_PM4_RAM 8 +#define SNAPSHOT_DEBUG_CP_PFP_RAM 9 +#define SNAPSHOT_DEBUG_CP_ROQ 10 +#define SNAPSHOT_DEBUG_SHADER_MEMORY 11 +#define SNAPSHOT_DEBUG_CP_MERCIU 12 +#define SNAPSHOT_DEBUG_SQE_VERSION 14 + +/* GMU Version information */ +#define SNAPSHOT_DEBUG_GMU_CORE_VERSION 15 +#define SNAPSHOT_DEBUG_GMU_CORE_DEV_VERSION 16 +#define SNAPSHOT_DEBUG_GMU_PWR_VERSION 17 +#define SNAPSHOT_DEBUG_GMU_PWR_DEV_VERSION 18 +#define SNAPSHOT_DEBUG_GMU_HFI_VERSION 19 +#define SNAPSHOT_DEBUG_AQE_VERSION 20 + +/* Slice mask info */ +#define SNAPSHOT_DEBUG_SLICE_MASK 32 + +struct adreno_snapshot_debug { +int type;/* Type identifier for the attached tata */ +int size;/* Size of the section in dwords */ +} __packed; + +struct adreno_snapshot_debugbus { +int id;/* Debug bus ID */ +int count;/* Number of dwords in the dump */ +} __packed; + +struct adreno_snapshot_side_debugbus { +int id;/* Debug bus ID */ +int size;/* Number of dwords in the dump */ +int valid_data;/* Mask of valid bits of the side debugbus */ +} __packed; + +struct adreno_snapshot_shader { +int type;/* SP/TP statetype */ +int index;/* SP/TP index */ +int size;/* Number of dwords in the dump */ +} __packed; + +struct adreno_snapshot_shader_v2 { +int type;/* SP/TP statetype */ +int index;/* SP/TP index */ +int usptp;/* USPTP index */ +int pipe_id;/* Pipe id */ +int location;/* Location value */ +u32 size;/* Number of dwords in the dump */ +} __packed; + +struct adreno_snapshot_shader_v3 { +u32 type;/* SP/TP statetype */ +u32 slice_id;/* Slice ID */ +u32 sp_index;/* SP/TP index */ +u32 usptp;/* USPTP index */ +u32 pipe_id;/* Pipe id */ +u32 location;/* Location value */ +u32 ctxt_id;/* Context ID */ +u32 size;/* Number of dwords in the dump */ +} __packed; + +#define TRACE_BUF_NUM_SIG 4 + +/** +* enum trace_buffer_source - Bits to identify the source block of trace buffer information +* GX_DBGC : Signals captured from GX block +* CX_DBGC : Signals captured from CX block +*/ +enum trace_buffer_source { +GX_DBGC =1 , +CX_DBGC =2 , +}; + +/** +* adreno_snapshot_trace_buffer: Header Information for the tracebuffer in snapshot. +*/ +struct adreno_snapshot_trace_buffer { +/** @dbgc_ctrl: Identify source for trace */ +__u16 dbgc_ctrl; +/** @dbgc_ctrl: Identify source for trace */ +__u16 segment; +/** @granularity: The total number of segments in each packet */ +__u16 granularity; +/** @ping_blk: Signal block */ +__u16 ping_blk[TRACE_BUF_NUM_SIG ]; +/** @ping_idx: Signal Index */ +__u16 ping_idx[TRACE_BUF_NUM_SIG ]; +/** @size: Number of bytes in the dump */ +__u32 size; +} __packed; + +#define SNAPSHOT_GPU_OBJECT_SHADER 1 +#define SNAPSHOT_GPU_OBJECT_IB 2 +#define SNAPSHOT_GPU_OBJECT_GENERIC 3 +#define SNAPSHOT_GPU_OBJECT_DRAW 4 +#define SNAPSHOT_GPU_OBJECT_GLOBAL 5 + +struct adreno_snapshot_gpu_object_v2 { +int type;/* Type of GPU object */ +__u64 gpuaddr;/* GPU address of the object */ +__u64 ptbase;/* Base for the pagetable the GPU address is valid in */ +__u64 size;/* Size of the object (in dwords) */ +} __packed; + +struct adreno_snapshot_eventlog { +/** @type: Type of the event log buffer */ +__u16 type; +/** @version: Version of the event log buffer */ +__u16 version; +/** @size: Size of the eventlog buffer in bytes */ +u32 size; +} __packed; + +struct adreno_snapshot_gmu_version { +/** @type: Type of the GMU version buffer */ +u32 type; +/** @value: GMU FW version value */ +u32 value; +} __packed; +
Signature · 1 line
2.56.0
[email protected]
AI reviewRe: [PATCH v5 01/15] drm/msm: Import adreno_snapshot.h
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] drm/msm/adreno: malformed kernel-doc comments in adreno_snapshot.h --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] drm/msm/adreno: malformed kernel-doc comments in adreno_snapshot.h --
commit a4a9326d5b47d5886718e595e77013dc5431312b
Author: Rob Clark <[email protected]>
drm/msm: Import adreno_snapshot.h
This commit imports adreno_snapshot.h, based on kgsl_snapshot.h from the downstream KMD, to be reused for gen8 devcoredump support.
Quoted 6 lines
drivers/gpu/drm/msm/adreno/adreno_snapshot.h new file +0
-0@@ -0,0 +1,321 @@
[ ... ]
Quoted 46 lines
drivers/gpu/drm/msm/adreno/adreno_snapshot.h new file +46
-0+/** +* enum trace_buffer_source - Bits to identify the source block of trace buffer information +* GX_DBGC : Signals captured from GX block +* CX_DBGC : Signals captured from CX block +*/ +enum trace_buffer_source { +GX_DBGC =1 , +CX_DBGC =2 , +}; + +/** +* adreno_snapshot_trace_buffer: Header Information for the tracebuffer in snapshot. +*/ +struct adreno_snapshot_trace_buffer { +/** @dbgc_ctrl: Identify source for trace */ +__u16 dbgc_ctrl; +/** @dbgc_ctrl: Identify source for trace */ +__u16 segment; +/** @granularity: The total number of segments in each packet */ +__u16 granularity; +/** @ping_blk: Signal block */ +__u16 ping_blk[TRACE_BUF_NUM_SIG ]; +/** @ping_idx: Signal Index */ +__u16 ping_idx[TRACE_BUF_NUM_SIG ]; +/** @size: Number of bytes in the dump */ +__u32 size; +} __packed; + +#define SNAPSHOT_GPU_OBJECT_SHADER 1 +#define SNAPSHOT_GPU_OBJECT_IB 2 +#define SNAPSHOT_GPU_OBJECT_GENERIC 3 +#define SNAPSHOT_GPU_OBJECT_DRAW 4 +#define SNAPSHOT_GPU_OBJECT_GLOBAL 5 + +struct adreno_snapshot_gpu_object_v2 { +int type;/* Type of GPU object */ +__u64 gpuaddr;/* GPU address of the object */ +__u64 ptbase;/* Base for the pagetable the GPU address is valid in */ +__u64 size;/* Size of the object (in dwords) */ +} __packed; + +struct adreno_snapshot_eventlog { +/** @type: Type of the event log buffer */ +__u16 type; +/** @version: Version of the event log buffer */ +__u16 version;
drivers/gpu/drm/msm/adreno/adreno_snapshot.h line 320
Quoted 10 lines
drivers/gpu/drm/msm/adreno/adreno_snapshot.h new file +10
-0+/** @size: Size of the eventlog buffer in bytes */ +u32 size; +} __packed; + +struct adreno_snapshot_gmu_version { +/** @type: Type of the GMU version buffer */ +u32 type; +/** @value: GMU FW version value */ +u32 value; +} __packed;
[Severity: Low]
As reported by Sashiko on v4 [1], running scripts/kernel-doc on drivers/gpu/drm/msm/adreno/adreno_snapshot.h produces several kernel-doc parser warnings.
In enum trace_buffer_source, GX_DBGC and CX_DBGC are missing the leading @ prefix (@GX_DBGC: and @CX_DBGC:), causing kernel-doc to warn that both enum values are undescribed.
In struct adreno_snapshot_trace_buffer, the top-level comment header omits the struct keyword ("adreno_snapshot_trace_buffer:" instead of "struct adreno_snapshot_trace_buffer -"), which causes kernel-doc to treat it as a function prototype and fail. Additionally, the inline comment for the segment member is a copy-paste duplicate of @dbgc_ctrl rather than @segment.
Finally, struct adreno_snapshot_eventlog and struct adreno_snapshot_gmu_version use inline /** @member: ... */ kernel-doc comments on their fields without a preceding /** struct ... */ kernel-doc header on the enclosing structures.
Could these comments be updated to follow standard kernel-doc syntax (or converted to regular /* ... */ comments if kernel-doc generation is not intended)?
[1] https://lore.kernel.org/r/[email protected]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Rob Clark
maintainerPATCH v5 2/15 drm/msm/a8xx: Export aperture helpers
In reply to Rob ClarkWe'll need these from gen8 gpu state snapshot code as well.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 3 +++ drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +3 -0
@@ -349,6 +349,9 @@ void a6xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring);void a6xx_flush_yield (struct msm_gpu *gpu,struct msm_ringbuffer *ring);int a6xx_zap_shader_init (struct msm_gpu *gpu); +void a8xx_aperture_acquire (struct msm_gpu *gpu,enum adreno_pipe pipe,unsigned long *flags); +void a8xx_aperture_release (struct msm_gpu *gpu,unsigned long flags); +void a8xx_aperture_clear (struct msm_gpu *gpu);void a8xx_bus_clear_pending_transactions (struct adreno_gpu *adreno_gpu,bool gx_off);int a8xx_fault_handler (void *arg,unsigned long iova,int flags,void *data);void a8xx_flush (struct msm_gpu *gpu,struct msm_ringbuffer *ring);
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +3 -3
@@ -32,7 +32,7 @@ static void a8xx_aperture_slice_set(struct msm_gpu *gpu, enum adreno_pipe pipe, a6xx_gpu->cached_aperture = val; } -static void a8xx_aperture_acquire (struct msm_gpu *gpu,enum adreno_pipe pipe,unsigned long *flags) +void a8xx_aperture_acquire (struct msm_gpu *gpu,enum adreno_pipe pipe,unsigned long *flags) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);
@@ -42,7 +42,7 @@ static void a8xx_aperture_acquire(struct msm_gpu *gpu, enum adreno_pipe pipe, una8xx_aperture_slice_set (gpu, pipe,0 ); } -static void a8xx_aperture_release (struct msm_gpu *gpu,unsigned long flags) +void a8xx_aperture_release (struct msm_gpu *gpu,unsigned long flags) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);
@@ -50,7 +50,7 @@ static void a8xx_aperture_release(struct msm_gpu *gpu, unsigned long flags)spin_unlock_irqrestore (&a6xx_gpu->aperture_lock, flags); } -static void a8xx_aperture_clear (struct msm_gpu *gpu) +void a8xx_aperture_clear (struct msm_gpu *gpu) {unsigned long flags;
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 3/15 drm/msm/a8xx: Add a8xx_aperture_acquire_raw()
In reply to Rob ClarkThe snapshot code will need more control, setting additional bitfields. Rather than add a list of additional args, add a helper to acquire the aperture which directly takes a reg value.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 -0
@@ -349,6 +349,7 @@ void a6xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring);void a6xx_flush_yield (struct msm_gpu *gpu,struct msm_ringbuffer *ring);int a6xx_zap_shader_init (struct msm_gpu *gpu); +void a8xx_aperture_acquire_raw (struct msm_gpu *gpu,u32 val,unsigned long *flags);void a8xx_aperture_acquire (struct msm_gpu *gpu,enum adreno_pipe pipe,unsigned long *flags);void a8xx_aperture_release (struct msm_gpu *gpu,unsigned long flags);void a8xx_aperture_clear (struct msm_gpu *gpu);
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +13 -8
@@ -16,13 +16,10 @@#define GPU_PAS_ID 13 -static void a8xx_aperture_slice_set (struct msm_gpu *gpu,enum adreno_pipe pipe,u32 slice) +static void a8xx_aperture_slice_set (struct msm_gpu *gpu,u32 val) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); -u32 val; - - val =A8XX_CP_APERTURE_CNTL_HOST_PIPEID (pipe) |A8XX_CP_APERTURE_CNTL_HOST_SLICEID (slice);if (a6xx_gpu->cached_aperture == val)return ;
@@ -32,14 +29,20 @@ static void a8xx_aperture_slice_set(struct msm_gpu *gpu, enum adreno_pipe pipe, a6xx_gpu->cached_aperture = val; } -void a8xx_aperture_acquire (struct msm_gpu *gpu,enum adreno_pipe pipe,unsigned long *flags) +void a8xx_aperture_acquire_raw (struct msm_gpu *gpu,u32 val,unsigned long *flags) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);spin_lock_irqsave (&a6xx_gpu->aperture_lock, *flags); -a8xx_aperture_slice_set (gpu, pipe,0 ); +a8xx_aperture_slice_set (gpu, val); + +} + +void a8xx_aperture_acquire (struct msm_gpu *gpu,enum adreno_pipe pipe,unsigned long *flags) +{ +a8xx_aperture_acquire_raw (gpu,A8XX_CP_APERTURE_CNTL_HOST_PIPEID (pipe), flags); }void a8xx_aperture_release (struct msm_gpu *gpu,unsigned long flags)
@@ -74,8 +77,10 @@ static u32 a8xx_read_pipe_slice(struct msm_gpu *gpu, enum adreno_pipe pipe, u32unsigned long flags;u32 val; -spin_lock_irqsave (&a6xx_gpu->aperture_lock, flags); -a8xx_aperture_slice_set (gpu, pipe, slice); +a8xx_aperture_acquire_raw (gpu, +A8XX_CP_APERTURE_CNTL_HOST_PIPEID (pipe) | +A8XX_CP_APERTURE_CNTL_HOST_SLICEID (slice), + &flags); val =gpu_read (gpu, offset);spin_unlock_irqrestore (&a6xx_gpu->aperture_lock, flags);
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 4/15 drm/msm/a8xx: Export slice helper
In reply to Rob ClarkSomething we'll need from the gpu snapshot code.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 -0
@@ -360,6 +360,7 @@ u64 a8xx_gmu_get_timestamp(struct msm_gpu *gpu);u64 a8xx_gpu_busy (struct msm_gpu *gpu,unsigned long *out_sample_rate);int a8xx_gpu_feature_probe (struct msm_gpu *gpu);void a8xx_gpu_get_slice_info (struct msm_gpu *gpu); +u32 a8xx_get_first_slice (struct a6xx_gpu *a6xx_gpu);int a8xx_hw_init (struct msm_gpu *gpu);irqreturn_t a8xx_irq (struct msm_gpu *gpu);void a8xx_llc_activate (struct a6xx_gpu *a6xx_gpu);
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +1 -1
@@ -127,7 +127,7 @@ void a8xx_gpu_get_slice_info(struct msm_gpu *gpu) } } -static u32 a8xx_get_first_slice (struct a6xx_gpu *a6xx_gpu) +u32 a8xx_get_first_slice (struct a6xx_gpu *a6xx_gpu) {return ffs (a6xx_gpu->slice_mask) -1 ; }
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 5/15 drm/msm/a8xx: Add missing a850 ifpc reglist entries
In reply to Rob ClarkWe want to save/restore all of the CP_PROTECT regs across IFPC.
--- drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/msm/adreno/a8xx_catalog.c +7 -0
@@ -1477,6 +1477,13 @@ static const u32 a850_ifpc_reglist_regs[] = {REG_A8XX_CP_PROTECT_GLOBAL (53 ),REG_A8XX_CP_PROTECT_GLOBAL (54 ),REG_A8XX_CP_PROTECT_GLOBAL (55 ), +REG_A8XX_CP_PROTECT_GLOBAL (56 ), +REG_A8XX_CP_PROTECT_GLOBAL (57 ), +REG_A8XX_CP_PROTECT_GLOBAL (58 ), +REG_A8XX_CP_PROTECT_GLOBAL (59 ), +REG_A8XX_CP_PROTECT_GLOBAL (60 ), +REG_A8XX_CP_PROTECT_GLOBAL (61 ), +REG_A8XX_CP_PROTECT_GLOBAL (62 ),REG_A8XX_CP_PROTECT_GLOBAL (63 ), };DECLARE_ADRENO_REGLIST_LIST (a850_ifpc_reglist);
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 6/15 drm/msm/a8xx: Allow nonctx reglist to include GMU regs
In reply to Rob ClarkFrom hw PoV, it's all part of the GPU. But from dt perspective it is it's own device with a separate io space. So we need to detect this and direct writes to the correct place.
--- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +6 -1
@@ -370,6 +370,7 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu)static void a8xx_nonctxt_config (struct msm_gpu *gpu,u32 *gmem_protect) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gmu *gmu = &to_a6xx_gpu (adreno_gpu)->gmu;const struct a6xx_info *info = adreno_gpu->info->a6xx;const struct adreno_reglist_pipe *regs = info->nonctxt_reglist;unsigned int pipe_id, i;
@@ -389,7 +390,11 @@ static void a8xx_nonctxt_config(struct msm_gpu *gpu, u32 *gmem_protect)if (regs[i].offset ==REG_A8XX_RB_GC_GMEM_PROTECT ) *gmem_protect = regs[i].value; -gpu_write (gpu, regs[i].offset, regs[i].value); +if ((regs[i].offset <<2 ) >= gmu->mmio_offset) { +gmu_write (gmu, regs[i].offset, regs[i].value); + }else { +gpu_write (gpu, regs[i].offset, regs[i].value); + } }a8xx_aperture_release (gpu, flags);
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 7/15 drm/msm/a8xx: Stop getting GMEM_PROTECT from nonctx list
In reply to Rob ClarkWe can just simplify things and calculate the value, instead of manually adding it to the nonctx list.
--- drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 6 ------ drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 12 ++++-------- 2 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/msm/adreno/a8xx_catalog.c +0 -6
@@ -27,7 +27,6 @@ static const struct adreno_reglist_pipe a830_nonctxt_regs[] = { { REG_A7XX_RB_CCU_CNTL, 0x00000068, BIT(PIPE_BR) },/* Partially enable perf clear, Disable DINT to c/z be data forwarding */ { REG_A7XX_RB_CCU_DBG_ECO_CNTL, 0x00002200, BIT(PIPE_BR) }, - { REG_A8XX_RB_GC_GMEM_PROTECT, 0x0c000000, BIT(PIPE_BR) },/* Configure number of outstanding transactions to 32 */ { REG_A8XX_RB_RESOLVE_PREFETCH_CNTL, 0x00000007, BIT(PIPE_BR) }, /* Configure UCHE request time out to 16 cycles for CCU/UCHE arbitration */
@@ -309,7 +308,6 @@ static const struct adreno_reglist_pipe x285_nonctxt_regs[] = { { REG_A8XX_PC_CHICKEN_BITS_2, 0x00000200, BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_PC_CHICKEN_BITS_3, 0x00500000, BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_PC_CHICKEN_BITS_4, 0x00500050, BIT(PIPE_BV) | BIT(PIPE_BR) }, - { REG_A8XX_RB_GC_GMEM_PROTECT, 0x15000000, BIT(PIPE_BR) }, { REG_A8XX_RB_RESOLVE_PREFETCH_CNTL, 0x00000007, BIT(PIPE_BR) }, { REG_A8XX_RB_CMP_DBG_ECO_CNTL, 0x00004000, BIT(PIPE_BR) }, { REG_A8XX_RBBM_NC_MODE_CNTL, 0x00000001, BIT(PIPE_NONE) },
@@ -483,7 +481,6 @@ static const struct adreno_reglist_pipe a810_nonctxt_regs[] = { { REG_A8XX_VFD_CB_BUSY_REQ_CNT, 0x00200020, BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_VFD_CB_LP_REQ_CNT, 0x00100020, BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_VPC_FLATSHADE_MODE_CNTL, 0x00000001, BIT(PIPE_BV) | BIT(PIPE_BR) }, - { REG_A8XX_RB_GC_GMEM_PROTECT, 0x00900000, BIT(PIPE_BR) }, { }, };
@@ -793,7 +790,6 @@ static const struct adreno_reglist_pipe a840_nonctxt_regs[] = { { REG_A7XX_RB_CCU_CNTL, 0x00000068, BIT(PIPE_BR) },/* Partially enable perf clear, Disable DINT to c/z be data forwarding */ { REG_A7XX_RB_CCU_DBG_ECO_CNTL, 0x00002200, BIT(PIPE_BR) }, - { REG_A8XX_RB_GC_GMEM_PROTECT, 0x12000000, BIT(PIPE_BR) }, { REG_A8XX_RB_RESOLVE_PREFETCH_CNTL, 0x00000007, BIT(PIPE_BR) }, { REG_A8XX_RB_CMP_DBG_ECO_CNTL, 0x00004000, BIT(PIPE_BR) }, { REG_A8XX_RBBM_NC_MODE_CNTL, 0x00000001, BIT(PIPE_NONE) },
@@ -1186,7 +1182,6 @@ static const struct adreno_reglist_pipe a845_nonctxt_regs[] = { { REG_A7XX_RB_CCU_CNTL, 0x00000068, BIT(PIPE_BR) }, { REG_A7XX_RB_CCU_DBG_ECO_CNTL, BIT(10) | BIT(9), BIT(PIPE_BR) }, { REG_A6XX_RB_DBG_ECO_CNTL, BIT(17), BIT(PIPE_BV) | BIT(PIPE_BR) }, - { REG_A8XX_RB_GC_GMEM_PROTECT, 0x0C000000, BIT(PIPE_BR) }, { REG_A6XX_RB_RBP_CNTL, BIT(5) | BIT(6), BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_RB_RESOLVE_PREFETCH_CNTL, 0x00000007, BIT(PIPE_BR) }, { REG_A8XX_RB_CMP_DBG_ECO_CNTL, 0x00004000, BIT(PIPE_BR) },
@@ -1245,7 +1240,6 @@ static const struct adreno_reglist_pipe a850_nonctxt_regs[] = { { REG_A7XX_RB_CCU_CNTL, 0x00000068, BIT(PIPE_BR) }, { REG_A7XX_RB_CCU_DBG_ECO_CNTL, BIT(10) | BIT(9), BIT(PIPE_BR) }, { REG_A6XX_RB_DBG_ECO_CNTL, BIT(17), BIT(PIPE_BV) | BIT(PIPE_BR) }, - { REG_A8XX_RB_GC_GMEM_PROTECT, 0x12000000, BIT(PIPE_BR) }, { REG_A6XX_RB_RBP_CNTL, BIT(5) | BIT(6), BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_RB_RESOLVE_PREFETCH_CNTL, 0x00000007, BIT(PIPE_BR) }, { REG_A8XX_RB_CMP_DBG_ECO_CNTL, 0x00004000, BIT(PIPE_BR) },
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +4 -8
@@ -367,7 +367,7 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) hbb_lo << 1 | ubwc_mode); } -static void a8xx_nonctxt_config (struct msm_gpu *gpu,u32 *gmem_protect) +static void a8xx_nonctxt_config (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gmu *gmu = &to_a6xx_gpu (adreno_gpu)->gmu;
@@ -387,9 +387,6 @@ static void a8xx_nonctxt_config(struct msm_gpu *gpu, u32 *gmem_protect)if (!(BIT (pipe_id) & regs[i].pipe))continue ; -if (regs[i].offset ==REG_A8XX_RB_GC_GMEM_PROTECT ) - *gmem_protect = regs[i].value; -if ((regs[i].offset <<2 ) >= gmu->mmio_offset) {gmu_write (gmu, regs[i].offset, regs[i].value); }else {
@@ -635,7 +632,6 @@ static int hw_init(struct msm_gpu *gpu)struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);struct a6xx_gmu *gmu = &a6xx_gpu->gmu;unsigned int pipe_id, i; -u32 gmem_protect =0 ;u64 gmem_range_min;int ret;
@@ -716,7 +712,7 @@ static int hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A8XX_UCHE_CLIENT_PF ,BIT (7 ) |0x1 ); -a8xx_nonctxt_config (gpu, &gmem_protect); +a8xx_nonctxt_config (gpu);/* Enable fault detection */ gpu_write (gpu,REG_A8XX_RBBM_INTERFACE_HANG_INT_CNTL ,BIT (30 ) |0xcfffff );
@@ -835,8 +831,8 @@ static int hw_init(struct msm_gpu *gpu)* GMEM_PROTECT register should be programmed after GPU is transitioned to * non-secure mode */ -a8xx_write_pipe (gpu,PIPE_BR ,REG_A8XX_RB_GC_GMEM_PROTECT , gmem_protect); -WARN_ON (!gmem_protect); +a8xx_write_pipe (gpu,PIPE_BR ,REG_A8XX_RB_GC_GMEM_PROTECT , + (adreno_gpu->info->gmem /SZ_4K ) <<16 );a8xx_aperture_clear (gpu);if (!a6xx_gpu->pwrup_reglist_emitted) {
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 8/15 drm/msm/adreno: Fix PROTECT span length
In reply to Rob ClarkDon't let the length bleed into b31.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +2 -2
@@ -244,7 +244,7 @@ struct a7xx_cp_smmu_info {*/ #define A6XX_PROTECT_NORDWR (_reg, _len) \ ((1 << 31) | \ - (((_len) & 0x3FFF) << 18) | ((_reg) & 0x3FFFF)) + (((_len) & 0x1FFF) << 18) | ((_reg) & 0x3FFFF))/* * Same as above, but allow reads over the range. For areas of mixed use (such
@@ -252,7 +252,7 @@ struct a7xx_cp_smmu_info {* single register */ #define A6XX_PROTECT_RDONLY (_reg, _len) \ - ((((_len) & 0x3FFF) << 18) | ((_reg) & 0x3FFFF)) + ((((_len) & 0x1FFF) << 18) | ((_reg) & 0x3FFFF))extern const struct adreno_gpu_funcs a6xx_gpu_funcs;extern const struct adreno_gpu_funcs a6xx_gmuwrapper_funcs;
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 9/15 drm/msm/adreno: add temporary __maybe_unused
In reply to Rob ClarkTo keep this series bisectable. This will be removed once there maybe- unused protect tables are gone.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.h +1 -1
@@ -168,7 +168,7 @@ struct adreno_protect { };#define DECLARE_ADRENO_PROTECT (name, __count_max) \ -static const struct adreno_protect name = { \ +static const struct adreno_protect name __maybe_unused = { \ .regs = name ## _regs, \ .count = ARRAY_SIZE(name ## _regs), \ .count_max = __count_max, \
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 10/15 drm/msm/a8xx: Import generated headers
In reply to Rob ClarkWire up the generated GPU snapshot tables, which will be used in the next commit, immediately.
The generated tables also contain nonctx reglist and protect table. We'll switch to those in later commits.
--- drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 15 + .../gpu/drm/msm/adreno/adreno_gen8_snapshot.h | 576 ++++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 + .../drm/msm/adreno/catalog/adreno_glymur.h | 2307 ++++++++++++++++ .../gpu/drm/msm/adreno/catalog/adreno_hawi.h | 2387 +++++++++++++++++ .../drm/msm/adreno/catalog/adreno_kaanapali.h | 2317 ++++++++++++++++ .../gpu/drm/msm/adreno/catalog/adreno_maili.h | 1882 +++++++++++++ .../gpu/drm/msm/adreno/catalog/adreno_milos.h | 1977 ++++++++++++++ .../drm/msm/adreno/catalog/adreno_pakala.h | 2161 +++++++++++++++ 9 files changed, 13624 insertions(+) create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen8_snapshot.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_glymur.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_hawi.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_kaanapali.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_maili.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_milos.h create mode 100644 drivers/gpu/drm/msm/adreno/catalog/adreno_pakala.h
drivers/gpu/drm/msm/adreno/a8xx_catalog.c +15 -0
@@ -10,6 +10,14 @@#include "a6xx_gpu.h" #include "a6xx.xml.h" +#include "adreno_gen8_snapshot.h" +#include "catalog/adreno_glymur.h" +#include "catalog/adreno_hawi.h" +#include "catalog/adreno_kaanapali.h" +#include "catalog/adreno_maili.h" +#include "catalog/adreno_milos.h" +#include "catalog/adreno_pakala.h" +static const struct adreno_reglist_pipe a830_nonctxt_regs[] = { {REG_A8XX_CP_SMMU_STREAM_ID_LPAC ,0x00000101 ,BIT (PIPE_NONE ) }, {REG_A8XX_GRAS_DBG_ECO_CNTL ,0x00000800 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) },
@@ -1577,6 +1585,7 @@ static const struct adreno_info a8xx_gpus[] = { { 221, 3 }, { 190, 4 }, ), + .snapshot_block_list = &pakala_snapshot_block_list, }, { .chip_ids =ADRENO_CHIP_IDS (0x44070001 ), .family = ADRENO_8XX_GEN2,
@@ -1620,6 +1629,7 @@ static const struct adreno_info a8xx_gpus[] = { { 357, 2 }, { 284, 3 }, ), + .snapshot_block_list = &glymur_snapshot_block_list, }, { .chip_ids =ADRENO_CHIP_IDS (0x44050a01 ), .family = ADRENO_8XX_GEN2,
@@ -1665,6 +1675,7 @@ static const struct adreno_info a8xx_gpus[] = { { 252, 2 }, { 221, 3 }, ), + .snapshot_block_list = &kaanapali_snapshot_block_list, }, { .chip_ids =ADRENO_CHIP_IDS (0x44010000 ), .family = ADRENO_8XX_GEN1,
@@ -1707,6 +1718,7 @@ static const struct adreno_info a8xx_gpus[] = { { 242, 1 }, { 221, 2 }, ), + .snapshot_block_list = &milos_snapshot_block_list, }, { .chip_ids =ADRENO_CHIP_IDS (0x44060000 ), .family = ADRENO_8XX_GEN2,
@@ -1749,6 +1761,7 @@ static const struct adreno_info a8xx_gpus[] = { { 357, 2 }, { 284, 3 }, ), + .snapshot_block_list = &glymur_snapshot_block_list, }, { .chip_ids =ADRENO_CHIP_IDS (0x44041400 ), .family = ADRENO_8XX_GEN2,
@@ -1792,6 +1805,7 @@ static const struct adreno_info a8xx_gpus[] = { { 0xd8, 0 }, { 0x11c, 1 }, ), + .snapshot_block_list = &maili_snapshot_block_list, }, { .chip_ids =ADRENO_CHIP_IDS (0x44051401 ), .family = ADRENO_8XX_GEN2,
@@ -1835,6 +1849,7 @@ static const struct adreno_info a8xx_gpus[] = { { 284, 2 }, { 216, 3 }, ), + .snapshot_block_list = &hawi_snapshot_block_list, } };
drivers/gpu/drm/msm/adreno/adreno_gen8_snapshot.h new file +576 -0
576 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_gpu.h +2 -0
@@ -129,6 +129,8 @@ struct adreno_info {*/ struct adreno_speedbin *speedbins;u64 preempt_record_size; + +const void *snapshot_block_list; }; #define ADRENO_CHIP_IDS(tbl...) (uint32_t[]) { tbl, 0 }
drivers/gpu/drm/msm/adreno/catalog/adreno_glymur.h new file +2307 -0
2,308 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/catalog/adreno_hawi.h new file +2387 -0
45 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/catalog/adreno_kaanapali.h new file +2317 -0
2,317 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/catalog/adreno_maili.h new file +1882 -0
1,882 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/catalog/adreno_milos.h new file +1977 -0
1,977 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/catalog/adreno_pakala.h new file +2161 -0
2,161 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.56.0
Part of the diff is not shown here. View the raw message.
Rob Clark
maintainerPATCH v5 11/15 drm/msm/a8xx: devcoredump state capture support
In reply to Rob ClarkThis attempts to make it easier to compare to kgsl, the downstream driver, to make it easier to spot bugs or missing things. Such as re-using function names, etc.
--- drivers/gpu/drm/msm/Makefile | 4 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 7 + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 5 + drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c | 1401 +++++++++++++++++ drivers/gpu/drm/msm/adreno/adreno_snapshot.h | 209 +++ drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 4 + 6 files changed, 1629 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c
drivers/gpu/drm/msm/Makefile +3 -1
@@ -31,7 +31,9 @@ adreno-y := \ adreno-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o \ -adreno-$(CONFIG_DRM_MSM_GPU_STATE) += adreno/a6xx_gpu_state.o +adreno-$(CONFIG_DRM_MSM_GPU_STATE) += \ + adreno/a6xx_gpu_state.o \ + adreno/a8xx_gpu_state.o \ msm-display-$(CONFIG_DRM_MSM_HDMI) += \ hdmi/hdmi.o \
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +7 -0
@@ -2942,9 +2942,16 @@ const struct adreno_gpu_funcs a8xx_gpu_funcs = { .active_ring = a6xx_active_ring, .irq = a8xx_irq, .destroy = a6xx_destroy, +#if defined(CONFIG_DRM_MSM_GPU_STATE) + .show = a8xx_show, +#endif .gpu_busy = a8xx_gpu_busy, .gpu_get_freq = a6xx_gmu_get_freq, .gpu_set_freq = a6xx_gpu_set_freq, +#if defined(CONFIG_DRM_MSM_GPU_STATE) + .gpu_state_get = a8xx_gpu_state_get, + .gpu_state_put = a8xx_gpu_state_put, +#endif .create_vm = a6xx_create_vm, .create_private_vm = a6xx_create_private_vm, .get_rptr = a6xx_get_rptr,
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +5 -0
@@ -370,4 +370,9 @@ void a8xx_preempt_irq(struct msm_gpu *gpu);bool a8xx_progress (struct msm_gpu *gpu,struct msm_ringbuffer *ring);void a8xx_perfcntr_flush (struct msm_gpu *gpu);void a8xx_recover (struct msm_gpu *gpu); +void a8xx_show (struct msm_gpu *gpu,struct msm_gpu_state *state, +struct drm_printer *p); +struct msm_gpu_state *a8xx_gpu_state_get (struct msm_gpu *gpu); +int a8xx_gpu_state_put (struct msm_gpu_state *state); +#endif /* __A6XX_GPU_H__ */
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +1401 -0
1,401 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_snapshot.h +209 -0
265 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/a6xx.xml +4 -0
@@ -5086,6 +5086,7 @@ by a particular renderpass/blit. <reg32 offset="0x0005" name="CFG_DBGBUS_CNTLM"> <bitfield high="27" low="24" name="ENABLE"/> </reg32> + <reg32 offset="0x0006" name="CFG_DBGBUS_OPL"/> <reg32 offset="0x0008" name="CFG_DBGBUS_IVTL_0"/> <reg32 offset="0x0009" name="CFG_DBGBUS_IVTL_1"/> <reg32 offset="0x000a" name="CFG_DBGBUS_IVTL_2"/>
@@ -5115,8 +5116,11 @@ by a particular renderpass/blit. <bitfield high="31" low="28" name="BYTEL15"/> </reg32> + <reg32 offset="0x001e" name="CFG_DBGBUS_IDX"/> + <reg32 offset="0x0026" name="CFG_DBGBUS_OVER"/> <reg32 offset="0x002f" name="CFG_DBGBUS_TRACE_BUF1"/> <reg32 offset="0x0030" name="CFG_DBGBUS_TRACE_BUF2"/> + <reg32 offset="0x0031" name="CFG_DBGBUS_TRACE_BUF3"/> </domain> <domain name="A7XX_CX_DBGC" width="32" varset="chip">
Signature · 1 line
2.56.0
[email protected]
AI reviewRe: [PATCH v5 11/15] drm/msm/a8xx: devcoredump state capture support
Thank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider: - [High] drm/msm/a8xx: wrong GX power check helper in a8xx_gpu_state_get() - [High] drm/msm/a8xx: invalid…
Thank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
- [High] drm/msm/a8xx: wrong GX power check helper in a8xx_gpu_state_get()
- [High] drm/msm/a8xx: invalid slice 0 access in gen8_snapshot_mempool()
- [High] drm/msm/a8xx: unguarded preempt_bo loop in a8xx_gpu_state_get() causes UAF
- [Medium] drm/msm/a8xx: dirty CP_APERTURE_CNTL_HOST state in a8xx_gpu_state_get() --
commit c7a029a7073f0aadd364139ec43ceeb070ef9dae
Author: Rob Clark <[email protected]>
drm/msm/a8xx: devcoredump state capture support
This commit adds devcoredump GPU state capture support for Adreno A8xx GPUs, including register lists, indexed registers, mempool, MVC clusters, shader blocks, debugbus, and GMU state.
Quoted 5 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +0
-0
[ ... ]
Quoted 34 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +34
-0+static void gen8_legacy_snapshot_registers (struct msm_gpu *gpu, +struct adreno_gpu_state *state, +const struct gen8_reg_list *regs, +u32 slice_id) +{ +int count; + +/* Figure out how many registers we are going to dump */ + count =adreno_snapshot_regs_count (regs->regs); + +snapshot_sect (state,MVC_V3 ,4 * count, { + .ctxt_id = 0, + .cluster_id = CLUSTER_NONE, + .pipe_id = PIPE_NONE, + .location_id = UINT_MAX, + .sp_id = UINT_MAX, + .usptp_id = UINT_MAX, + .slice_id = HEADER_SLICE_ID(regs->slice_region, slice_id), + }) { +unsigned long flags; + +if (regs->sel) +gpu_write (gpu, regs->sel->host_reg, regs->sel->val); + +if (regs->slice_region) { +u32 val =GEN8_CP_APERTURE_REG_VAL (slice_id,0 ,0 ,0 ); +a8xx_aperture_acquire_raw (gpu, val, &flags); + } + +/* Make sure the previous writes are posted before reading */ +mb (); + +for (const u32 *ptr = regs->regs; ptr[0 ] !=UINT_MAX ; ptr +=2 ) { +snapshot_mvc_regs_v3_subheader (§, ptr);
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 233
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +10
-0+ +for (int k = ptr[0 ]; k <= ptr[1 ]; k++) { +snapshot_sect_u32 (§,reg_read (gpu, k)); + } + } + +if (regs->slice_region) +a8xx_aperture_release (gpu, flags); + } +}
[Severity: Medium]
As reported by Sashiko on v4 [1], can gen8_legacy_snapshot_registers() leave REG_A8XX_CP_APERTURE_CNTL_HOST and a6xx_gpu->cached_aperture programmed to a previous slice when reading subsequent UNSLICE register blocks?
In drivers/gpu/drm/msm/adreno/a8xx_gpu.c, a8xx_aperture_acquire_raw() writes to REG_A8XX_CP_APERTURE_CNTL_HOST and updates a6xx_gpu->cached_aperture, whereas a8xx_aperture_release() only drops a6xx_gpu->aperture_lock:
drivers/gpu/drm/msm/adreno/a8xx_gpu.c:a8xx_aperture_release() {
spin_unlock_irqrestore(&a6xx_gpu->aperture_lock, flags);
}Because gen8_legacy_snapshot_registers() only calls a8xx_aperture_acquire_raw() when regs->slice_region is SLICE and does not clear the aperture afterward, when b->pre_crashdumper_regs or b->reg_list has SLICE entries followed by UNSLICE entries, the UNSLICE entries are read while REG_A8XX_CP_APERTURE_CNTL_HOST still has A8XX_CP_APERTURE_CNTL_HOST_USESLICEID and the previous slice_id set.
In addition, regs->sel->host_reg is written before a8xx_aperture_acquire_raw() selects the target slice and outside aperture_lock, and a8xx_gpu_state_get() exits via the out label without calling a8xx_aperture_clear(gpu) to reset REG_A8XX_CP_APERTURE_CNTL_HOST and a6xx_gpu->cached_aperture after gen8_snapshot_mvc_regs(), gen8_snapshot_cp_indexed_regs(), and gen8_legacy_snapshot_registers() run.
Should gen8_legacy_snapshot_registers() program the aperture for both SLICE and UNSLICE regions (and write regs->sel->host_reg after acquiring the aperture), and should a8xx_gpu_state_get() call a8xx_aperture_clear(gpu) at the out label?
[ ... ]
Quoted 46 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +46
-0+static bool gen8_snapshot_mempool (struct msm_gpu *gpu, +struct adreno_gpu_state *state, +struct adreno_crashdumper *dumper) +{ +const struct gen8_snapshot_block_list *b =block_list (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (to_adreno_gpu (gpu)); +u32 slice_mask = a6xx_gpu->slice_mask; +u32 first_slice =a8xx_get_first_slice (a6xx_gpu); +bool ret = true; + +for (int i =0 ; i < b->mempool_index_registers_len && ret; i++) { +const struct gen8_cp_indexed_reg *cp_indexed_reg = + &b->mempool_index_registers[i]; +unsigned long flags; +u32 j; + + FOR_EACH_SLICE (j, cp_indexed_reg->slice_region, slice_mask) { +u32 pipe_id = cp_indexed_reg->pipe_id; + +/* Set CP_CHICKEN_DBG[StabilizeMVC] to stabilize it while dumping */ +a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL_NS (first_slice, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_CHICKEN_DBG_PIPE ,BIT (2 ),BIT (2 )); +a8xx_aperture_release (gpu, flags); + +a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL (j, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_SLICE_CHICKEN_DBG_PIPE ,BIT (2 ),BIT (2 )); +a8xx_aperture_release (gpu, flags); + + ret =gen8_snapshot_indexed_registers (gpu, state, dumper, + cp_indexed_reg->addr, + cp_indexed_reg->data,0 , + cp_indexed_reg->size, + cp_indexed_reg->pipe_id, +HEADER_SLICE_ID (cp_indexed_reg->slice_region, j)); + +/* Reset CP_CHICKEN_DBG[StabilizeMVC] once we are done */ +a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL_NS (first_slice, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_CHICKEN_DBG_PIPE ,BIT (2 ),0 ); +a8xx_aperture_release (gpu, flags); +
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 458
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +10
-0+a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL (j, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_SLICE_CHICKEN_DBG_PIPE ,BIT (2 ),0 ); +a8xx_aperture_release (gpu, flags); + +if (!ret) +break ; + } + }
[Severity: High]
As reported by Sashiko on v4 [2], does gen8_snapshot_mempool() access slice 0 even when cp_indexed_reg->slice_region is UNSLICE and slice 0 is fused off in slice_mask?
For UNSLICE entries in b->mempool_index_registers, FIRST_SLICE(UNSLICE, slice_mask) sets j to 0 regardless of slice_mask:
#define FIRST_SLICE(_region, _slice_mask) \ ((_region == UNSLICE) ? 0 : NEXT_SLICE(0, _region, _slice_mask))
Inside FOR_EACH_SLICE, gen8_snapshot_mempool() uses first_slice when accessing REG_A8XX_CP_CHICKEN_DBG_PIPE, but then unconditionally programs GEN8_CP_APERTURE_REG_VAL(j, pipe_id, 0, 0) and RMWs the per-slice register REG_A8XX_CP_SLICE_CHICKEN_DBG_PIPE on slice j = 0 before and after gen8_snapshot_indexed_registers().
On A8xx GPUs with partial slice configurations where slice 0 is disabled in a6xx_gpu->slice_mask, won't touching REG_A8XX_CP_SLICE_CHICKEN_DBG_PIPE on slice 0 during UNSLICE mempool dumps access a fused-off slice and cause an AHB/NoC bus error?
[ ... ]
Quoted 2 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +2
-0+struct msm_gpu_state *a8xx_gpu_state_get (struct msm_gpu *gpu) +{
[ ... ]
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 1244
Quoted 3 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +3
-0+/* If GX isn't on the rest of the data isn't going to be accessible */ +if (!a6xx_gmu_gx_is_on (adreno_gpu)) +return &state->base;
[Severity: High]
As reported by Sashiko on v4 [3], should a8xx_gpu_state_get() call a8xx_gmu_gx_is_on(adreno_gpu) (or adreno_gpu->funcs->gx_is_on(adreno_gpu)) here instead of a6xx_gmu_gx_is_on(adreno_gpu)?
In drivers/gpu/drm/msm/adreno/a6xx_gmu.c, a6xx_gmu_gx_is_on() reads REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS and checks A6xx bit definitions when adreno_is_a7xx() is false:
drivers/gpu/drm/msm/adreno/a6xx_gmu.c:a6xx_gmu_gx_is_on() {
...
val = gmu_read(gmu, REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS);
if (adreno_is_a7xx(adreno_gpu))
return !(val &
(A7XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_GDSC_POWER_OFF |
A7XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF));
return !(val &
(A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_GDSC_POWER_OFF |
A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF));
}On A8xx hardware, GX power and clock status is checked via a8xx_gmu_gx_is_on(), which reads REG_A8XX_CX_MISC_GFX_PWR_CLK_STATUS on A850-family GPUs (where GMU MX may be off) or REG_A8XX_GMU_PWR_CLK_STATUS on other A8xx GPUs. Calling a6xx_gmu_gx_is_on() on A8xx reads the wrong register and bitmask, which can touch unpowered GMU MMIO on A850-family GPUs or falsely report GX as powered on and proceed with unclocked GX register reads.
[ ... ]
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 1330
Quoted 12 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +12
-0+/* +* Capture preempt records after cp_clusters, to make this easier +* to decode (ie. so we already know CP_CONTEXT_SWITCH_SMMU_INFO and +* CP_CONTEXT_SWITCH_PRIV_NON_SECURE_RESTORE_ADDR) when crashdec sees +* the logged GPU objs) +*/ +for (unsigned i =0 ; i < gpu->nr_rings; i++) { +a8xx_snapshot_gpu_bo (state, a6xx_gpu->preempt_bo[i], + a6xx_gpu->preempt_iova[i]); +a8xx_snapshot_gpu_bo (state, a6xx_gpu->preempt_smmu_bo[i], + a6xx_gpu->preempt_smmu_iova[i]); + }
[Severity: High]
As reported by Sashiko on v4 [4], can this loop trigger a use-after-free on a6xx_gpu->preempt_bo[0] when preemption initialization fails and falls back to a single ring?
In drivers/gpu/drm/msm/adreno/a6xx_preempt.c, if a6xx_preempt_init() fails after allocating ring 0's preempt_bo[0], it calls a6xx_preempt_fini(gpu) and sets gpu->nr_rings = 1:
drivers/gpu/drm/msm/adreno/a6xx_preempt.c:a6xx_preempt_fini() {
for (i = 0; i < gpu->nr_rings; i++)
msm_gem_kernel_put(a6xx_gpu->preempt_bo[i], gpu->vm);
}Because a6xx_preempt_fini() frees a6xx_gpu->preempt_bo[0] without clearing the pointer to NULL, and a8xx_gpu_state_get() iterates up to gpu->nr_rings without checking gpu->nr_rings > 1, iteration i = 0 will pass the freed a6xx_gpu->preempt_bo[0] pointer to a8xx_snapshot_gpu_bo(). Should this loop be guarded by gpu->nr_rings > 1 like the other preemption paths?
[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/[email protected]
[3] https://lore.kernel.org/r/[email protected]
[4] https://lore.kernel.org/r/[email protected]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
Re: [PATCH v5 11/15] drm/msm/a8xx: devcoredump state capture support
Quoted 97 lines · On Mon, Nov 2, 2026 at 2:28 PM <[email protected]> wrote:
Thank you for your contribution! Sashiko AI review found 4 potential issue(s) to consider:
- [High] drm/msm/a8xx: wrong GX power check helper ina8xx_gpu_state_get()
- [High] drm/msm/a8xx: invalid slice 0 access ingen8_snapshot_mempool()
- [High] drm/msm/a8xx: unguardedpreempt_boloop ina8xx_gpu_state_get()causes UAF
- [Medium] drm/msm/a8xx: dirtyCP_APERTURE_CNTL_HOSTstate ina8xx_gpu_state_get()--commit
c7a029a7073f0aadd364139ec43ceeb070ef9dae
Author: Rob Clark <[email protected]>drm/msm/a8xx: devcoredump state capture support
This commit adds devcoredump GPU state capture support for Adreno A8xx GPUs, including register lists, indexed registers, mempool, MVC clusters, shader blocks, debugbus, and GMU state.
Quoted 5 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +0
-0[ ... ]
Quoted 34 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +34
-0+static void gen8_legacy_snapshot_registers (struct msm_gpu *gpu, +struct adreno_gpu_state *state, +const struct gen8_reg_list *regs, +u32 slice_id) +{ +int count; + +/* Figure out how many registers we are going to dump */ + count =adreno_snapshot_regs_count (regs->regs); + +snapshot_sect (state,MVC_V3 ,4 * count, { + .ctxt_id = 0, + .cluster_id = CLUSTER_NONE, + .pipe_id = PIPE_NONE, + .location_id = UINT_MAX, + .sp_id = UINT_MAX, + .usptp_id = UINT_MAX, + .slice_id = HEADER_SLICE_ID(regs->slice_region, slice_id), + }) { +unsigned long flags; + +if (regs->sel) +gpu_write (gpu, regs->sel->host_reg, regs->sel->val); + +if (regs->slice_region) { +u32 val =GEN8_CP_APERTURE_REG_VAL (slice_id,0 ,0 ,0 ); +a8xx_aperture_acquire_raw (gpu, val, &flags); + } + +/* Make sure the previous writes are posted before reading */ +mb (); + +for (const u32 *ptr = regs->regs; ptr[0 ] !=UINT_MAX ; ptr +=2 ) { +snapshot_mvc_regs_v3_subheader (§, ptr);drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 233
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +10
-0+ +for (int k = ptr[0 ]; k <= ptr[1 ]; k++) { +snapshot_sect_u32 (§,reg_read (gpu, k)); + } + } + +if (regs->slice_region) +a8xx_aperture_release (gpu, flags); + } +}[Severity: Medium]
As reported by Sashiko on v4 [1], cangen8_legacy_snapshot_registers()leaveREG_A8XX_CP_APERTURE_CNTL_HOSTanda6xx_gpu->cached_apertureprogrammed to a previous slice when reading subsequent UNSLICE register blocks?In
drivers/gpu/drm/msm/adreno/a8xx_gpu.c,a8xx_aperture_acquire_raw()writes toREG_A8XX_CP_APERTURE_CNTL_HOSTand updatesa6xx_gpu->cached_aperture, whereasa8xx_aperture_release()only dropsa6xx_gpu->aperture_lock:drivers/gpu/drm/msm/adreno/a8xx_gpu.c:a8xx_aperture_release() { spin_unlock_irqrestore(&a6xx_gpu->aperture_lock, flags); }Because
gen8_legacy_snapshot_registers()only callsa8xx_aperture_acquire_raw()whenregs->slice_regionis SLICE and does not clear the aperture afterward, whenb->pre_crashdumper_regsorb->reg_listhas SLICE entries followed by UNSLICE entries, the UNSLICE entries are read whileREG_A8XX_CP_APERTURE_CNTL_HOSTstill hasA8XX_CP_APERTURE_CNTL_HOST_USESLICEIDand the previousslice_idset.In addition,
regs->sel->host_regis written beforea8xx_aperture_acquire_raw()selects the target slice and outsideaperture_lock, anda8xx_gpu_state_get()exits via the out label without callinga8xx_aperture_clear(gpu)to resetREG_A8XX_CP_APERTURE_CNTL_HOSTanda6xx_gpu->cached_apertureaftergen8_snapshot_mvc_regs(),gen8_snapshot_cp_indexed_regs(), andgen8_legacy_snapshot_registers()run.
Quoted 4 lines
Should
gen8_legacy_snapshot_registers()program the aperture for both SLICE and UNSLICE regions (and writeregs->sel->host_regafter acquiring the aperture), and shoulda8xx_gpu_state_get()calla8xx_aperture_clear(gpu)at the out label?
This is fine, reading UNSLICE regs does not depend on the aperture. And USESLICEID only matters for writes, it controls whether the write is broadcast to all slices or not.
This also matches kgsl.
Quoted 76 lines
[ ... ]
Quoted 46 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +46
-0+static bool gen8_snapshot_mempool (struct msm_gpu *gpu, +struct adreno_gpu_state *state, +struct adreno_crashdumper *dumper) +{ +const struct gen8_snapshot_block_list *b =block_list (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (to_adreno_gpu (gpu)); +u32 slice_mask = a6xx_gpu->slice_mask; +u32 first_slice =a8xx_get_first_slice (a6xx_gpu); +bool ret = true; + +for (int i =0 ; i < b->mempool_index_registers_len && ret; i++) { +const struct gen8_cp_indexed_reg *cp_indexed_reg = + &b->mempool_index_registers[i]; +unsigned long flags; +u32 j; + + FOR_EACH_SLICE (j, cp_indexed_reg->slice_region, slice_mask) { +u32 pipe_id = cp_indexed_reg->pipe_id; + +/* Set CP_CHICKEN_DBG[StabilizeMVC] to stabilize it while dumping */ +a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL_NS (first_slice, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_CHICKEN_DBG_PIPE ,BIT (2 ),BIT (2 )); +a8xx_aperture_release (gpu, flags); + +a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL (j, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_SLICE_CHICKEN_DBG_PIPE ,BIT (2 ),BIT (2 )); +a8xx_aperture_release (gpu, flags); + + ret =gen8_snapshot_indexed_registers (gpu, state, dumper, + cp_indexed_reg->addr, + cp_indexed_reg->data,0 , + cp_indexed_reg->size, + cp_indexed_reg->pipe_id, +HEADER_SLICE_ID (cp_indexed_reg->slice_region, j)); + +/* Reset CP_CHICKEN_DBG[StabilizeMVC] once we are done */ +a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL_NS (first_slice, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_CHICKEN_DBG_PIPE ,BIT (2 ),0 ); +a8xx_aperture_release (gpu, flags); +drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 458
Quoted 10 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +10
-0+a8xx_aperture_acquire_raw (gpu, +GEN8_CP_APERTURE_REG_VAL (j, pipe_id,0 ,0 ), + &flags); +gpu_rmw (gpu,REG_A8XX_CP_SLICE_CHICKEN_DBG_PIPE ,BIT (2 ),0 ); +a8xx_aperture_release (gpu, flags); + +if (!ret) +break ; + } + }[Severity: High]
As reported by Sashiko on v4 [2], doesgen8_snapshot_mempool()access slice 0 even whencp_indexed_reg->slice_regionis UNSLICE and slice 0 is fused off inslice_mask?For UNSLICE entries in
b->mempool_index_registers,FIRST_SLICE(UNSLICE, slice_mask)sets j to 0 regardless ofslice_mask:#define FIRST_SLICE(_region, _slice_mask) \ ((_region == UNSLICE) ? 0 : NEXT_SLICE(0, _region, _slice_mask))Inside
FOR_EACH_SLICE,gen8_snapshot_mempool()usesfirst_slicewhen accessingREG_A8XX_CP_CHICKEN_DBG_PIPE, but then unconditionally programsGEN8_CP_APERTURE_REG_VAL(j, pipe_id, 0, 0)and RMWs the per-slice registerREG_A8XX_CP_SLICE_CHICKEN_DBG_PIPEon slice j = 0 before and aftergen8_snapshot_indexed_registers().
Quoted 4 lines
On A8xx GPUs with partial slice configurations where slice 0 is disabled in
a6xx_gpu->slice_mask, won't touchingREG_A8XX_CP_SLICE_CHICKEN_DBG_PIPEon slice 0 during UNSLICE mempool dumps access a fused-off slice and cause an AHB/NoC bus error?
This is a specific sequence given by the hw team. But AFAIU the slice configured in the aperture shouldn't matter for non-slice reg.
Quoted 83 lines
[ ... ]
Quoted 2 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +2
-0+struct msm_gpu_state *a8xx_gpu_state_get (struct msm_gpu *gpu) +{[ ... ]
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 1244
Quoted 3 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +3
-0+/* If GX isn't on the rest of the data isn't going to be accessible */ +if (!a6xx_gmu_gx_is_on (adreno_gpu)) +return &state->base;[Severity: High]
As reported by Sashiko on v4 [3], shoulda8xx_gpu_state_get()calla8xx_gmu_gx_is_on(adreno_gpu)(oradreno_gpu->funcs->gx_is_on(adreno_gpu)) here instead ofa6xx_gmu_gx_is_on(adreno_gpu)?In
drivers/gpu/drm/msm/adreno/a6xx_gmu.c,a6xx_gmu_gx_is_on()readsREG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUSand checks A6xx bit definitions whenadreno_is_a7xx()is false:drivers/gpu/drm/msm/adreno/a6xx_gmu.c:a6xx_gmu_gx_is_on() { ... val = gmu_read(gmu, REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS); if (adreno_is_a7xx(adreno_gpu)) return !(val & (A7XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_GDSC_POWER_OFF | A7XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF)); return !(val & (A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_GDSC_POWER_OFF | A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_CLK_OFF)); }On A8xx hardware, GX power and clock status is checked via
a8xx_gmu_gx_is_on(), which readsREG_A8XX_CX_MISC_GFX_PWR_CLK_STATUSon A850-family GPUs (where GMU MX may be off) orREG_A8XX_GMU_PWR_CLK_STATUSon other A8xx GPUs. Callinga6xx_gmu_gx_is_on()on A8xx reads the wrong register and bitmask, which can touch unpowered GMU MMIO on A850-family GPUs or falsely report GX as powered on and proceed with unclocked GX register reads.[ ... ]
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c line 1330
Quoted 12 lines
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c new file +12
-0+/* +* Capture preempt records after cp_clusters, to make this easier +* to decode (ie. so we already know CP_CONTEXT_SWITCH_SMMU_INFO and +* CP_CONTEXT_SWITCH_PRIV_NON_SECURE_RESTORE_ADDR) when crashdec sees +* the logged GPU objs) +*/ +for (unsigned i =0 ; i < gpu->nr_rings; i++) { +a8xx_snapshot_gpu_bo (state, a6xx_gpu->preempt_bo[i], + a6xx_gpu->preempt_iova[i]); +a8xx_snapshot_gpu_bo (state, a6xx_gpu->preempt_smmu_bo[i], + a6xx_gpu->preempt_smmu_iova[i]); + }[Severity: High]
As reported by Sashiko on v4 [4], can this loop trigger a use-after-free on a6xx_gpu->preempt_bo[0] when preemption initialization fails and falls back to a single ring?In
drivers/gpu/drm/msm/adreno/a6xx_preempt.c, ifa6xx_preempt_init()fails after allocating ring 0's preempt_bo[0], it callsa6xx_preempt_fini(gpu)and setsgpu->nr_rings= 1:drivers/gpu/drm/msm/adreno/a6xx_preempt.c:a6xx_preempt_fini() { for (i = 0; i < gpu->nr_rings; i++) msm_gem_kernel_put(a6xx_gpu->preempt_bo[i], gpu->vm); }Because
a6xx_preempt_fini()frees a6xx_gpu->preempt_bo[0] without clearing the pointer to NULL, anda8xx_gpu_state_get()iterates up togpu->nr_ringswithout checkinggpu->nr_rings> 1, iteration i = 0 will pass the freed a6xx_gpu->preempt_bo[0] pointer toa8xx_snapshot_gpu_bo(). Should this loop be guarded bygpu->nr_rings> 1 like the other preemption paths?[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/[email protected]
[3] https://lore.kernel.org/r/[email protected]
[4] https://lore.kernel.org/r/[email protected]--
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
kernel test robot
build botRe: [PATCH v5 11/15] drm/msm/a8xx: devcoredump state capture support
In reply to Rob Clarkkernel test robot noticed the following build errors:
Hi Rob,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on drm-tip/drm-tip linus/master next-20261030]
[cannot apply to drm-misc/drm-misc-next daeinki-drm-exynos/exynos-drm-next drm-i915/for-linux-next drm-i915/for-linux-next-fixes v7.3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Rob-Clark/drm-msm-Import-adreno_snapshot-h/20261102-140245 base: https://gitlab.freedesktop.org/drm/kernel.git drm-next patch link: https://lore.kernel.org/r/20261102220405.30730-12-robin.clark%40oss.qualcomm.com patch subject: [PATCH v5 11/15] drm/msm/a8xx: devcoredump state capture support config: loongarch-allmodconfig (https://download.01.org/0day-ci/archive/20261104/[email protected]/config) compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20261104/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c:9:
>> drivers/gpu/drm/msm/adreno/adreno_snapshot.h:506:15: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
506 | *(p->in++) = FIELD_PREP(GENMASK_U64(63, 44), reg) | BIT(21) | BIT(0);
| ^
drivers/gpu/drm/msm/adreno/adreno_snapshot.h:513:15: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
513 | *(p->in++) = FIELD_PREP(GENMASK_U64(63, 44), reg) | dwords;
| ^
>> drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c:920:14: error: call to undeclared function 'FIELD_GET'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
920 | side_data = FIELD_GET(GENMASK(27, 24), reg);
| ^
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c:1135:14: error: call to undeclared function 'FIELD_GET'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1135 | side_data = FIELD_GET(GENMASK(27, 24), reg);
| ^
>> drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c:1271:4: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1271 | FIELD_PREP(GENMASK(7, 4), a6xx_gpu->slice_mask));
| ^5 errors generated.
vim +/FIELD_PREP +506 drivers/gpu/drm/msm/adreno/adreno_snapshot.h
502
503 static inline void CD_WRITE(struct cd_script *p, u32 reg, u32 val)
504 {
505 *(p->in++) = val;
> 506 *(p->in++) = FIELD_PREP(GENMASK_U64(63, 44), reg) | BIT(21) | BIT(0);
507 __cd_check_overflow(p);
508 }
509
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v5 11/15] drm/msm/a8xx: devcoredump state capture support
In reply to Rob Clarkkernel test robot noticed the following build errors:
Hi Rob,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on drm-tip/drm-tip linus/master next-20261030]
[cannot apply to drm-misc/drm-misc-next daeinki-drm-exynos/exynos-drm-next drm-i915/for-linux-next drm-i915/for-linux-next-fixes v7.3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Rob-Clark/drm-msm-Import-adreno_snapshot-h/20261102-140245 base: https://gitlab.freedesktop.org/drm/kernel.git drm-next patch link: https://lore.kernel.org/r/20261102220405.30730-12-robin.clark%40oss.qualcomm.com patch subject: [PATCH v5 11/15] drm/msm/a8xx: devcoredump state capture support config: mips-allyesconfig (https://download.01.org/0day-ci/archive/20261104/[email protected]/config) compiler: mips-linux-gcc (GCC) 16.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20261104/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c:9:
drivers/gpu/drm/msm/adreno/adreno_snapshot.h: In function 'CD_WRITE':
>> drivers/gpu/drm/msm/adreno/adreno_snapshot.h:506:22: error: implicit declaration of function 'FIELD_PREP' [-Wimplicit-function-declaration]
506 | *(p->in++) = FIELD_PREP(GENMASK_U64(63, 44), reg) | BIT(21) | BIT(0);
| ^~~~~~~~~~
drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c: In function 'gen8_dbgc_side_debug_bus_read':
>> drivers/gpu/drm/msm/adreno/a8xx_gpu_state.c:920:21: error: implicit declaration of function 'FIELD_GET' [-Wimplicit-function-declaration]
920 | side_data = FIELD_GET(GENMASK(27, 24), reg);
| ^~~~~~~~~vim +/FIELD_PREP +506 drivers/gpu/drm/msm/adreno/adreno_snapshot.h
502
503 static inline void CD_WRITE(struct cd_script *p, u32 reg, u32 val)
504 {
505 *(p->in++) = val;
> 506 *(p->in++) = FIELD_PREP(GENMASK_U64(63, 44), reg) | BIT(21) | BIT(0);
507 __cd_check_overflow(p);
508 }
509
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Rob Clark
maintainerPATCH v5 12/15 drm/msm/a8xx: Add all CP_PROTECT_PIPE to pwrup reglist
In reply to Rob ClarkWe're going to start using more of the CP_PROTECT_PIPE regs. Rather than missing to restore one somewhere, just add them all to the pwrup reglist.
--- drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 75 +++++++++++++++++++++++ 1 file changed, 75 insertions(+)
drivers/gpu/drm/msm/adreno/a8xx_catalog.c +75 -0
@@ -276,6 +276,21 @@ static const struct adreno_reglist_pipe a830_dyn_pwrup_reglist_regs[] = {BIT (PIPE_BV ) |BIT (PIPE_LPAC ) |BIT (PIPE_AQE0 ) | BIT(PIPE_AQE1) | BIT(PIPE_DDE_BR) | BIT(PIPE_DDE_BV) }, { REG_A8XX_CP_PROTECT_CNTL_PIPE, 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(0), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(1), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(2), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(3), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(4), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(5), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(6), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(7), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(8), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(9), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(10), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(11), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(12), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(13), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(14), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_CP_PROTECT_PIPE(15), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_GRAS_TSEFE_DBG_ECO_CNTL, 0, BIT(PIPE_BV) | BIT(PIPE_BR) }, { REG_A8XX_GRAS_NC_MODE_CNTL, 0, BIT(PIPE_BV) | BIT(PIPE_BR) },
@@ -437,6 +452,21 @@ static const struct adreno_reglist_pipe x285_dyn_pwrup_reglist_regs[] = {BIT (PIPE_BV ) |BIT (PIPE_LPAC ) |BIT (PIPE_AQE0 ) | BIT(PIPE_AQE1) | BIT(PIPE_DDE_BR) | BIT(PIPE_DDE_BV) }, { REG_A8XX_CP_PROTECT_CNTL_PIPE, 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC)}, + { REG_A8XX_CP_PROTECT_PIPE(0), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(1), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(2), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(3), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(4), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(5), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(6), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(7), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(8), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(9), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(10), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(11), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(12), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(13), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(14), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_CP_PROTECT_PIPE(15), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_RB_GC_GMEM_PROTECT, 0, BIT(PIPE_BR) }, { REG_A8XX_RB_LPAC_GMEM_PROTECT, 0, BIT(PIPE_BR) },
@@ -670,6 +700,21 @@ DECLARE_ADRENO_REGLIST_LIST(a810_ifpc_reglist);static const struct adreno_reglist_pipe a810_dyn_pwrup_reglist_regs[] = { {REG_A8XX_CP_PROTECT_CNTL_PIPE ,0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (0 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (1 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (2 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (3 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (4 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (5 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (6 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (7 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (8 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (9 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (10 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (11 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (12 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (13 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, + {REG_A8XX_CP_PROTECT_PIPE (14 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, {REG_A8XX_CP_PROTECT_PIPE (15 ),0 ,BIT (PIPE_BR ) |BIT (PIPE_BV ) }, {REG_A8XX_GRAS_TSEFE_DBG_ECO_CNTL ,0 ,BIT (PIPE_BV ) |BIT (PIPE_BR ) }, {REG_A8XX_GRAS_NC_MODE_CNTL ,0 ,BIT (PIPE_BV ) |BIT (PIPE_BR ) },
@@ -1083,6 +1128,21 @@ static const struct adreno_reglist_pipe a840_dyn_pwrup_reglist_regs[] = {BIT (PIPE_BV ) |BIT (PIPE_LPAC ) |BIT (PIPE_AQE0 ) | BIT(PIPE_AQE1) | BIT(PIPE_DDE_BR) | BIT(PIPE_DDE_BV) }, { REG_A8XX_CP_PROTECT_CNTL_PIPE, 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC)}, + { REG_A8XX_CP_PROTECT_PIPE(0), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(1), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(2), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(3), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(4), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(5), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(6), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(7), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(8), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(9), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(10), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(11), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(12), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(13), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(14), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_CP_PROTECT_PIPE(15), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_RB_GC_GMEM_PROTECT, 0, BIT(PIPE_BR) }, { REG_A8XX_RB_LPAC_GMEM_PROTECT, 0, BIT(PIPE_BR) },
@@ -1532,6 +1592,21 @@ static const struct adreno_reglist_pipe a850_dyn_pwrup_reglist_regs[] = {BIT (PIPE_BV ) |BIT (PIPE_LPAC ) |BIT (PIPE_AQE0 ) | BIT(PIPE_AQE1) | BIT(PIPE_DDE_BR) | BIT(PIPE_DDE_BV) }, { REG_A8XX_CP_PROTECT_CNTL_PIPE, 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(0), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(1), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(2), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(3), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(4), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(5), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(6), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(7), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(8), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(9), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(10), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(11), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(12), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(13), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, + { REG_A8XX_CP_PROTECT_PIPE(14), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_CP_PROTECT_PIPE(15), 0, BIT(PIPE_BR) | BIT(PIPE_BV) | BIT(PIPE_LPAC) }, { REG_A8XX_RB_GC_GMEM_PROTECT, 0, BIT(PIPE_BR) }, { REG_A8XX_RB_LPAC_GMEM_PROTECT, 0, BIT(PIPE_BR) },
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 13/15 drm/msm/a8xx: Use CP_PROTECT_PIPE regs
In reply to Rob ClarkIf there are not enough global CP_PROTECT_GLOBAL regs, we can use CP_PROTECT_PIPE regs for the extra spans. We just need to configure them the same on all pipes.
--- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/a8xx_gpu.c +14 -5
@@ -258,12 +258,21 @@ static void a8xx_set_cp_protect(struct msm_gpu *gpu)a8xx_aperture_clear (gpu); -for (i =0 ; i < protect->count; i++) { +for (i =0 ; i <min (64 , protect->count); i++) {/* Intentionally skip writing to some registers */ -if (protect->regs[i]) { -gpu_write (gpu,REG_A8XX_CP_PROTECT_GLOBAL (i), protect->regs[i]); - final_cfg = protect->regs[i]; - } +if (!protect->regs[i]) +continue ; +gpu_write (gpu,REG_A8XX_CP_PROTECT_GLOBAL (i), protect->regs[i]); + final_cfg = protect->regs[i]; + } + +for (; i < protect->count; i++) { +/* Intentionally skip writing to some registers */ +if (!protect->regs[i]) +continue ; +a8xx_write_pipe (gpu,PIPE_BR ,REG_A8XX_CP_PROTECT_PIPE (i -64 ), protect->regs[i]); +a8xx_write_pipe (gpu,PIPE_BV ,REG_A8XX_CP_PROTECT_PIPE (i -64 ), protect->regs[i]); + final_cfg = protect->regs[i]; }/*
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 14/15 drm/msm/a8xx: Switch to generated protect regs
In reply to Rob ClarkThese also fix some perfcntr SEL regs which were mistakenly blocked since we previously just copied the protect tables from downstream kgsl (and only sometimes remembered to fix these).
--- drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 301 +--------------------- 1 file changed, 13 insertions(+), 288 deletions(-)
drivers/gpu/drm/msm/adreno/a8xx_catalog.c +13 -288
@@ -82,58 +82,6 @@ static const struct adreno_reglist_pipe a830_nonctxt_regs[] = { { }, }; -static const u32 a830_protect_regs[] = { -A6XX_PROTECT_RDONLY (0x00000 ,0x03a3 ), -A6XX_PROTECT_RDONLY (0x003b4 ,0x008b ), -A6XX_PROTECT_NORDWR (0x00440 ,0x001f ), -A6XX_PROTECT_RDONLY (0x00580 ,0x005f ), -A6XX_PROTECT_NORDWR (0x005e0 ,0x011f ), -A6XX_PROTECT_RDONLY (0x0074a ,0x0005 ), -A6XX_PROTECT_RDONLY (0x00759 ,0x0026 ), -A6XX_PROTECT_RDONLY (0x00789 ,0x0000 ), -A6XX_PROTECT_RDONLY (0x0078c ,0x0013 ), -A6XX_PROTECT_NORDWR (0x00800 ,0x0029 ), -A6XX_PROTECT_NORDWR (0x00837 ,0x00af ), -A6XX_PROTECT_RDONLY (0x008e7 ,0x00c9 ), -A6XX_PROTECT_NORDWR (0x008ec ,0x00c3 ), -A6XX_PROTECT_NORDWR (0x009b1 ,0x0250 ), -A6XX_PROTECT_RDONLY (0x00ce0 ,0x0001 ), -A6XX_PROTECT_RDONLY (0x00df0 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00df1 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e01 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e03 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x03c00 ,0x00c5 ), -A6XX_PROTECT_RDONLY (0x03cc6 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x08600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x08e00 ,0x00ff ), -A6XX_PROTECT_RDONLY (0x08f00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x08f01 ,0x01be ), -A6XX_PROTECT_NORDWR (0x09600 ,0x01ff ), -A6XX_PROTECT_RDONLY (0x0981a ,0x02e5 ), -A6XX_PROTECT_NORDWR (0x09e00 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0ae00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x0ae02 ,0x0004 ), -A6XX_PROTECT_NORDWR (0x0ae08 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae10 ,0x036f ), -A6XX_PROTECT_NORDWR (0x0b600 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x0dc00 ,0x1fff ), -A6XX_PROTECT_RDONLY (0x0fc00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x18400 ,0x003f ), -A6XX_PROTECT_RDONLY (0x18440 ,0x013f ), -A6XX_PROTECT_NORDWR (0x18580 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1b400 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1f400 ,0x0477 ), -A6XX_PROTECT_RDONLY (0x1f878 ,0x0787 ), -A6XX_PROTECT_NORDWR (0x1f930 ,0x0329 ), -A6XX_PROTECT_NORDWR (0x20000 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x27800 ,0x007f ), -A6XX_PROTECT_RDONLY (0x27880 ,0x0381 ), -A6XX_PROTECT_NORDWR (0x27882 ,0x0001 ), -A6XX_PROTECT_NORDWR (0x27c02 ,0x0000 ), -}; -DECLARE_ADRENO_PROTECT (a830_protect,64 ); -static const u32 a830_pwrup_reglist_regs[] = {REG_A6XX_UCHE_MODE_CNTL ,REG_A8XX_UCHE_VARB_IDLE_TIMEOUT ,
@@ -364,63 +312,6 @@ static const struct adreno_reglist_pipe x285_nonctxt_regs[] = { { }, }; -static const u32 x285_protect_regs[] = { -A6XX_PROTECT_RDONLY (0x00008 ,0x039b ), -A6XX_PROTECT_RDONLY (0x003b4 ,0x008b ), -A6XX_PROTECT_NORDWR (0x00440 ,0x001f ), -A6XX_PROTECT_RDONLY (0x00580 ,0x005f ), -A6XX_PROTECT_NORDWR (0x005e0 ,0x011f ), -A6XX_PROTECT_RDONLY (0x0074a ,0x0005 ), -A6XX_PROTECT_RDONLY (0x00759 ,0x0026 ), -A6XX_PROTECT_RDONLY (0x00789 ,0x0000 ), -A6XX_PROTECT_RDONLY (0x0078c ,0x0013 ), -A6XX_PROTECT_NORDWR (0x00800 ,0x0029 ), -A6XX_PROTECT_NORDWR (0x0082c ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00837 ,0x00af ), -A6XX_PROTECT_RDONLY (0x008e7 ,0x00c9 ), -A6XX_PROTECT_NORDWR (0x008ec ,0x00c3 ), -A6XX_PROTECT_NORDWR (0x009b1 ,0x0250 ), -A6XX_PROTECT_RDONLY (0x00ce0 ,0x0001 ), -A6XX_PROTECT_RDONLY (0x00df0 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00df1 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e01 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e03 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x03c00 ,0x00c5 ), -A6XX_PROTECT_RDONLY (0x03cc6 ,0x0039 ), -A6XX_PROTECT_NORDWR (0x03d00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x08600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x08e00 ,0x00ff ), -A6XX_PROTECT_RDONLY (0x08f00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x08f01 ,0x01be ), -A6XX_PROTECT_NORDWR (0x09600 ,0x01ff ), -A6XX_PROTECT_RDONLY (0x0981a ,0x02e5 ), -A6XX_PROTECT_NORDWR (0x09e00 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a82e ,0x0000 ), -A6XX_PROTECT_NORDWR (0x0ae00 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae08 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae10 ,0x00bf ), -A6XX_PROTECT_RDONLY (0x0aed0 ,0x002f ), -A6XX_PROTECT_NORDWR (0x0af00 ,0x027f ), -A6XX_PROTECT_NORDWR (0x0b600 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x0dc00 ,0x1fff ), -A6XX_PROTECT_RDONLY (0x0fc00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x18400 ,0x003f ), -A6XX_PROTECT_RDONLY (0x18440 ,0x013f ), -A6XX_PROTECT_NORDWR (0x18580 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1b400 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1f400 ,0x0477 ), -A6XX_PROTECT_RDONLY (0x1f878 ,0x0507 ), -A6XX_PROTECT_NORDWR (0x1f930 ,0x0329 ), -A6XX_PROTECT_NORDWR (0x1fd80 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x27800 ,0x007f ), -A6XX_PROTECT_RDONLY (0x27880 ,0x0385 ), -A6XX_PROTECT_NORDWR (0x27882 ,0x000a ), -A6XX_PROTECT_NORDWR (0x27c06 ,0x0000 ), -}; - -DECLARE_ADRENO_PROTECT (x285_protect,15 ); -static const struct adreno_reglist_pipe x285_dyn_pwrup_reglist_regs[] = { {REG_A8XX_GRAS_TSEFE_DBG_ECO_CNTL ,0 ,BIT (PIPE_BV ) |BIT (PIPE_BR ) }, {REG_A8XX_GRAS_NC_MODE_CNTL ,0 ,BIT (PIPE_BV ) |BIT (PIPE_BR ) },
@@ -522,57 +413,6 @@ static const struct adreno_reglist_pipe a810_nonctxt_regs[] = { { }, }; -static const u32 a810_protect_regs[] = { -A6XX_PROTECT_RDONLY (0x00000 ,0x03a3 ), -A6XX_PROTECT_RDONLY (0x003b4 ,0x008b ), -A6XX_PROTECT_NORDWR (0x00440 ,0x001f ), -A6XX_PROTECT_RDONLY (0x00580 ,0x005f ), -A6XX_PROTECT_NORDWR (0x005e0 ,0x011f ), -A6XX_PROTECT_RDONLY (0x0074a ,0x0005 ), -A6XX_PROTECT_RDONLY (0x00759 ,0x0026 ), -A6XX_PROTECT_RDONLY (0x00789 ,0x0000 ), -A6XX_PROTECT_RDONLY (0x0078c ,0x0013 ), -A6XX_PROTECT_NORDWR (0x00800 ,0x0029 ), -A6XX_PROTECT_NORDWR (0x00837 ,0x00af ), -A6XX_PROTECT_RDONLY (0x008e7 ,0x00c9 ), -A6XX_PROTECT_NORDWR (0x008ec ,0x00c3 ), -A6XX_PROTECT_NORDWR (0x009b1 ,0x0250 ), -A6XX_PROTECT_RDONLY (0x00ce0 ,0x0001 ), -A6XX_PROTECT_RDONLY (0x00df0 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00df1 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e01 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e03 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x03c00 ,0x00c5 ), -A6XX_PROTECT_RDONLY (0x03cc6 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x08600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x08e00 ,0x00ff ), -A6XX_PROTECT_RDONLY (0x08f00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x08f01 ,0x01be ), -A6XX_PROTECT_NORDWR (0x09600 ,0x01ff ), -A6XX_PROTECT_RDONLY (0x0981a ,0x02e5 ), -A6XX_PROTECT_NORDWR (0x09e00 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0ae00 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae08 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae10 ,0x036f ), -A6XX_PROTECT_NORDWR (0x0b600 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x0dc00 ,0x1fff ), -A6XX_PROTECT_RDONLY (0x0fc00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x18400 ,0x003f ), -A6XX_PROTECT_RDONLY (0x18440 ,0x013f ), -A6XX_PROTECT_NORDWR (0x18580 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1b400 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1f400 ,0x0477 ), -A6XX_PROTECT_RDONLY (0x1f878 ,0x0787 ), -A6XX_PROTECT_NORDWR (0x1f930 ,0x0329 ), -A6XX_PROTECT_NORDWR (0x20000 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x27800 ,0x007f ), -A6XX_PROTECT_RDONLY (0x27880 ,0x0381 ), -A6XX_PROTECT_NORDWR (0x27882 ,0x0001 ), -A6XX_PROTECT_NORDWR (0x27c02 ,0x0000 ), -}; -DECLARE_ADRENO_PROTECT (a810_protect,64 ); -static const uint32_t a810_pwrup_reglist_regs[] = {REG_A6XX_UCHE_MODE_CNTL ,REG_A8XX_UCHE_VARB_IDLE_TIMEOUT ,
@@ -889,64 +729,6 @@ static const struct adreno_reglist_pipe a840_nonctxt_regs[] = { { }, }; -static const u32 a840_protect_regs[] = { -A6XX_PROTECT_RDONLY (0x00008 ,0x039b ), -A6XX_PROTECT_RDONLY (0x003b4 ,0x008b ), -A6XX_PROTECT_NORDWR (0x00440 ,0x001f ), -A6XX_PROTECT_RDONLY (0x00580 ,0x005f ), -A6XX_PROTECT_NORDWR (0x005e0 ,0x011f ), -A6XX_PROTECT_RDONLY (0x0074a ,0x0005 ), -A6XX_PROTECT_RDONLY (0x00759 ,0x001b ), -A6XX_PROTECT_NORDWR (0x00775 ,0x000a ), -A6XX_PROTECT_RDONLY (0x00789 ,0x0000 ), -A6XX_PROTECT_RDONLY (0x0078c ,0x0013 ), -A6XX_PROTECT_NORDWR (0x00800 ,0x0029 ), -A6XX_PROTECT_NORDWR (0x00837 ,0x00af ), -A6XX_PROTECT_RDONLY (0x008e7 ,0x00c9 ), -A6XX_PROTECT_NORDWR (0x008ec ,0x00c3 ), -A6XX_PROTECT_NORDWR (0x009b1 ,0x0250 ), -A6XX_PROTECT_NORDWR (0x00c07 ,0x0008 ), -A6XX_PROTECT_RDONLY (0x00ce0 ,0x0001 ), -A6XX_PROTECT_RDONLY (0x00df0 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00df1 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e01 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e03 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x03c00 ,0x00c5 ), -A6XX_PROTECT_RDONLY (0x03cc6 ,0x0039 ), -A6XX_PROTECT_NORDWR (0x03d00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x08600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x08e00 ,0x00ff ), -A6XX_PROTECT_RDONLY (0x08f00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x08f01 ,0x01be ), -A6XX_PROTECT_NORDWR (0x09600 ,0x01ff ), -A6XX_PROTECT_RDONLY (0x0981a ,0x02e5 ), -A6XX_PROTECT_NORDWR (0x09e00 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a82e ,0x0000 ), -A6XX_PROTECT_NORDWR (0x0ae00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x0ae02 ,0x0004 ), -A6XX_PROTECT_NORDWR (0x0ae08 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae10 ,0x00bf ), -A6XX_PROTECT_RDONLY (0x0aed0 ,0x002f ), -A6XX_PROTECT_NORDWR (0x0af00 ,0x027f ), -A6XX_PROTECT_NORDWR (0x0b600 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x0dc00 ,0x1fff ), -A6XX_PROTECT_RDONLY (0x0fc00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x18400 ,0x003f ), -A6XX_PROTECT_RDONLY (0x18440 ,0x013f ), -A6XX_PROTECT_NORDWR (0x18580 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1b400 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1f400 ,0x0477 ), -A6XX_PROTECT_RDONLY (0x1f878 ,0x0507 ), -A6XX_PROTECT_NORDWR (0x1f930 ,0x0329 ), -A6XX_PROTECT_NORDWR (0x1fd80 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x27800 ,0x007f ), -A6XX_PROTECT_RDONLY (0x27880 ,0x0385 ), -A6XX_PROTECT_NORDWR (0x27882 ,0x0009 ), -A6XX_PROTECT_NORDWR (0x27c06 ,0x0000 ), -}; -DECLARE_ADRENO_PROTECT (a840_protect,15 ); -static const struct adreno_reglist a840_gbif[] = { {REG_A6XX_GBIF_QSB_SIDE0 ,0x00071e20 }, {REG_A6XX_GBIF_QSB_SIDE1 ,0x00071e20 },
@@ -1350,67 +1132,6 @@ static const struct adreno_reglist_pipe a850_nonctxt_regs[] = { { }, }; -static const u32 a850_protect_regs[] = { -A6XX_PROTECT_RDONLY (0x00008 ,0x039b ), -A6XX_PROTECT_RDONLY (0x003b4 ,0x008b ), -A6XX_PROTECT_NORDWR (0x00440 ,0x001f ), -A6XX_PROTECT_RDONLY (0x00580 ,0x005f ), -A6XX_PROTECT_NORDWR (0x005e0 ,0x011f ), -A6XX_PROTECT_RDONLY (0x0074a ,0x0005 ), -A6XX_PROTECT_RDONLY (0x00759 ,0x001b ), -A6XX_PROTECT_NORDWR (0x00775 ,0x000a ), -A6XX_PROTECT_RDONLY (0x00789 ,0x0000 ), -A6XX_PROTECT_RDONLY (0x0078c ,0x0013 ), -A6XX_PROTECT_NORDWR (0x00800 ,0x0029 ), -A6XX_PROTECT_NORDWR (0x00837 ,0x00af ), -A6XX_PROTECT_RDONLY (0x008e7 ,0x00c9 ), -A6XX_PROTECT_NORDWR (0x008ec ,0x00c3 ), -A6XX_PROTECT_NORDWR (0x009b1 ,0x0250 ), -A6XX_PROTECT_NORDWR (0x00c07 ,0x0008 ), -A6XX_PROTECT_RDONLY (0x00ce0 ,0x0001 ), -A6XX_PROTECT_RDONLY (0x00df0 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00df1 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00df5 ,0x0003 ), -A6XX_PROTECT_RDONLY (0x00df9 ,0x0007 ), -A6XX_PROTECT_NORDWR (0x00e01 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x00e03 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x03c00 ,0x00c5 ), -A6XX_PROTECT_RDONLY (0x03cc6 ,0x0039 ), -A6XX_PROTECT_NORDWR (0x03d00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x08600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x08e00 ,0x00ff ), -A6XX_PROTECT_RDONLY (0x08f00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x08f01 ,0x01be ), -A6XX_PROTECT_NORDWR (0x09600 ,0x01ff ), -A6XX_PROTECT_RDONLY (0x0981a ,0x02e5 ), -A6XX_PROTECT_NORDWR (0x09e00 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a600 ,0x01ff ), -A6XX_PROTECT_NORDWR (0x0a82e ,0x0000 ), -A6XX_PROTECT_NORDWR (0x0ae00 ,0x0000 ), -A6XX_PROTECT_NORDWR (0x0ae02 ,0x0004 ), -A6XX_PROTECT_NORDWR (0x0ae08 ,0x0006 ), -A6XX_PROTECT_NORDWR (0x0ae10 ,0x00bf ), -A6XX_PROTECT_RDONLY (0x0aed0 ,0x002f ), -A6XX_PROTECT_NORDWR (0x0af00 ,0x027f ), -A6XX_PROTECT_NORDWR (0x0b600 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x0dc00 ,0x1fff ), -A6XX_PROTECT_RDONLY (0x0fc00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x18400 ,0x003f ), -A6XX_PROTECT_RDONLY (0x18440 ,0x013f ), -A6XX_PROTECT_NORDWR (0x18580 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1ac00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1cc00 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x1f400 ,0x0477 ), -A6XX_PROTECT_RDONLY (0x1f878 ,0x0507 ), -A6XX_PROTECT_NORDWR (0x1f930 ,0x0329 ), -A6XX_PROTECT_NORDWR (0x1fd80 ,0x1fff ), -A6XX_PROTECT_NORDWR (0x27800 ,0x007f ), -A6XX_PROTECT_RDONLY (0x27880 ,0x0385 ), -A6XX_PROTECT_NORDWR (0x27882 ,0x0035 ), -A6XX_PROTECT_NORDWR (0x27c06 ,0x0000 ), -}; -DECLARE_ADRENO_PROTECT (a850_protect,15 ); -static const u32 a850_pwrup_reglist_regs[] = {REG_A8XX_RB_CMP_NC_MODE_CNTL ,REG_A8XX_SP_HLSQ_GC_GMEM_RANGE_MIN ,
@@ -1631,7 +1352,7 @@ static const struct adreno_info a8xx_gpus[] = { ADRENO_QUIRK_IFPC, .funcs = &a8xx_gpu_funcs, .a6xx = &(const struct a6xx_info ) { - .protect = &a830_protect, + .protect = &pakala_protect, .nonctxt_reglist = a830_nonctxt_regs, .pwrup_reglist = &a830_pwrup_reglist, .dyn_pwrup_reglist = &a830_dyn_pwrup_reglist,
@@ -1676,7 +1397,7 @@ static const struct adreno_info a8xx_gpus[] = { ADRENO_QUIRK_SOFTFUSE, .funcs = &a8xx_gpu_funcs, .a6xx = &(const struct a6xx_info ) { - .protect = &x285_protect, + .protect = &glymur_protect, .nonctxt_reglist = x285_nonctxt_regs, .pwrup_reglist = &a840_pwrup_reglist, .dyn_pwrup_reglist = &x285_dyn_pwrup_reglist,
@@ -1721,7 +1442,7 @@ static const struct adreno_info a8xx_gpus[] = { ADRENO_QUIRK_IFPC, .funcs = &a8xx_gpu_funcs, .a6xx = &(const struct a6xx_info ) { - .protect = &a840_protect, + .protect = &kaanapali_protect, .nonctxt_reglist = a840_nonctxt_regs, .pwrup_reglist = &a840_pwrup_reglist, .dyn_pwrup_reglist = &a840_dyn_pwrup_reglist,
@@ -1767,7 +1488,7 @@ static const struct adreno_info a8xx_gpus[] = { .funcs = &a8xx_gpu_funcs, .zapfw = "gen80300_zap.mbn", .a6xx = &(const struct a6xx_info ) { - .protect = &a810_protect, + .protect = &milos_protect, .nonctxt_reglist = a810_nonctxt_regs, .pwrup_reglist = &a810_pwrup_reglist, .dyn_pwrup_reglist = &a810_dyn_pwrup_reglist,
@@ -1810,7 +1531,7 @@ static const struct adreno_info a8xx_gpus[] = { ADRENO_QUIRK_SOFTFUSE, .funcs = &a8xx_gpu_funcs, .a6xx = &(const struct a6xx_info ) { - .protect = &x285_protect, + .protect = &glymur_protect, .nonctxt_reglist = x285_nonctxt_regs, .pwrup_reglist = &a840_pwrup_reglist, .dyn_pwrup_reglist = &x285_dyn_pwrup_reglist,
@@ -1853,7 +1574,7 @@ static const struct adreno_info a8xx_gpus[] = { ADRENO_QUIRK_IFPC, .funcs = &a8xx_gpu_funcs, .a6xx = &(const struct a6xx_info ) { - .protect = &a850_protect, + .protect = &maili_protect, .nonctxt_reglist = a845_nonctxt_regs, .pwrup_reglist = &a850_pwrup_reglist, .dyn_pwrup_reglist = &a850_dyn_pwrup_reglist,
@@ -1897,7 +1618,7 @@ static const struct adreno_info a8xx_gpus[] = { ADRENO_QUIRK_IFPC, .funcs = &a8xx_gpu_funcs, .a6xx = &(const struct a6xx_info ) { - .protect = &a850_protect, + .protect = &hawi_protect, .nonctxt_reglist = a850_nonctxt_regs, .pwrup_reglist = &a850_pwrup_reglist, .dyn_pwrup_reglist = &a850_dyn_pwrup_reglist,
@@ -1932,6 +1653,10 @@ DECLARE_ADRENO_GPULIST(a8xx);static inline __always_unused void __build_asserts (void ) { -BUILD_BUG_ON (a810_protect.count > a810_protect.count_max); -BUILD_BUG_ON (a830_protect.count > a830_protect.count_max); +BUILD_BUG_ON (glymur_protect.count > glymur_protect.count_max); +BUILD_BUG_ON (hawi_protect.count > hawi_protect.count_max); +BUILD_BUG_ON (kaanapali_protect.count > kaanapali_protect.count_max); +BUILD_BUG_ON (maili_protect.count > maili_protect.count_max); +BUILD_BUG_ON (milos_protect.count > milos_protect.count_max); +BUILD_BUG_ON (pakala_protect.count > pakala_protect.count_max); }
Signature · 1 line
2.56.0
Rob Clark
maintainerPATCH v5 15/15 drm/msm/adreno: Remove temporary __maybe_unused
In reply to Rob ClarkNow that is unneeded.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.h +1 -1
@@ -170,7 +170,7 @@ struct adreno_protect { };#define DECLARE_ADRENO_PROTECT (name, __count_max) \ -static const struct adreno_protect name __maybe_unused = { \ +static const struct adreno_protect name = { \ .regs = name ## _regs, \ .count = ARRAY_SIZE(name ## _regs), \ .count_max = __count_max, \
Signature · 1 line
2.56.0