Skip to content

Commit

Permalink
drm/amdgpu: validate resume before function call
Browse files Browse the repository at this point in the history 
Before making a function call to resume, validate
the function pointer like we do in sw_init.

Use the helper function amdgpu_ip_block_resume where
same checks and calls are repeated.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Sunil Khatri authored and Alex Deucher committed Oct 22, 2024
1 parent e095026 commit 502d763
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 60 deletions.
13 changes: 4 additions & 9 deletions drivers/gpu/drm/amd/amdgpu/aldebaran.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)
dev_err(adev->dev, "Failed to get BIF handle\n");
return -EINVAL;
}
r = cmn_block->version->funcs->resume(cmn_block);
r = amdgpu_ip_block_resume(cmn_block);
if (r)
return r;

Expand Down Expand Up @@ -275,15 +275,10 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)
adev->ip_blocks[i].version->type ==
AMD_IP_BLOCK_TYPE_SDMA))
continue;
r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
dev_err(adev->dev,
"resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
return r;
}

adev->ip_blocks[i].status.hw = true;
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}

for (i = 0; i < adev->num_ip_blocks; i++) {
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/amd/amdgpu/amdgpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@ bool amdgpu_device_ip_is_valid(struct amdgpu_device *adev,
enum amd_ip_block_type block_type);
int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block);

int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block);

#define AMDGPU_MAX_IP_NUM 16

struct amdgpu_ip_block_status {
Expand Down
64 changes: 37 additions & 27 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,24 @@ int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block)
return 0;
}

int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block)
{
int r;

if (ip_block->version->funcs->resume) {
r = ip_block->version->funcs->resume(ip_block);
if (r) {
dev_err(ip_block->adev->dev,
"resume of IP block <%s> failed %d\n",
ip_block->version->funcs->name, r);
return r;
}
}

ip_block->status.hw = true;
return 0;
}

/**
* DOC: board_info
*
Expand Down Expand Up @@ -2762,22 +2780,18 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev)
break;

if (amdgpu_in_reset(adev) || adev->in_suspend) {
r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
DRM_ERROR("resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}
} else {
r = adev->ip_blocks[i].version->funcs->hw_init(&adev->ip_blocks[i]);
if (r) {
DRM_ERROR("hw_init of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
return r;
}
adev->ip_blocks[i].status.hw = true;
}

adev->ip_blocks[i].status.hw = true;
break;
}
}
Expand Down Expand Up @@ -3682,15 +3696,19 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev)
block->status.hw)
continue;

if (block->version->type == AMD_IP_BLOCK_TYPE_SMC)
r = block->version->funcs->resume(&adev->ip_blocks[i]);
else
if (block->version->type == AMD_IP_BLOCK_TYPE_SMC) {
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
} else {
r = block->version->funcs->hw_init(&adev->ip_blocks[i]);

DRM_INFO("RE-INIT-late: %s %s\n", block->version->funcs->name, r?"failed":"succeeded");
if (r)
return r;
block->status.hw = true;
if (r) {
DRM_ERROR("hw_init of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
return r;
}
block->status.hw = true;
}
}
}

Expand Down Expand Up @@ -3721,13 +3739,9 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev)
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||
(adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP && amdgpu_sriov_vf(adev))) {

r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
DRM_ERROR("resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}
adev->ip_blocks[i].status.hw = true;
}
}

Expand Down Expand Up @@ -3759,13 +3773,9 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev)
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||
adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP)
continue;
r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
DRM_ERROR("resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}
adev->ip_blocks[i].status.hw = true;
}

return 0;
Expand Down
20 changes: 4 additions & 16 deletions drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,9 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev)

for (i = 0; i < adev->num_ip_blocks; i++) {
if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) {
r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
dev_err(adev->dev,
"resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}

adev->ip_blocks[i].status.hw = true;
}
}

Expand All @@ -187,15 +181,9 @@ static int sienna_cichlid_mode2_restore_ip(struct amdgpu_device *adev)
adev->ip_blocks[i].version->type ==
AMD_IP_BLOCK_TYPE_SDMA))
continue;
r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
dev_err(adev->dev,
"resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}

adev->ip_blocks[i].status.hw = true;
}

for (i = 0; i < adev->num_ip_blocks; i++) {
Expand Down
10 changes: 2 additions & 8 deletions drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,9 @@ static int smu_v13_0_10_mode2_restore_ip(struct amdgpu_device *adev)
adev->ip_blocks[i].version->type ==
AMD_IP_BLOCK_TYPE_SDMA))
continue;
r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);
if (r) {
dev_err(adev->dev,
"resume of IP block <%s> failed %d\n",
adev->ip_blocks[i].version->funcs->name, r);
r = amdgpu_ip_block_resume(&adev->ip_blocks[i]);
if (r)
return r;
}

adev->ip_blocks[i].status.hw = true;
}

for (i = 0; i < adev->num_ip_blocks; i++) {
Expand Down

0 comments on commit 502d763

Please sign in to comment.