leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: Merge amdgpu_ras_late_init/amdgpu_ras_late_fini to amdgpu_ras_block_late_init/amdgpu_ras_block_late_fini

Browse Source 
1. Merge amdgpu_ras_late_init to
   amdgpu_ras_block_late_init.
2. Remove amdgpu_ras_late_init since no ras block
   calls amdgpu_ras_late_init.
3. Merge amdgpu_ras_late_fini to
   amdgpu_ras_block_late_fini.
4. Remove amdgpu_ras_late_fini since no ras block
   calls amdgpu_ras_late_fini.

Signed-off-by: yipechai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
yipechai
2022-02-09 11:15:29 +08:00
committed by Alex Deucher
parent 9252d33df5
commit 563285c85e
2 changed files with 11 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
View File

@@ -2397,11 +2397,10 @@ bool amdgpu_ras_is_poison_mode_supported(struct amdgpu_device *adev)
} }
/* helper function to handle common stuff in ip late init phase */ /* helper function to handle common stuff in ip late init phase */
int amdgpu_ras_late_init(struct amdgpu_device *adev, int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
struct ras_common_if *ras_block, struct ras_common_if *ras_block)
struct ras_fs_if *fs_info,
struct ras_ih_if *ih_info)
{ {
struct amdgpu_ras_block_object *ras_obj;
struct amdgpu_ras *con = amdgpu_ras_get_context(adev); struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
unsigned long ue_count, ce_count; unsigned long ue_count, ce_count;
int r; int r;
@@ -2429,7 +2428,8 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev,
if (adev->in_suspend || amdgpu_in_reset(adev)) if (adev->in_suspend || amdgpu_in_reset(adev))
return 0; return 0;
if (ih_info->cb) { ras_obj = container_of(ras_block, struct amdgpu_ras_block_object, ras_comm);
if (ras_obj->ras_cb) {
r = amdgpu_ras_interrupt_add_handler(adev, ras_block); r = amdgpu_ras_interrupt_add_handler(adev, ras_block);
if (r) if (r)
goto interrupt; goto interrupt;
@@ -2450,57 +2450,26 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev,
cleanup: cleanup:
amdgpu_ras_sysfs_remove(adev, ras_block); amdgpu_ras_sysfs_remove(adev, ras_block);
sysfs: sysfs:
if (ih_info->cb) if (ras_obj->ras_cb)
amdgpu_ras_interrupt_remove_handler(adev, ras_block); amdgpu_ras_interrupt_remove_handler(adev, ras_block);
interrupt: interrupt:
amdgpu_ras_feature_enable(adev, ras_block, 0); amdgpu_ras_feature_enable(adev, ras_block, 0);
return r; return r;
} }
int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
struct ras_common_if *ras_block)
{
char sysfs_name[32];
struct ras_ih_if ih_info;
struct ras_fs_if fs_info;
struct amdgpu_ras_block_object *obj;
obj = container_of(ras_block, struct amdgpu_ras_block_object, ras_comm);
ih_info.cb = obj->ras_cb;
ih_info.head = *ras_block;
snprintf(sysfs_name, sizeof(sysfs_name), "%s_err_count", ras_block->name);
fs_info.sysfs_name = (const char *)sysfs_name;
fs_info.head = *ras_block;
return amdgpu_ras_late_init(adev, ras_block, &fs_info, &ih_info);
}
/* helper function to remove ras fs node and interrupt handler */ /* helper function to remove ras fs node and interrupt handler */
void amdgpu_ras_late_fini(struct amdgpu_device *adev,
struct ras_common_if *ras_block,
struct ras_ih_if *ih_info)
{
if (!ras_block || !ih_info)
return;
amdgpu_ras_sysfs_remove(adev, ras_block);
if (ih_info->cb)
amdgpu_ras_interrupt_remove_handler(adev, &ih_info->head);
}
void amdgpu_ras_block_late_fini(struct amdgpu_device *adev, void amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
struct ras_common_if *ras_block) struct ras_common_if *ras_block)
{ {
struct ras_ih_if ih_info; struct amdgpu_ras_block_object *ras_obj;
struct amdgpu_ras_block_object *obj;
if (!ras_block) if (!ras_block)
return; return;
obj = container_of(ras_block, struct amdgpu_ras_block_object, ras_comm); amdgpu_ras_sysfs_remove(adev, ras_block);
ih_info.head = *ras_block;
ih_info.cb = obj->ras_cb;
amdgpu_ras_late_fini(adev, ras_block, &ih_info); ras_obj = container_of(ras_block, struct amdgpu_ras_block_object, ras_comm);
if (ras_obj->ras_cb)
amdgpu_ras_interrupt_remove_handler(adev, ras_block);
} }
/* do some init work after IP late init as dependence. /* do some init work after IP late init as dependence.

8
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
View File

@@ -597,18 +597,10 @@ amdgpu_ras_error_to_ta(enum amdgpu_ras_error_type error) {
int amdgpu_ras_init(struct amdgpu_device *adev); int amdgpu_ras_init(struct amdgpu_device *adev);
int amdgpu_ras_fini(struct amdgpu_device *adev); int amdgpu_ras_fini(struct amdgpu_device *adev);
int amdgpu_ras_pre_fini(struct amdgpu_device *adev); int amdgpu_ras_pre_fini(struct amdgpu_device *adev);
int amdgpu_ras_late_init(struct amdgpu_device *adev,
struct ras_common_if *ras_block,
struct ras_fs_if *fs_info,
struct ras_ih_if *ih_info);
int amdgpu_ras_block_late_init(struct amdgpu_device *adev, int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
struct ras_common_if *ras_block); struct ras_common_if *ras_block);
void amdgpu_ras_late_fini(struct amdgpu_device *adev,
struct ras_common_if *ras_block,
struct ras_ih_if *ih_info);
void amdgpu_ras_block_late_fini(struct amdgpu_device *adev, void amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
struct ras_common_if *ras_block); struct ras_common_if *ras_block);