From 9022f01b9709331c485703e49b3a8b2633513a92 Mon Sep 17 00:00:00 2001
From: Sunil Khatri <sunil.khatri@amd.com>
Date: Thu, 21 Mar 2024 00:53:35 +0530
Subject: drm/amdgpu: refactor code to split devcoredump code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Refractor devcoredump code into new files since its
functionality is expanded further and better to slit
and devcoredump to have its own file.
v2: Fix the build failure caught by arm compiler
of implicit function declaration with #ifdef
v3: squash in fix for implicit declaration error
Cc: Ivan Lipski <ivan.lipski@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 191 ------------------------------
1 file changed, 191 deletions(-)
(limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c')
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
index 3398f2a368d5..ea4873f6ccd1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
@@ -21,50 +21,11 @@
*
*/
-#include <linux/devcoredump.h>
-#include <generated/utsrelease.h>
-
#include "amdgpu_reset.h"
#include "aldebaran.h"
#include "sienna_cichlid.h"
#include "smu_v13_0_10.h"
-const char *hw_ip_names[MAX_HWIP] = {
- [GC_HWIP] = "GC",
- [HDP_HWIP] = "HDP",
- [SDMA0_HWIP] = "SDMA0",
- [SDMA1_HWIP] = "SDMA1",
- [SDMA2_HWIP] = "SDMA2",
- [SDMA3_HWIP] = "SDMA3",
- [SDMA4_HWIP] = "SDMA4",
- [SDMA5_HWIP] = "SDMA5",
- [SDMA6_HWIP] = "SDMA6",
- [SDMA7_HWIP] = "SDMA7",
- [LSDMA_HWIP] = "LSDMA",
- [MMHUB_HWIP] = "MMHUB",
- [ATHUB_HWIP] = "ATHUB",
- [NBIO_HWIP] = "NBIO",
- [MP0_HWIP] = "MP0",
- [MP1_HWIP] = "MP1",
- [UVD_HWIP] = "UVD/JPEG/VCN",
- [VCN1_HWIP] = "VCN1",
- [VCE_HWIP] = "VCE",
- [VPE_HWIP] = "VPE",
- [DF_HWIP] = "DF",
- [DCE_HWIP] = "DCE",
- [OSSSYS_HWIP] = "OSSSYS",
- [SMUIO_HWIP] = "SMUIO",
- [PWR_HWIP] = "PWR",
- [NBIF_HWIP] = "NBIF",
- [THM_HWIP] = "THM",
- [CLK_HWIP] = "CLK",
- [UMC_HWIP] = "UMC",
- [RSMU_HWIP] = "RSMU",
- [XGMI_HWIP] = "XGMI",
- [DCI_HWIP] = "DCI",
- [PCIE_HWIP] = "PCIE",
-};
-
int amdgpu_reset_init(struct amdgpu_device *adev)
{
int ret = 0;
@@ -197,155 +158,3 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain)
atomic_set(&reset_domain->in_gpu_reset, 0);
up_write(&reset_domain->sem);
}
-
-#ifndef CONFIG_DEV_COREDUMP
-void amdgpu_coredump(struct amdgpu_device *adev, bool vram_lost,
- struct amdgpu_reset_context *reset_context)
-{
-}
-#else
-static ssize_t
-amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count,
- void *data, size_t datalen)
-{
- struct drm_printer p;
- struct amdgpu_coredump_info *coredump = data;
- struct drm_print_iterator iter;
- struct amdgpu_vm_fault_info *fault_info;
- int i, ver;
-
- iter.data = buffer;
- iter.offset = 0;
- iter.start = offset;
- iter.remain = count;
-
- p = drm_coredump_printer(&iter);
-
- drm_printf(&p, "**** AMDGPU Device Coredump ****\n");
- drm_printf(&p, "version: " AMDGPU_COREDUMP_VERSION "\n");
- drm_printf(&p, "kernel: " UTS_RELEASE "\n");
- drm_printf(&p, "module: " KBUILD_MODNAME "\n");
- drm_printf(&p, "time: %lld.%09ld\n", coredump->reset_time.tv_sec,
- coredump->reset_time.tv_nsec);
-
- if (coredump->reset_task_info.pid)
- drm_printf(&p, "process_name: %s PID: %d\n",
- coredump->reset_task_info.process_name,
- coredump->reset_task_info.pid);
-
- /* GPU IP's information of the SOC */
- drm_printf(&p, "\nIP Information\n");
- drm_printf(&p, "SOC Family: %d\n", coredump->adev->family);
- drm_printf(&p, "SOC Revision id: %d\n", coredump->adev->rev_id);
- drm_printf(&p, "SOC External Revision id: %d\n", coredump->adev->external_rev_id);
-
- for (int i = 1; i < MAX_HWIP; i++) {
- for (int j = 0; j < HWIP_MAX_INSTANCE; j++) {
- ver = coredump->adev->ip_versions[i][j];
- if (ver)
- drm_printf(&p, "HWIP: %s[%d][%d]: v%d.%d.%d.%d.%d\n",
- hw_ip_names[i], i, j,
- IP_VERSION_MAJ(ver),
- IP_VERSION_MIN(ver),
- IP_VERSION_REV(ver),
- IP_VERSION_VARIANT(ver),
- IP_VERSION_SUBREV(ver));
- }
- }
-
- if (coredump->ring) {
- drm_printf(&p, "\nRing timed out details\n");
- drm_printf(&p, "IP Type: %d Ring Name: %s\n",
- coredump->ring->funcs->type,
- coredump->ring->name);
- }
-
- /* Add page fault information */
- fault_info = &coredump->adev->vm_manager.fault_info;
- drm_printf(&p, "\n[%s] Page fault observed\n",
- fault_info->vmhub ? "mmhub" : "gfxhub");
- drm_printf(&p, "Faulty page starting at address: 0x%016llx\n", fault_info->addr);
- drm_printf(&p, "Protection fault status register: 0x%x\n\n", fault_info->status);
-
- /* Add ring buffer information */
- drm_printf(&p, "Ring buffer information\n");
- for (int i = 0; i < coredump->adev->num_rings; i++) {
- int j = 0;
- struct amdgpu_ring *ring = coredump->adev->rings[i];
-
- drm_printf(&p, "ring name: %s\n", ring->name);
- drm_printf(&p, "Rptr: 0x%llx Wptr: 0x%llx RB mask: %x\n",
- amdgpu_ring_get_rptr(ring),
- amdgpu_ring_get_wptr(ring),
- ring->buf_mask);
- drm_printf(&p, "Ring size in dwords: %d\n",
- ring->ring_size / 4);
- drm_printf(&p, "Ring contents\n");
- drm_printf(&p, "Offset \t Value\n");
-
- while (j < ring->ring_size) {
- drm_printf(&p, "0x%x \t 0x%x\n", j, ring->ring[j/4]);
- j += 4;
- }
- }
-
- if (coredump->reset_vram_lost)
- drm_printf(&p, "VRAM is lost due to GPU reset!\n");
- if (coredump->adev->reset_info.num_regs) {
- drm_printf(&p, "AMDGPU register dumps:\nOffset: Value:\n");
-
- for (i = 0; i < coredump->adev->reset_info.num_regs; i++)
- drm_printf(&p, "0x%08x: 0x%08x\n",
- coredump->adev->reset_info.reset_dump_reg_list[i],
- coredump->adev->reset_info.reset_dump_reg_value[i]);
- }
-
- return count - iter.remain;
-}
-
-static void amdgpu_devcoredump_free(void *data)
-{
- kfree(data);
-}
-
-void amdgpu_coredump(struct amdgpu_device *adev, bool vram_lost,
- struct amdgpu_reset_context *reset_context)
-{
- struct amdgpu_coredump_info *coredump;
- struct drm_device *dev = adev_to_drm(adev);
- struct amdgpu_job *job = reset_context->job;
- struct drm_sched_job *s_job;
-
- coredump = kzalloc(sizeof(*coredump), GFP_NOWAIT);
-
- if (!coredump) {
- DRM_ERROR("%s: failed to allocate memory for coredump\n", __func__);
- return;
- }
-
- coredump->reset_vram_lost = vram_lost;
-
- if (reset_context->job && reset_context->job->vm) {
- struct amdgpu_task_info *ti;
- struct amdgpu_vm *vm = reset_context->job->vm;
-
- ti = amdgpu_vm_get_task_info_vm(vm);
- if (ti) {
- coredump->reset_task_info = *ti;
- amdgpu_vm_put_task_info(ti);
- }
- }
-
- if (job) {
- s_job = &job->base;
- coredump->ring = to_amdgpu_ring(s_job->sched);
- }
-
- coredump->adev = adev;
-
- ktime_get_ts64(&coredump->reset_time);
-
- dev_coredumpm(dev->dev, THIS_MODULE, coredump, 0, GFP_NOWAIT,
- amdgpu_devcoredump_read, amdgpu_devcoredump_free);
-}
-#endif
--
cgit v1.2.3-70-g09d2