Skip to content

Commit 8173560

Browse files
committed
drm/amdgpu: use common defines for HUB faults
Use common definitions for the fault bits in the IH sourc data for the gmc9-12 memory hub faults Reviewed-by: Timur Kristóf <timur.kristof@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent ff28ff9 commit 8173560

5 files changed

Lines changed: 21 additions & 8 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ enum amdgpu_memory_partition {
8686

8787
#define AMDGPU_MAX_MEM_RANGES 8
8888

89+
#define AMDGPU_GMC9_FAULT_SOURCE_DATA_RETRY 0x80
90+
#define AMDGPU_GMC9_FAULT_SOURCE_DATA_READ 0x40
91+
#define AMDGPU_GMC9_FAULT_SOURCE_DATA_WRITE 0x20
92+
#define AMDGPU_GMC9_FAULT_SOURCE_DATA_EXE 0x10
93+
8994
/*
9095
* GMC page fault information
9196
*/

drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,
103103
uint32_t vmhub_index = entry->client_id == SOC15_IH_CLIENTID_VMC ?
104104
AMDGPU_MMHUB0(0) : AMDGPU_GFXHUB(0);
105105
struct amdgpu_vmhub *hub = &adev->vmhub[vmhub_index];
106-
bool retry_fault = !!(entry->src_data[1] & 0x80);
107-
bool write_fault = !!(entry->src_data[1] & 0x20);
106+
bool retry_fault = !!(entry->src_data[1] &
107+
AMDGPU_GMC9_FAULT_SOURCE_DATA_RETRY);
108+
bool write_fault = !!(entry->src_data[1] &
109+
AMDGPU_GMC9_FAULT_SOURCE_DATA_WRITE);
108110
struct amdgpu_task_info *task_info;
109111
uint32_t status = 0;
110112
u64 addr;

drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ static int gmc_v11_0_process_interrupt(struct amdgpu_device *adev,
103103
uint32_t vmhub_index = entry->client_id == SOC21_IH_CLIENTID_VMC ?
104104
AMDGPU_MMHUB0(0) : AMDGPU_GFXHUB(0);
105105
struct amdgpu_vmhub *hub = &adev->vmhub[vmhub_index];
106-
bool retry_fault = !!(entry->src_data[1] & 0x80);
107-
bool write_fault = !!(entry->src_data[1] & 0x20);
106+
bool retry_fault = !!(entry->src_data[1] &
107+
AMDGPU_GMC9_FAULT_SOURCE_DATA_RETRY);
108+
bool write_fault = !!(entry->src_data[1] &
109+
AMDGPU_GMC9_FAULT_SOURCE_DATA_WRITE);
108110
uint32_t status = 0;
109111
u64 addr;
110112

drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ static int gmc_v12_0_process_interrupt(struct amdgpu_device *adev,
9191
struct amdgpu_iv_entry *entry)
9292
{
9393
struct amdgpu_vmhub *hub;
94-
bool retry_fault = !!(entry->src_data[1] & 0x80);
95-
bool write_fault = !!(entry->src_data[1] & 0x20);
94+
bool retry_fault = !!(entry->src_data[1] &
95+
AMDGPU_GMC9_FAULT_SOURCE_DATA_RETRY);
96+
bool write_fault = !!(entry->src_data[1] &
97+
AMDGPU_GMC9_FAULT_SOURCE_DATA_WRITE);
9698
uint32_t status = 0;
9799
u64 addr;
98100

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,10 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
544544
struct amdgpu_irq_src *source,
545545
struct amdgpu_iv_entry *entry)
546546
{
547-
bool retry_fault = !!(entry->src_data[1] & 0x80);
548-
bool write_fault = !!(entry->src_data[1] & 0x20);
547+
bool retry_fault = !!(entry->src_data[1] &
548+
AMDGPU_GMC9_FAULT_SOURCE_DATA_RETRY);
549+
bool write_fault = !!(entry->src_data[1] &
550+
AMDGPU_GMC9_FAULT_SOURCE_DATA_WRITE);
549551
uint32_t status = 0, cid = 0, rw = 0, fed = 0;
550552
struct amdgpu_task_info *task_info;
551553
struct amdgpu_vmhub *hub;

0 commit comments

Comments
 (0)