Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: more GPU page fault info for GC v9.4.3
Output IH cookie node_id and translate it to the corresponding AID id
and XCC id, to help debug the GPU page fault.
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
authored by
Philip Yang
and committed by
Alex Deucher
eaae4bee
993d218f
+8
-3
+8
-3
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+8
-3
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
···
557
557
u64 addr;
558
558
uint32_t cam_index = 0;
559
559
int ret;
560
-
uint32_t node_id = 0;
560
+
uint32_t node_id;
561
+
562
+
node_id = (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 3)) ? entry->node_id : 0;
561
563
562
564
addr = (u64)entry->src_data[0] << 12;
563
565
addr |= ((u64)entry->src_data[1] & 0xf) << 44;
···
572
570
hub = &adev->vmhub[AMDGPU_MMHUB1(0)];
573
571
} else {
574
572
hub_name = "gfxhub0";
575
-
node_id = (adev->ip_versions[GC_HWIP][0] ==
576
-
IP_VERSION(9, 4, 3)) ? entry->node_id : 0;
577
573
hub = &adev->vmhub[node_id/2];
578
574
}
579
575
···
633
633
dev_err(adev->dev, " in page starting at address 0x%016llx from IH client 0x%x (%s)\n",
634
634
addr, entry->client_id,
635
635
soc15_ih_clientid_name[entry->client_id]);
636
+
637
+
if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(9, 4, 3))
638
+
dev_err(adev->dev, " cookie node_id %d fault from die %s%d%s\n",
639
+
node_id, node_id % 4 == 3 ? "RSV" : "AID", node_id / 4,
640
+
node_id % 4 == 1 ? ".XCD0" : node_id % 4 == 2 ? ".XCD1" : "");
636
641
637
642
if (amdgpu_sriov_vf(adev))
638
643
return 0;