drm/amdgpu: Move xgmi ras initialization from .late_init to early_init
Subsystems (2)
PATCH 1/2 drm/amdgpu: Move xgmi ras initialization from .late_init to early_init
Move xgmi ras initialization from .late_init to early_init, which let xgmi ras can be initialized only once.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 10 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -0
@@ -2189,6 +2189,8 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) } } +amdgpu_ras_early_init (adev); + adev->cg_flags &= amdgpu_cg_mask; adev->pg_flags &= amdgpu_pg_mask;
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0 -5
@@ -452,11 +452,6 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)return r; } -if (!adev->gmc.xgmi.connected_to_cpu) { - adev->gmc.xgmi.ras = &xgmi_ras; -amdgpu_ras_register_ras_block (adev, &adev->gmc.xgmi.ras->ras_block); - } -if (adev->gmc.xgmi.ras && adev->gmc.xgmi.ras->ras_block.ras_late_init) { r = adev->gmc.xgmi.ras->ras_block.ras_late_init (adev,NULL );if (r)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +10 -0
@@ -2238,6 +2238,16 @@ static void amdgpu_ras_counte_dw(struct work_struct *work)pm_runtime_put_autosuspend (dev->dev); } +int amdgpu_ras_early_init (struct amdgpu_device *adev) +{ +if (!adev->gmc.xgmi.connected_to_cpu) { + adev->gmc.xgmi.ras = &xgmi_ras; +amdgpu_ras_register_ras_block (adev, &adev->gmc.xgmi.ras->ras_block); + } + +return 0 ; +} +int amdgpu_ras_init (struct amdgpu_device *adev) {struct amdgpu_ras *con =amdgpu_ras_get_context (adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +3 -0
@@ -600,6 +600,9 @@ amdgpu_ras_error_to_ta(enum amdgpu_ras_error_type error) { } } +/* called in ip_early_init */ +int amdgpu_ras_early_init (struct amdgpu_device *adev); +/* called in ip_init and ip_fini */ int amdgpu_ras_init (struct amdgpu_device *adev);int amdgpu_ras_fini (struct amdgpu_device *adev);
Signature · 1 line
2.25.1
PATCH 2/2 Revert "drm/amdgpu: No longer insert ras blocks into ras_list if it already exists in ras_list"
This reverts commit 48e175f7476c6deb7ccf1f10d081322d52830a17.
Xgmi ras initialization had been moved from .late_init to early_init, the defect of repeated calling amdgpu_ras_register_ras_block had been fixed, so revert this patch.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -7
@@ -2775,19 +2775,12 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)int amdgpu_ras_register_ras_block (struct amdgpu_device *adev,struct amdgpu_ras_block_object *ras_block_obj) { -struct amdgpu_ras_block_object *obj, *tmp;if (!adev || !ras_block_obj)return -EINVAL ;if (!amdgpu_ras_asic_supported (adev))return 0 ; -/* If the ras object is in ras_list, don't add it again */ -list_for_each_entry_safe (obj, tmp, &adev->ras_list, node) { -if (obj == ras_block_obj) -return 0 ; - } -INIT_LIST_HEAD (&ras_block_obj->node);list_add_tail (&ras_block_obj->node, &adev->ras_list);
Signature · 1 line
2.25.1
[AMD Official Use Only]
Quoted 65 lines
-----Original Message-----
From: Chai, Thomas <[email protected]>
Sent: Wednesday, January 19, 2022 5:25 PM
To: [email protected]
Cc: Chai, Thomas <[email protected]>; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>; Chai, Thomas <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu: Move xgmi ras initialization from .late_init toearly_initMove xgmi ras initialization from .late_init to
early_init, which let xgmi ras can be initialized only once.Signed-off-by yipechai <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 10 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0@@ -2189,6 +2189,8 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) } } +amdgpu_ras_early_init (adev); + adev->cg_flags &= amdgpu_cg_mask; adev->pg_flags &= amdgpu_pg_mask;drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0
-5@@ -452,11 +452,6 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)return r; } -if (!adev->gmc.xgmi.connected_to_cpu) { - adev->gmc.xgmi.ras = &xgmi_ras; -amdgpu_ras_register_ras_block (adev, &adev->gmc.xgmi.ras- >ras_block); - } -if (adev->gmc.xgmi.ras && adev->gmc.xgmi.ras->ras_block.ras_late_init){
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0
-0r = adev->gmc.xgmi.ras->ras_block.ras_late_init (adev,NULL );if (r)drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0@@ -2238,6 +2238,16 @@ static void amdgpu_ras_counte_dw(struct work_struct *work) pm_runtime_put_autosuspend(dev->dev); }
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c static void amdgpu_ras_counte_dw(struct · line 2250
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +8
-0+int amdgpu_ras_early_init (struct amdgpu_device *adev) { +if (!adev->gmc.xgmi.connected_to_cpu) { + adev->gmc.xgmi.ras = &xgmi_ras; +amdgpu_ras_register_ras_block (adev, &adev->gmc.xgmi.ras- >ras_block); + } + +return 0 ; +}
[Tao]: I suggest creating amdgpu_gmc_ras_late_init in amdgpu_gmc.c and call it in each gmc_vx.c. Please make sure gpu reset and S3 tests pass.
Quoted 21 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+int amdgpu_ras_init (struct amdgpu_device *adev) { struct amdgpu_ras *con = amdgpu_ras_get_context(adev); diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.hb/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
indexa51a281bd91a..7d99e3736ab9100644drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +3
-0@@ -600,6 +600,9 @@ amdgpu_ras_error_to_ta(enum amdgpu_ras_error_type error) { } } +/* called in ip_early_init */ +int amdgpu_ras_early_init (struct amdgpu_device *adev); +/* called in ip_init and ip_fini */ int amdgpu_ras_init(struct amdgpu_device *adev); int amdgpu_ras_fini(struct
amdgpu_device*adev);
--
2.25.1