Commit 69619868 authored by André Almeida's avatar André Almeida Committed by Alex Deucher
Browse files

drm/amdgpu: Move coredump code to amdgpu_reset file 



Giving that we use codedump just for device resets, move it's functions
and structs to a more semantic file, the amdgpu_reset.{c, h}.

Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Signed-off-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2d6a2a28

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

+0 −9
Original line number Diff line number Diff line
@@ -773,15 +773,6 @@ struct amdgpu_mqd { 
struct amdgpu_reset_domain;

struct amdgpu_fru_info;



#ifdef CONFIG_DEV_COREDUMP

struct amdgpu_coredump_info {

	struct amdgpu_device	*adev;

	struct amdgpu_task_info reset_task_info;

	struct timespec64	reset_time;

	bool			reset_vram_lost;

};

#endif



struct amdgpu_reset_info {

	/* reset dump register */

	u32 *reset_dump_reg_list;

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

+0 −78
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
#include <linux/slab.h>

#include <linux/iommu.h>

#include <linux/pci.h>

#include <linux/devcoredump.h>

#include <generated/utsrelease.h>

#include <linux/pci-p2pdma.h>

#include <linux/apple-gmux.h>
@@ -5059,82 +5057,6 @@ static int amdgpu_reset_reg_dumps(struct amdgpu_device *adev) 
	return 0;

}



#ifndef CONFIG_DEV_COREDUMP

static 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;

	int i;



	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, "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);



	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);

}



static 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);



	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)

		coredump->reset_task_info = reset_context->job->vm->task_info;



	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



int amdgpu_do_asic_reset(struct list_head *device_list_handle,

			 struct amdgpu_reset_context *reset_context)

{

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

+79 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
 *

 */



#include <linux/devcoredump.h>

#include <generated/utsrelease.h>



#include "amdgpu_reset.h"

#include "aldebaran.h"

#include "sienna_cichlid.h"
@@ -159,5 +162,81 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain) 
	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;

	int i;



	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, "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);



	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);



	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)

		coredump->reset_task_info = reset_context->job->vm->task_info;



	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

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

+11 −0
Original line number Diff line number Diff line
@@ -89,6 +89,14 @@ struct amdgpu_reset_domain { 
	atomic_t reset_res;

};



#ifdef CONFIG_DEV_COREDUMP

struct amdgpu_coredump_info {

	struct amdgpu_device		*adev;

	struct amdgpu_task_info         reset_task_info;

	struct timespec64               reset_time;

	bool                            reset_vram_lost;

};

#endif



int amdgpu_reset_init(struct amdgpu_device *adev);

int amdgpu_reset_fini(struct amdgpu_device *adev);
@@ -130,6 +138,9 @@ void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain); 


void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain);



void amdgpu_coredump(struct amdgpu_device *adev, bool vram_lost,

		     struct amdgpu_reset_context *reset_context);



#define for_each_handler(i, handler, reset_ctl)                  \

	for (i = 0; (i < AMDGPU_RESET_MAX_HANDLERS) &&           \

		    (handler = (*reset_ctl->reset_handlers)[i]); \